More Wayland setup and add Proton desktop apps

vbe0201 · Jun 12, 2024 · 225abda · 225abda
1 parent a93a8e1
commit 225abda
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/home/packages/apps.nix b/home/packages/apps.nix
@@ -10,6 +10,11 @@
     gimp
     keepassxc
     obs-studio
+    thunderbird
+    unstable.proton-pass
+    unstable.protonmail-bridge-gui
+    unstable.protonvpn-gui
+    v4l-utils
     wireshark
     zoom-us
   ];

diff --git a/hosts/default.nix b/hosts/default.nix
@@ -91,11 +91,12 @@ in {
       ../modules/hw/nvidia.nix
       ../modules/hw/switch.nix
       ../modules/hw/yubikey.nix
-      ../modules/vpn/mullvad.nix
       ../modules/vpn/sext.nix
     ];
     isWSL = false;
     homeModules = [
+      ../home/wayland
+
       ../home/alacritty.nix
       ../home/firefox.nix
       ../home/git.nix
@@ -122,7 +123,6 @@ in {
       ../modules/desktop/kde.nix
       ../modules/hw/switch.nix
       ../modules/hw/yubikey.nix
-      ../modules/vpn/mullvad.nix
       ../modules/vpn/sext.nix
     ];
     isWSL = false;

diff --git a/hosts/glacier.nix b/hosts/glacier.nix
@@ -23,15 +23,13 @@
     ];
     initrd.kernelModules = [];
 
-    kernelModules = ["kvm-amd"];
-    extraModulePackages = [];
+    kernelModules = ["kvm-amd" "v4l2loopback"];
+    extraModulePackages = [pkgs.linuxPackages.v4l2loopback];
 
     loader.systemd-boot.enable = true;
     loader.efi.canTouchEfiVariables = true;
 
     supportedFilesystems = ["ntfs"];
-
-    kernelPackages = pkgs.unstable.linuxPackages_latest;
   };
 
   hardware.cpu.amd.updateMicrocode = true;

diff --git a/modules/vpn/mullvad.nix b/modules/vpn/mullvad.nix