move some graphics stuff into individual modules/files

common.nix

@@ -138,7 +138,6 @@ with builtins; {
   boot.kernel.sysctl."vm.max_map_count" = 2147483642;
 
   hardware = {
-    opengl.enable = true;
     uinput.enable = true;
     bluetooth.enable = true;
     # keyboard.uhk.enable = true;

hosts/catbook-j/configuration.nix

@@ -19,7 +19,12 @@
     ./modules
   ];
   jade = {
+    hwKey.pamAuth.enable = true;
     desktop = {
+      dm.autoLogin = {
+        enable = true;
+        delay = 5;
+      };
       syncthing.enable = true;
       kdeconnect.enable = true;
       cloud.enable = true;
@@ -41,18 +46,6 @@
     S10E_JRNL_FILE_LOC = "/home/jade/Docs/jrnl.md";
   };
 
-  hardware.opengl = {
-    enable = true;
-    extraPackages = with pkgs; [
-      intel-ocl
-      intel-media-driver
-      intel-vaapi-driver
-      intel-compute-runtime
-      libvdpau-va-gl
-      mesa.drivers
-    ];
-  };
-
   programs.wireshark.enable = true;
 
   boot.resumeDevice = "/dev/disk/by-uuid/4f9e8afa-f8d7-40bf-b3ea-17e8e8fbb694";
@@ -81,10 +74,6 @@
   };
 
   boot.kernelPackages = pkgs.linuxPackages_zen;
-  services.displayManager.autoLogin = {
-    enable = true;
-    user = "jade";
-  };
 
   # networking
   networking.networkmanager.enable = true;

hosts/catbook-j/modules/default.nix

@@ -1,5 +1,6 @@
 {...}: {
   imports = [
     ./input.nix
+    ./graphics.nix
   ];
 }

hosts/catbook-j/modules/graphics.nix

@@ -0,0 +1,12 @@
+{pkgs, ...}: {
+  hardware.graphics = {
+    extraPackages = with pkgs; [
+      intel-ocl
+      intel-media-driver
+      intel-vaapi-driver
+      intel-compute-runtime
+      libvdpau-va-gl
+      mesa.drivers
+    ];
+  };
+}

hosts/monosodium-glutamate-g/configuration.nix

@@ -6,9 +6,11 @@
     ./hardware-configuration.nix
     ../../common.nix
     ../../modules
+    ./modules
   ];
 
   jade = {
+    hwKey.pamAuth.enable = true;
     desktop = {
       syncthing.enable = true;
       kdeconnect.enable = true;
@@ -57,9 +59,6 @@
     # TODO: clean up.
     zenstates
     zenmonitor
-    nvtop-amd
-    radeontop
-    rgp
     tea
     blender-hip
   ];

hosts/monosodium-glutamate-g/modules/default.nix

@@ -0,0 +1,5 @@
+{}: {
+  imports = [
+    ./graphics.nix
+  ];
+}

hosts/monosodium-glutamate-g/modules/graphics.nix

@@ -0,0 +1,7 @@
+{pkgs, ...}: {
+  environment.systemPackages = [
+    pkgs.nvtop-amd
+    pkgs.radeontop
+    pkgs.rgp
+  ];
+}

modules/default.nix

@@ -6,5 +6,6 @@
     ./firewall.nix
     ./desktop-environment
     ./input
+    ./graphics.nix
   ];
 }

modules/desktop-environment/default.nix

@@ -3,6 +3,7 @@
     ./audio.nix
     ./flatpak.nix
     ./home
