organise stuff

hardware/displays.nix

@@ -1,9 +1,8 @@
 {...}: {
   displays = {
     enable = true;
-    displays = [
-      {
-        name = "DP-1";
+    displays = {
+      "hp" = {
         description = "HP Inc. HP 24x 1CR9500W9Q";
         resolution = {
           x = 1920;
@@ -12,10 +11,8 @@
         };
         position.x = 0;
         position.y = 0;
-        wallpaper = ../images/demonslayer.png;
-      }
-      {
-        name = "HDMI-A-1";
+      };
+      "asus" = {
         resolution = {
           x = 1920;
           y = 1080;
@@ -25,9 +22,8 @@
           x = 1920;
           y = 0;
         };
-        wallpaper = ../images/nier2.jpg;
         rotation = 1;
-      }
-    ];
+      };
+    };
   };
 }

hardware/g920.nix

@@ -0,0 +1,29 @@
+{
+  pkgs,
+  user,
+}: {
+  home-manager.users.${user}.imports = [
+    {
+      home.packages = with pkgs; [
+        oversteer
+      ];
+    }
+  ];
+
+  environment.etc.logitechG920 = {
+    target = "usb_modeswitch.d/046d:c261";
+    text = ''
+      DefaultVendor=046d
+      DefaultProduct=c261
+      MessageEndpoint=01
+      ResponseEndpoint=01
+      TargetClass=0x03
+      MessageContent="0f00010142"
+    '';
+  };
+
+  services.udev.extraRules = ''
+    ATTR{idVendor}=="046d", ATTR{idProduct}=="c261", RUN+="${pkgs.usb-modeswitch}/bin/usb_modeswitch -c '/etc/usb_modeswitch.d/046d:c261'"
+  '';
+  hardware.new-lg4ff.enable = true;
+}

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;
+      };
+    };
+  };
 }