4 files changed, 13 insertions, 7 deletions
diff --git a/host/Rory-desktop/optional/gui/wayland.nix b/host/Rory-desktop/optional/gui/wayland.nix
index c923007..74cb192 100644
--- a/host/Rory-desktop/optional/gui/wayland.nix
+++ b/host/Rory-desktop/optional/gui/wayland.nix
@@ -34,6 +34,8 @@
       wl-clipboard
       grim
       slurp
+      easyeffects
+      keepassxc
     ];
   };
 
diff --git a/host/Rory-desktop/optional/gui/x11.nix b/host/Rory-desktop/optional/gui/x11.nix
index 4bf9fe4..0f55862 100644
--- a/host/Rory-desktop/optional/gui/x11.nix
+++ b/host/Rory-desktop/optional/gui/x11.nix
@@ -13,13 +13,18 @@
         xrandr --output HDMI-1 --mode 3840x2160 --pos 0x0 --rotate normal --primary --output DP-1 --mode 1920x1080 --pos 3840x1080 --rotate normal --output HDMI-2 --off --output DP-2 --off
         ${pkgs.polybarFull}/bin/polybar &
         ${pkgs.dunst}/bin/dunst &
+        ${pkgs.picom}/bin/picom --config ~/.config/picom.conf &
         ${pkgs.feh}/bin/feh --no-fehbg --bg-fill ${../../../../modules/users/Rory/wallpaper.webp}
       '';
+      windowManager.i3.extraPackages = with pkgs; [
+        easyeffects
+        keepassxc
+      ];
     };
 
-    picom.enable = true;
-    picom.vSync = false;
-    picom.backend = "glx";
+    picom.enable = false;
+    #picom.vSync = false;
+    #picom.backend = "glx";
   };
 
 }
diff --git a/host/Rory-desktop/optional/hardware-specific/amd.nix b/host/Rory-desktop/optional/hardware-specific/amd.nix
index d44766a..45bea66 100644
--- a/host/Rory-desktop/optional/hardware-specific/amd.nix
+++ b/host/Rory-desktop/optional/hardware-specific/amd.nix
@@ -21,10 +21,9 @@ boot.initrd.kernelModules = [ "amdgpu" ];
   ];
 
   hardware = {
-    opengl = {
+    graphics = {
       enable = true;
-      driSupport = true;
-      driSupport32Bit = true;
+      enable32Bit = true;
       extraPackages = with pkgs; [
         rocmPackages.clr.icd
         amdvlk
diff --git a/host/Rory-desktop/optional/hardware-specific/nvidia.nix b/host/Rory-desktop/optional/hardware-specific/nvidia.nix
index 7278d84..66b328f 100644
--- a/host/Rory-desktop/optional/hardware-specific/nvidia.nix
+++ b/host/Rory-desktop/optional/hardware-specific/nvidia.nix
@@ -18,7 +18,7 @@
   };
 
   hardware = {
-    opengl = {
+    graphics = {
       enable = true;
       driSupport = true;
       driSupport32Bit = true;