+    ./dm.nix
   ];
   services.upower = {
     enable = true;

modules/desktop-environment/dm.nix

@@ -0,0 +1,36 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.jade.desktop.dm;
+in
+  with lib; {
+    options.jade.desktop.dm.autoLogin = {
+      enable = mkEnableOption "Enable Autologin";
+      delay = mkOption {
+        type = types.int;
+        default = 0;
+      };
+    };
+    config.services = {
+      displayManager = {
+        autoLogin = {
+          enable = cfg.autoLogin.enable;
+          user = "jade";
+        };
+        defaultSession = "sway";
+        sessionPackages = [
+          pkgs.sway
+        ];
+      };
+      xserver.displayManager.gdm = {
+        enable = true;
+        banner = "Meow :3";
+        autoLogin = {
+          delay = cfg.autoLogin.delay;
+        };
+      };
+    };
+  }

modules/desktop/x.nix

@@ -6,14 +6,6 @@
       xterm.enable = false;
     };
 
-    displayManager = {
-      gdm.enable = true;
-      sessionPackages = [
-        pkgs.sway
-      ];
-      gdm.autoLogin.delay = 5;
-    };
-
     windowManager.xmonad = {
       enable = true;
     };
@@ -21,7 +13,4 @@
 
   security.polkit.enable = true;
   programs.sway.enable = true;
-
-  # services.displayManager.defaultSession = "none+xmonad";
-  services.displayManager.defaultSession = "sway";
 }

modules/graphics.nix

@@ -0,0 +1,3 @@
+{...}: {
+  hardware.graphics.enable = true;
+}

modules/hardware/hardware_key.nix

@@ -1,20 +1,35 @@
-{pkgs, ...}: {
-  # nitrokey
-  services.udev.packages = [pkgs.nitrokey-udev-rules];
-
-  # smartcard daemon
-  services.pcscd.enable = true;
-
-  # authenticate using hw key
-  security.pam = {
-    services.jade.u2fAuth = true;
-    u2f = {
-      enable = true;
-      cue = true;
-      control = "sufficient";
-      authFile = "/home/jade/.ssh/u2f_keys";
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.jade.hwKey;
+in
+  with lib; {
+    options.jade.hwKey = {
+      pamAuth.enable = mkEnableOption "Enable PAM authentication with hardware keys";
     };
-  };
+    config = {
+      # nitrokey
+      services.udev.packages = [pkgs.nitrokey-udev-rules];
 
-  programs.i3lock.u2fSupport = true;
-}
+      # smartcard daemon
+      services.pcscd.enable = true;
+
+      # authenticate using hw key
+      security.pam = {
+        services.jade.u2fAuth = cfg.pamAuth.enable;
+        u2f = {
+          enable = true;
+          control = "sufficient";
+          settings = {
+            cue = true;
+            authFile = "/home/jade/.ssh/u2f_keys";
+          };
+        };
+      };
+
+      programs.i3lock.u2fSupport = true;
+    };
+  }

modules/shell/nu.nix

@@ -11,11 +11,6 @@
     };
     home.packages = [
       pkgs.pueue
-      pkgs.nushellPlugins.net
-      pkgs.nushellPlugins.query
-      pkgs.nushellPlugins.gstat
-      pkgs.nushellPlugins.polars
-      pkgs.nushellPlugins.formats
     ];
     programs.nushell = {
       enable = true;
@@ -23,9 +18,13 @@
       configFile.source = ../../other/config.nu;
       envFile.source = ../../other/env.nu;
       extraConfig = ''
-        plugin use ${pkgs.nushellPlugins.query}/bin/nu_plugin_query;
-        plugin use ${pkgs.nushellPlugins.polars}/bin/nu_plugin_polars;
-        plugin use ${pkgs.nushellPlugins.formats}/bin/nu_plugin_formats;
+        plugin add ${pkgs.nushellPlugins.query}/bin/nu_plugin_query;
+        plugin add ${pkgs.nushellPlugins.polars}/bin/nu_plugin_polars;
+        plugin add ${pkgs.nushellPlugins.formats}/bin/nu_plugin_formats;
+
+        plugin use query;
+        plugin use polars;
+        plugin use formats;
       '';
     };
     programs.starship.enableNushellIntegration = true;