Major cleanup

hosts/desktops/common/boot.nix

@@ -4,16 +4,7 @@
   boot = {
     plymouth.enable = true;
     initrd.systemd.enable = true;
-    loader = {
-      efi.efiSysMountPoint = "/boot/efi";
-      systemd-boot = {
-        sortKey = "aa";
-        netbootxyz = {
-          enable = true;
-          sortKey = "zz";
-        };
-      };
-    };
+    loader.efi.efiSysMountPoint = "/boot/efi";
     kernelPackages = pkgs.linuxPackages_xanmod_latest;
     extraModprobeConfig = ''
       options bluetooth disable_ertm=1

hosts/desktops/common/hardware.nix

@@ -4,7 +4,7 @@
   hardware = {
     xpadneo.enable = true;
     bluetooth.enable = true;
-    pulseaudio.enable = false; # Use pipewire instead
+    pulseaudio.enable = false;
     steam-hardware.enable = true; # Allow steam client to manage controllers
     graphics.enable32Bit = true; # For OpenGL games
     i2c.enable = true;

hosts/desktops/common/packages.nix

@@ -34,6 +34,7 @@ in {
       krita
       libfido2
       libreoffice-qt
+      lilipod
       mangohud
       microsoft-edge
       mission-center
@@ -92,7 +93,7 @@ in {
     };
     nh = {
       enable = true;
-      flake = "/home/user/Projects/nix-config";
+      flake = "/home/user/Projects/personal/nix-config";
     };
   };
 

hosts/desktops/common/services.nix

@@ -2,10 +2,7 @@
 
 {
   services = {
-    printing = {
-      enable = true;
-      drivers = with pkgs; [ epson-escpr ];
-    };
+    printing.enable = true;
     udev.packages = with pkgs; [ yubikey-personalization ];
     desktopManager.plasma6.enable = true;
     nginx = {

hosts/desktops/rotterdam.nix

@@ -46,13 +46,10 @@ in {
     keyd = {
       enable = true;
       keyboards.main = {
-        ids = [ "*" ];
-        settings = {
-          main = { esc = "overload(meta, esc)"; };
-          shift = {
-            leftshift = "capslock";
-            rightshift = "capslock";
-          };
+        ids = [ "5653:0001" ];
+        settings.main = {
+          esc = "overload(meta, esc)";
+          shift = "oneshot(shift)";
         };
       };
     };
@@ -70,11 +67,13 @@ in {
     kernelParams = [
       "processor.max_cstate=1" # Fixes bug where ryzen cpus freeze when in highest C state
       "clearcpuid=514"
+      # Fixes amdgpu freezing
       "amdgpu.noretry=0"
       "amdgpu.ppfeaturemask=0xfffd3fff"
       "amdgpu.gpu_recovery=1"
       "amdgpu.lockup_timeout=1000"
     ];
+    # QubesOS boot entry
     loader.systemd-boot = {
       extraFiles = {
         "efi/edk2-shell/shell.efi" = "${pkgs.edk2-uefi-shell}/shell.efi";