diff --git a/home/firefox/default.nix b/home/firefox/default.nix index c1795fe..134a3d1 100644 --- a/home/firefox/default.nix +++ b/home/firefox/default.nix @@ -47,6 +47,7 @@ in { Status = "locked"; }; "privacy.trackingprotection.enabled" = true; + "media.webrtc.camera.allow-pipewire" = true; }; }; }; diff --git a/hosts/Aloria/hardware-configuration.nix b/hosts/Aloria/hardware-configuration.nix index b80f7ff..277b856 100644 --- a/hosts/Aloria/hardware-configuration.nix +++ b/hosts/Aloria/hardware-configuration.nix @@ -14,13 +14,13 @@ boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"]; boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel" "v4l2loopback"]; - boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback tp_smapi]; + boot.kernelModules = ["kvm-intel" "v4l2loopback" "intel_vsc" "intel_vsc_csi" "intel_vsc_vbus"]; + boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback tp_smapi ipu6-drivers]; boot.extraModprobeConfig = '' options thinkpad_acpi fan_control=1 options v4l2loopback exclusive_caps=1 card_label="Android Virtual Camera" ''; - boot.kernelParams = ["ipv6.disable=1"]; + # boot.kernelParams = ["ipv6.disable=1"]; fileSystems."/" = { device = "rpool/root"; @@ -52,24 +52,15 @@ hardware.trackpoint.enable = lib.mkDefault true; hardware.trackpoint.emulateWheel = lib.mkDefault config.hardware.trackpoint.enable; hardware.trackpoint.device = "TPPS/2 Synaptics TrackPoint"; - hardware.ipu6.enable = true; - hardware.ipu6.platform = "ipu6ep"; nixpkgs.config.packageOverrides = pkgs: { zfs = pkgs.zfs_unstable; }; - # boot.kernelPackages = pkgs.linuxPackages_latest; - # boot.kernelPackages = pkgs.linuxPackages_latest.extend ( self: super: { - # ipu6-drivers = super.ipu6-drivers.overrideAttrs ( - # final: previous: rec { - # src = builtins.fetchGit { - # url = "https://github.com/intel/ipu6-drivers.git"; - # ref = "master"; - # rev = "4bb5b4d8128fbf7f4730cd364a8f7fc13a0ef65b"; - # }; - # patches = [ - # "${src}/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch" - # ] ; - # } - # ); - # } ); + boot.kernelPackages = pkgs.linuxPackages_latest; + hardware.firmware = with pkgs; [ + ipu6-camera-bins + ivsc-firmware + ]; + services.udev.extraRules = '' + SUBSYSTEM=="intel-ipu6-psys", MODE="0660", GROUP="video" + ''; } diff --git a/hosts/Common/desktop.nix b/hosts/Common/desktop.nix index f58d1d4..12e6d2c 100644 --- a/hosts/Common/desktop.nix +++ b/hosts/Common/desktop.nix @@ -48,12 +48,20 @@ services.gnome.sushi.enable = true; services.pipewire = { + wireplumber.enable = true; enable = true; alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; jack.enable = true; }; + services.pipewire.wireplumber.extraConfig = { + "99-libcamera" = { + "wireplumber.settings" = { + "camera.use-libcamera" = true; + }; + }; + }; hardware.bluetooth = { enable = true;