organise stuff

hardware/zenix.nix

@@ -9,6 +9,7 @@
     (modulesPath + "/installer/scan/not-detected.nix")
     ./displays.nix
     ./ddc.nix
+    (import ./g920.nix {inherit user pkgs;})
   ];
 
   boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
@@ -70,10 +71,6 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  hardware.opengl = {
-    enable = true;
-    driSupport32Bit = true;
-  };
 
   hardware.keyboard.zsa.enable = true;
 
@@ -95,9 +92,9 @@
     {
       home.stateVersion = "22.05";
 
+      # TODO: put this in the displays module
       wayland.windowManager.hyprland = {
         extraConfig = ''
-          workspace = DP-1, 1
           workspace = 1, monitor:DP-1
           workspace = 2, monitor:DP-1
           workspace = 3, monitor:DP-1
@@ -105,9 +102,25 @@
           workspace = 5, monitor:DP-1
         '';
       };
-      programs.waybar.settings.mainBar."hyprland/workspaces".persistent_workspaces = {
-        DP-1 = 5;
-      };
     }
   ];
+
+  displays = {
+    displays."hp" = {
+      name = "DP-1";
+      wallpaper = ../images/demonslayer.png;
+      workspaces = {
+        start = 1;
+        end = 5;
+      };
+    };
+    displays."asus" = {
+      name = "HDMI-A-1";
+      wallpaper = ../images/nier2.jpg;
+      workspaces = {
+        start = 6;
+        end = 10;
+      };
+    };
+  };
 }