diff --git a/common.nix b/common.nix
index 99e25fe..c7cd1be 100644
--- a/common.nix
+++ b/common.nix
@@ -138,6 +138,7 @@ with builtins; {
   boot.kernel.sysctl."vm.max_map_count" = 2147483642;
 
   hardware = {
+    opengl.enable = true;
     uinput.enable = true;
     bluetooth.enable = true;
     # keyboard.uhk.enable = true;
diff --git a/hosts/catbook-j/configuration.nix b/hosts/catbook-j/configuration.nix
index d0f1c6b..248d870 100644
--- a/hosts/catbook-j/configuration.nix
+++ b/hosts/catbook-j/configuration.nix
@@ -19,12 +19,7 @@
     ./modules
   ];
   jade = {
-    hwKey.pamAuth.enable = true;
     desktop = {
-      dm.autoLogin = {
-        enable = true;
-        delay = 5;
-      };
       syncthing.enable = true;
       kdeconnect.enable = true;
       cloud.enable = true;
@@ -46,6 +41,18 @@
     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";
@@ -74,6 +81,10 @@
   };
 
   boot.kernelPackages = pkgs.linuxPackages_zen;
+  services.displayManager.autoLogin = {
+    enable = true;
+    user = "jade";
+  };
 
   # networking
   networking.networkmanager.enable = true;
diff --git a/hosts/catbook-j/modules/default.nix b/hosts/catbook-j/modules/default.nix
index ffe8790..935baf9 100644
--- a/hosts/catbook-j/modules/default.nix
+++ b/hosts/catbook-j/modules/default.nix
@@ -1,6 +1,5 @@
 {...}: {
   imports = [
     ./input.nix
-    ./graphics.nix
   ];
 }
diff --git a/hosts/catbook-j/modules/graphics.nix b/hosts/catbook-j/modules/graphics.nix
deleted file mode 100644
index e359044..0000000
--- a/hosts/catbook-j/modules/graphics.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{pkgs, ...}: {
-  hardware.graphics = {
-    extraPackages = with pkgs; [
-      intel-ocl
-      intel-media-driver
-      intel-vaapi-driver
-      intel-compute-runtime
-      libvdpau-va-gl
-      mesa.drivers
-    ];
-  };
-}
diff --git a/hosts/monosodium-glutamate-g/configuration.nix b/hosts/monosodium-glutamate-g/configuration.nix
index 471c1a9..43e62b7 100644
--- a/hosts/monosodium-glutamate-g/configuration.nix
+++ b/hosts/monosodium-glutamate-g/configuration.nix
@@ -6,11 +6,9 @@
     ./hardware-configuration.nix
     ../../common.nix
     ../../modules
-    ./modules
   ];
 
   jade = {
-    hwKey.pamAuth.enable = true;
     desktop = {
       syncthing.enable = true;
       kdeconnect.enable = true;
@@ -59,6 +57,9 @@
     # TODO: clean up.
     zenstates
     zenmonitor
+    nvtop-amd
+    radeontop
+    rgp
     tea
     blender-hip
   ];
diff --git a/hosts/monosodium-glutamate-g/modules/default.nix b/hosts/monosodium-glutamate-g/modules/default.nix
deleted file mode 100644
index 213189f..0000000
--- a/hosts/monosodium-glutamate-g/modules/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{}: {
-  imports = [
-    ./graphics.nix
-  ];
-}
diff --git a/hosts/monosodium-glutamate-g/modules/graphics.nix b/hosts/monosodium-glutamate-g/modules/graphics.nix
deleted file mode 100644
index 5732629..0000000
--- a/hosts/monosodium-glutamate-g/modules/graphics.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = [
-    pkgs.nvtop-amd
-    pkgs.radeontop
-    pkgs.rgp
-  ];
-}
diff --git a/modules/default.nix b/modules/default.nix
index afe2abc..adf3726 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -6,6 +6,5 @@
     ./firewall.nix
     ./desktop-environment
     ./input
-    ./graphics.nix
   ];
 }
diff --git a/modules/desktop-environment/default.nix b/modules/desktop-environment/default.nix
index 4a5b04f..59206a0 100644
--- a/modules/desktop-environment/default.nix
+++ b/modules/desktop-environment/default.nix
@@ -3,7 +3,6 @@
     ./audio.nix
     ./flatpak.nix
     ./home
-    ./dm.nix
   ];
   services.upower = {
     enable = true;
diff --git a/modules/desktop-environment/dm.nix b/modules/desktop-environment/dm.nix
deleted file mode 100644
index ebdb023..0000000
--- a/modules/desktop-environment/dm.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  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;
-        };
-      };
-    };
-  }
diff --git a/modules/desktop/x.nix b/modules/desktop/x.nix
index b8527c6..00178fb 100644
--- a/modules/desktop/x.nix
+++ b/modules/desktop/x.nix
@@ -6,6 +6,14 @@
       xterm.enable = false;
     };
 
+    displayManager = {
+      gdm.enable = true;
+      sessionPackages = [
+        pkgs.sway
+      ];
+      gdm.autoLogin.delay = 5;
+    };
+
     windowManager.xmonad = {
       enable = true;
     };
@@ -13,4 +21,7 @@
 
   security.polkit.enable = true;
   programs.sway.enable = true;
+
+  # services.displayManager.defaultSession = "none+xmonad";
+  services.displayManager.defaultSession = "sway";
 }
diff --git a/modules/graphics.nix b/modules/graphics.nix
deleted file mode 100644
index 910a0e2..0000000
--- a/modules/graphics.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{...}: {
-  hardware.graphics.enable = true;
-}
diff --git a/modules/hardware/hardware_key.nix b/modules/hardware/hardware_key.nix
index 1f75106..8510d86 100644
--- a/modules/hardware/hardware_key.nix
+++ b/modules/hardware/hardware_key.nix
@@ -1,35 +1,20 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.jade.hwKey;
-in
-  with lib; {
-    options.jade.hwKey = {
-      pamAuth.enable = mkEnableOption "Enable PAM authentication with hardware keys";
+{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";
     };
-    config = {
-      # nitrokey
-      services.udev.packages = [pkgs.nitrokey-udev-rules];
+  };
 
-      # 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;
-    };
-  }
+  programs.i3lock.u2fSupport = true;
+}
diff --git a/modules/shell/nu.nix b/modules/shell/nu.nix
index dbf1df8..88cf0d6 100644
--- a/modules/shell/nu.nix
+++ b/modules/shell/nu.nix
@@ -11,6 +11,11 @@
     };
     home.packages = [
       pkgs.pueue
+      pkgs.nushellPlugins.net
+      pkgs.nushellPlugins.query
+      pkgs.nushellPlugins.gstat
+      pkgs.nushellPlugins.polars
+      pkgs.nushellPlugins.formats
     ];
     programs.nushell = {
       enable = true;
@@ -18,13 +23,9 @@
       configFile.source = ../../other/config.nu;
       envFile.source = ../../other/env.nu;
       extraConfig = ''
-        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;
+        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;
       '';
     };
     programs.starship.enableNushellIntegration = true;