62 files changed, 123 insertions, 100 deletions
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 1e5a9ac..03879b4 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -1,9 +1,7 @@
 { config, self, ... }:
 {
   imports = [
-    ./hardware
     ./networking
-    ./security
     ./software
     ./variables
     ./virtualisation
diff --git a/modules/desktop/networking/default.nix b/modules/desktop/networking/default.nix
index e6f5b03..d91b90d 100644
--- a/modules/desktop/networking/default.nix
+++ b/modules/desktop/networking/default.nix
@@ -1,21 +1,8 @@
 {
   imports = [
     ./caddy.nix
-    ./dhcpcd.nix
     ./i2p.nix
     ./ipv6.nix
-    ./loopback.nix
-    ./networkmanager.nix
-    ./optimise.nix
-    ./pia.nix
     ./tor.nix
-    ./upnp.nix
   ];
-
-  # https://discourse.nixos.org/t/rebuild-error-failed-to-start-network-manager-wait-online/41977/2
-  systemd.network.wait-online.enable = false;
-  boot.initrd.systemd.network.wait-online.enable = false;
-
-  # https://discourse.nixos.org/t/how-to-disable-networkmanager-wait-online-service-in-the-configuration-file/19963/2
-  systemd.services.NetworkManager-wait-online.enable = false;
 }
diff --git a/modules/desktop/networking/i2p.nix b/modules/desktop/networking/i2p.nix
index 8bca73e..92fb657 100644
--- a/modules/desktop/networking/i2p.nix
+++ b/modules/desktop/networking/i2p.nix
@@ -1,5 +1,5 @@
 {
-  # https://voidcruiser.nl/rambles/i2p-on-nixos/
+  # <https://voidcruiser.nl/rambles/i2p-on-nixos/>
   containers.i2pd = {
     autoStart = true;
 
diff --git a/modules/desktop/software/default.nix b/modules/desktop/software/default.nix
index 179f4ad..01e196c 100644
--- a/modules/desktop/software/default.nix
+++ b/modules/desktop/software/default.nix
@@ -1,40 +1,13 @@
-{ pkgs, ... }:
 {
   imports = [
-    ./access
     ./boot
-    ./desktop
-    ./multimedia
     ./services
+    ./video
     ./aagl.nix
-    ./encryption.nix
     ./gaming.nix
-    ./input.nix
-    ./locale.nix
     ./programs.nix
-    ./shell.nix
     ./systemd.nix
-    ./users.nix
   ];
 
-  environment.enableAllTerminfo = true;
   services.displayManager.ly.enable = true;
-
-  system = {
-    autoUpgrade = {
-      enable = false;
-      allowReboot = false;
-    };
-
-    switch = {
-      enable = false;
-      enableNg = true;
-    };
-  };
-
-  console = {
-    earlySetup = true;
-    font = "ter-v16n";
-    packages = [ pkgs.terminus_font ];
-  };
 }
diff --git a/modules/desktop/software/locale.nix b/modules/desktop/software/locale.nix
deleted file mode 100644
index aded640..0000000
--- a/modules/desktop/software/locale.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  location.provider = "geoclue2";
-  time.hardwareClockInLocalTime = false;
-}
diff --git a/modules/desktop/software/services/default.nix b/modules/desktop/software/services/default.nix
index 4b9ccf6..49fc20c 100644
--- a/modules/desktop/software/services/default.nix
+++ b/modules/desktop/software/services/default.nix
@@ -1,24 +1,8 @@
-{ pkgs, ... }:
 {
   imports = [
-    # ./adb.nix
-    ./ananicy.nix
-    ./dbus.nix
     ./libinput.nix
-    ./logrotate.nix
     ./ollama.nix
-    # ./printing.nix
-    ./xserver.nix
   ];
 
-  services = {
-    printing.enable = false;
-    gnome.gnome-keyring.enable = true;
-    fstrim.enable = false;
-    gvfs.enable = true;
-    udev.packages = with pkgs; [ pkgs.logitech-udev-rules ];
-    thermald.enable = true;
-    irqbalance.enable = true;
-    gpm.enable = true;
-  };
+  services.xserver.videoDrivers = [ "nvidia" ];
 }
diff --git a/modules/desktop/software/services/libinput.nix b/modules/desktop/software/services/libinput.nix
index 643f814..e010873 100644
--- a/modules/desktop/software/services/libinput.nix
+++ b/modules/desktop/software/services/libinput.nix
@@ -1,13 +1,7 @@
 {
   services.libinput = {
     enable = true;
-
-    mouse = {
-      accelProfile = "flat";
-    };
-
-    touchpad = {
-      accelProfile = "flat";
-    };
+    mouse.accelProfile = "flat";
+    touchpad.accelProfile = "flat";
   };
 }
diff --git a/modules/desktop/software/services/xserver.nix b/modules/desktop/software/services/xserver.nix
deleted file mode 100644
index f1833a4..0000000
--- a/modules/desktop/software/services/xserver.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  services.xserver = {
-    xkb = {
-      layout = "us";
-      options = "caps:escape";
-    };
-
-    videoDrivers = [ "nvidia" ];
-  };
-}
diff --git a/modules/desktop/software/video/default.nix b/modules/desktop/software/video/default.nix
new file mode 100644
index 0000000..280a7d9
--- /dev/null
+++ b/modules/desktop/software/video/default.nix
@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./graphics.nix
+    ./libva.nix
+    ./nvidia.nix
+  ];
+}
diff --git a/modules/desktop/software/multimedia/video/graphics.nix b/modules/desktop/software/video/graphics.nix
index 13da295..13da295 100644
--- a/modules/desktop/software/multimedia/video/graphics.nix
+++ b/modules/desktop/software/video/graphics.nix
diff --git a/modules/desktop/software/multimedia/video/libva.nix b/modules/desktop/software/video/libva.nix
index d420495..d420495 100644
--- a/modules/desktop/software/multimedia/video/libva.nix
+++ b/modules/desktop/software/video/libva.nix
diff --git a/modules/desktop/software/multimedia/video/nvidia.nix b/modules/desktop/software/video/nvidia.nix
index c133bc2..c133bc2 100644
--- a/modules/desktop/software/multimedia/video/nvidia.nix
+++ b/modules/desktop/software/video/nvidia.nix
diff --git a/modules/desktop/variables/default.nix b/modules/desktop/variables/default.nix
index 8315ceb..0ca8cf0 100644
--- a/modules/desktop/variables/default.nix
+++ b/modules/desktop/variables/default.nix
@@ -1,7 +1,6 @@
 {
   imports = [
     ./electron.nix
-    ./fcitx.nix
     ./mozilla.nix
     ./nvidia.nix
     ./opengl.nix
@@ -9,12 +8,4 @@
     ./wayland.nix
     ./wlroots.nix
   ];
-
-  environment.variables = {
-    _JAVA_AWT_WM_NONREPARENTING = "1";
-    PROTON_ENABLE_NGX_UPDATER = "1";
-    GTK_USE_PORTAL = "1";
-    DIRENV_LOG_FORMAT = "";
-    SSH_AUTH_SOCK = "/run/user/1000/keyring/ssh";
-  };
 }
diff --git a/modules/pc/default.nix b/modules/pc/default.nix
index 97fe6b9..f35aff2 100644
--- a/modules/pc/default.nix
+++ b/modules/pc/default.nix
@@ -1,8 +1,13 @@
-{ pkgs, secrets, ... }:
+{ pkgs, ... }:
 {
-  i18n.defaultLocale = secrets.i18n.locale;
-  time.timeZone = secrets.i18n.timezone;
-  console.keyMap = secrets.i18n.keymap;
+  imports = [
+    ./hardware
+    ./networking
+    ./security
+    ./software
+    ./variables
+    ./locale.nix
+  ];
 
   environment.systemPackages = with pkgs; [
     vim
diff --git a/modules/desktop/hardware/bluetooth.nix b/modules/pc/hardware/bluetooth.nix
index 9737504..9737504 100644
--- a/modules/desktop/hardware/bluetooth.nix
+++ b/modules/pc/hardware/bluetooth.nix
diff --git a/modules/desktop/hardware/cpu.nix b/modules/pc/hardware/cpu.nix
index 1ac3a27..1ac3a27 100644
--- a/modules/desktop/hardware/cpu.nix
+++ b/modules/pc/hardware/cpu.nix
diff --git a/modules/desktop/hardware/default.nix b/modules/pc/hardware/default.nix
index 167e7c7..cc2915e 100644
--- a/modules/desktop/hardware/default.nix
+++ b/modules/pc/hardware/default.nix
@@ -1,7 +1,7 @@
 {
   imports = [
-    ./cpu.nix
     ./bluetooth.nix
+    ./cpu.nix
     ./usb.nix
     ./tpm.nix
     ./yubikey.nix
diff --git a/modules/desktop/hardware/tpm.nix b/modules/pc/hardware/tpm.nix
index b84551e..b84551e 100644
--- a/modules/desktop/hardware/tpm.nix
+++ b/modules/pc/hardware/tpm.nix
diff --git a/modules/desktop/hardware/usb.nix b/modules/pc/hardware/usb.nix
index f697761..f697761 100644
--- a/modules/desktop/hardware/usb.nix
+++ b/modules/pc/hardware/usb.nix
diff --git a/modules/desktop/hardware/yubikey.nix b/modules/pc/hardware/yubikey.nix
index 6bd4a5c..6bd4a5c 100644
--- a/modules/desktop/hardware/yubikey.nix
+++ b/modules/pc/hardware/yubikey.nix
diff --git a/modules/pc/locale.nix b/modules/pc/locale.nix
new file mode 100644
index 0000000..fa47fd5
--- /dev/null
+++ b/modules/pc/locale.nix
@@ -0,0 +1,10 @@
+{ secrets, ... }:
+{
+  i18n.defaultLocale = secrets.i18n.locale;
+  location.provider = "geoclue2";
+
+  time = {
+    timeZone = secrets.i18n.timezone;
+    hardwareClockInLocalTime = false;
+  };
+}
diff --git a/modules/pc/networking/default.nix b/modules/pc/networking/default.nix
new file mode 100644
index 0000000..f73f6ab
--- /dev/null
+++ b/modules/pc/networking/default.nix
@@ -0,0 +1,17 @@
+{
+  imports = [
+    ./dhcpcd.nix
+    ./loopback.nix
+    ./networkmanager.nix
+    ./optimise.nix
+    ./pia.nix
+    ./upnp.nix
+  ];
+
+  # https://discourse.nixos.org/t/rebuild-error-failed-to-start-network-manager-wait-online/41977/2
+  systemd.network.wait-online.enable = false;
+  boot.initrd.systemd.network.wait-online.enable = false;
+
+  # https://discourse.nixos.org/t/how-to-disable-networkmanager-wait-online-service-in-the-configuration-file/19963/2
+  systemd.services.NetworkManager-wait-online.enable = false;
+}
diff --git a/modules/desktop/networking/dhcpcd.nix b/modules/pc/networking/dhcpcd.nix
index f46b657..f46b657 100644
--- a/modules/desktop/networking/dhcpcd.nix
+++ b/modules/pc/networking/dhcpcd.nix
diff --git a/modules/desktop/networking/loopback.nix b/modules/pc/networking/loopback.nix
index 62e745e..62e745e 100644
--- a/modules/desktop/networking/loopback.nix
+++ b/modules/pc/networking/loopback.nix
diff --git a/modules/desktop/networking/networkmanager.nix b/modules/pc/networking/networkmanager.nix
index 7ef0e04..7ef0e04 100644
--- a/modules/desktop/networking/networkmanager.nix
+++ b/modules/pc/networking/networkmanager.nix
diff --git a/modules/desktop/networking/optimise.nix b/modules/pc/networking/optimise.nix
index c6f2bec..c6f2bec 100644
--- a/modules/desktop/networking/optimise.nix
+++ b/modules/pc/networking/optimise.nix
diff --git a/modules/desktop/networking/pia.nix b/modules/pc/networking/pia.nix
index d52dbf8..d52dbf8 100644
--- a/modules/desktop/networking/pia.nix
+++ b/modules/pc/networking/pia.nix
diff --git a/modules/desktop/networking/upnp.nix b/modules/pc/networking/upnp.nix
index 998592a..998592a 100644
--- a/modules/desktop/networking/upnp.nix
+++ b/modules/pc/networking/upnp.nix
diff --git a/modules/desktop/security/apparmor.nix b/modules/pc/security/apparmor.nix
index 170838c..170838c 100644
--- a/modules/desktop/security/apparmor.nix
+++ b/modules/pc/security/apparmor.nix
diff --git a/modules/desktop/security/audit.nix b/modules/pc/security/audit.nix
index 9922213..9922213 100644
--- a/modules/desktop/security/audit.nix
+++ b/modules/pc/security/audit.nix
diff --git a/modules/desktop/security/default.nix b/modules/pc/security/default.nix
index c1c084c..c1c084c 100644
--- a/modules/desktop/security/default.nix
+++ b/modules/pc/security/default.nix
diff --git a/modules/desktop/security/doas.nix b/modules/pc/security/doas.nix
index af717ca..af717ca 100644
--- a/modules/desktop/security/doas.nix
+++ b/modules/pc/security/doas.nix
diff --git a/modules/desktop/security/kernel.nix b/modules/pc/security/kernel.nix
index 62b2f28..62b2f28 100644
--- a/modules/desktop/security/kernel.nix
+++ b/modules/pc/security/kernel.nix
diff --git a/modules/desktop/security/pam.nix b/modules/pc/security/pam.nix
index b7eb426..b7eb426 100644
--- a/modules/desktop/security/pam.nix
+++ b/modules/pc/security/pam.nix
diff --git a/modules/desktop/security/polkit.nix b/modules/pc/security/polkit.nix
index 786d1a0..786d1a0 100644
--- a/modules/desktop/security/polkit.nix
+++ b/modules/pc/security/polkit.nix
diff --git a/modules/desktop/security/sudo.nix b/modules/pc/security/sudo.nix
index 6623b71..6623b71 100644
--- a/modules/desktop/security/sudo.nix
+++ b/modules/pc/security/sudo.nix
diff --git a/modules/desktop/software/access/default.nix b/modules/pc/software/access/default.nix
index 32d5500..32d5500 100644
--- a/modules/desktop/software/access/default.nix
+++ b/modules/pc/software/access/default.nix
diff --git a/modules/desktop/software/access/gnupg.nix b/modules/pc/software/access/gnupg.nix
index e60da30..e60da30 100644
--- a/modules/desktop/software/access/gnupg.nix
+++ b/modules/pc/software/access/gnupg.nix
diff --git a/modules/desktop/software/access/ssh.nix b/modules/pc/software/access/ssh.nix
index b514049..b514049 100644
--- a/modules/desktop/software/access/ssh.nix
+++ b/modules/pc/software/access/ssh.nix
diff --git a/modules/pc/software/default.nix b/modules/pc/software/default.nix
new file mode 100644
index 0000000..8638a58
--- /dev/null
+++ b/modules/pc/software/default.nix
@@ -0,0 +1,34 @@
+{ pkgs, secrets, ... }:
+{
+  imports = [
+    ./access
+    ./desktop
+    ./multimedia
+    ./services
+    ./encryption.nix
+    ./input.nix
+    ./shell.nix
+    ./users.nix
+  ];
+
+  environment.enableAllTerminfo = true;
+
+  system = {
+    autoUpgrade = {
+      enable = false;
+      allowReboot = false;
+    };
+
+    switch = {
+      enable = false;
+      enableNg = true;
+    };
+  };
+
+  console = {
+    earlySetup = true;
+    font = "ter-v16n";
+    keyMap = secrets.i18n.keymap;
+    packages = [ pkgs.terminus_font ];
+  };
+}
diff --git a/modules/desktop/software/desktop/default.nix b/modules/pc/software/desktop/default.nix
index bd2c811..bd2c811 100644
--- a/modules/desktop/software/desktop/default.nix
+++ b/modules/pc/software/desktop/default.nix
diff --git a/modules/desktop/software/desktop/gtk.nix b/modules/pc/software/desktop/gtk.nix
index 4357e75..4357e75 100644
--- a/modules/desktop/software/desktop/gtk.nix
+++ b/modules/pc/software/desktop/gtk.nix
diff --git a/modules/desktop/software/desktop/xdg-portal.nix b/modules/pc/software/desktop/xdg-portal.nix
index 72bcb97..72bcb97 100644
--- a/modules/desktop/software/desktop/xdg-portal.nix
+++ b/modules/pc/software/desktop/xdg-portal.nix
diff --git a/modules/desktop/software/encryption.nix b/modules/pc/software/encryption.nix
index 53a24bb..53a24bb 100644
--- a/modules/desktop/software/encryption.nix
+++ b/modules/pc/software/encryption.nix
diff --git a/modules/desktop/software/input.nix b/modules/pc/software/input.nix
index 5d43085..5d43085 100644
--- a/modules/desktop/software/input.nix
+++ b/modules/pc/software/input.nix
diff --git a/modules/desktop/software/multimedia/audio/default.nix b/modules/pc/software/multimedia/audio/default.nix
index f4e7f0a..f4e7f0a 100644
--- a/modules/desktop/software/multimedia/audio/default.nix
+++ b/modules/pc/software/multimedia/audio/default.nix
diff --git a/modules/desktop/software/multimedia/audio/pipewire.nix b/modules/pc/software/multimedia/audio/pipewire.nix
index 2824176..2824176 100644
--- a/modules/desktop/software/multimedia/audio/pipewire.nix
+++ b/modules/pc/software/multimedia/audio/pipewire.nix
diff --git a/modules/desktop/software/multimedia/audio/wireplumber.nix b/modules/pc/software/multimedia/audio/wireplumber.nix
index 970396f..970396f 100644
--- a/modules/desktop/software/multimedia/audio/wireplumber.nix
+++ b/modules/pc/software/multimedia/audio/wireplumber.nix
diff --git a/modules/desktop/software/multimedia/default.nix b/modules/pc/software/multimedia/default.nix
index 7bf261a..7bf261a 100644
--- a/modules/desktop/software/multimedia/default.nix
+++ b/modules/pc/software/multimedia/default.nix
diff --git a/modules/desktop/software/multimedia/video/default.nix b/modules/pc/software/multimedia/video/default.nix
index 31cdfd5..94aa42d 100644
--- a/modules/desktop/software/multimedia/video/default.nix
+++ b/modules/pc/software/multimedia/video/default.nix
@@ -1,10 +1,8 @@
 { pkgs, ... }:
 {
   imports = [
-    ./graphics.nix
-    ./libva.nix
-    ./nvidia.nix
     ./vulkan.nix
+    ./xserver.nix
   ];
 
   environment.systemPackages = [ pkgs.mediastreamer-openh264 ];
diff --git a/modules/desktop/software/multimedia/video/vulkan.nix b/modules/pc/software/multimedia/video/vulkan.nix
index be37e0e..be37e0e 100644
--- a/modules/desktop/software/multimedia/video/vulkan.nix
+++ b/modules/pc/software/multimedia/video/vulkan.nix
diff --git a/modules/pc/software/multimedia/video/xserver.nix b/modules/pc/software/multimedia/video/xserver.nix
new file mode 100644
index 0000000..9c16f4c
--- /dev/null
+++ b/modules/pc/software/multimedia/video/xserver.nix
@@ -0,0 +1,6 @@
+{
+  services.xserver.xkb = {
+    layout = "us";
+    options = "caps:escape";
+  };
+}
diff --git a/modules/desktop/software/services/adb.nix b/modules/pc/software/services/adb.nix
index d106ead..d106ead 100644
--- a/modules/desktop/software/services/adb.nix
+++ b/modules/pc/software/services/adb.nix
diff --git a/modules/desktop/software/services/ananicy.nix b/modules/pc/software/services/ananicy.nix
index bdc9bbd..bdc9bbd 100644
--- a/modules/desktop/software/services/ananicy.nix
+++ b/modules/pc/software/services/ananicy.nix
diff --git a/modules/desktop/software/services/dbus.nix b/modules/pc/software/services/dbus.nix
index 8b25bf9..8b25bf9 100644
--- a/modules/desktop/software/services/dbus.nix
+++ b/modules/pc/software/services/dbus.nix
diff --git a/modules/pc/software/services/default.nix b/modules/pc/software/services/default.nix
new file mode 100644
index 0000000..92baa54
--- /dev/null
+++ b/modules/pc/software/services/default.nix
@@ -0,0 +1,22 @@
+{ pkgs, ... }:
+{
+  imports = [
+    # ./adb.nix
+    ./ananicy.nix
+    ./dbus.nix
+    ./logrotate.nix
+    # ./printing.nix
+  ];
+
+  services = {
+    printing.enable = false;
+    gnome.gnome-keyring.enable = true;
+    fstrim.enable = false;
+    gvfs.enable = true;
+    udev.packages = [ pkgs.logitech-udev-rules ];
+    thermald.enable = true;
+    irqbalance.enable = true;
+    gpm.enable = true;
+    libinput.enable = true;
+  };
+}
diff --git a/modules/desktop/software/services/logrotate.nix b/modules/pc/software/services/logrotate.nix
index 2dedf2e..2dedf2e 100644
--- a/modules/desktop/software/services/logrotate.nix
+++ b/modules/pc/software/services/logrotate.nix
diff --git a/modules/desktop/software/services/printing.nix b/modules/pc/software/services/printing.nix
index f7a38de..f7a38de 100644
--- a/modules/desktop/software/services/printing.nix
+++ b/modules/pc/software/services/printing.nix
diff --git a/modules/desktop/software/shell.nix b/modules/pc/software/shell.nix
index 0b3508f..0b3508f 100644
--- a/modules/desktop/software/shell.nix
+++ b/modules/pc/software/shell.nix
diff --git a/modules/desktop/software/users.nix b/modules/pc/software/users.nix
index ab3fe03..ab3fe03 100644
--- a/modules/desktop/software/users.nix
+++ b/modules/pc/software/users.nix
diff --git a/modules/pc/variables/default.nix b/modules/pc/variables/default.nix
new file mode 100644
index 0000000..1a0e958
--- /dev/null
+++ b/modules/pc/variables/default.nix
@@ -0,0 +1,11 @@
+{
+  imports = [ ./fcitx.nix ];
+
+  environment.variables = {
+    _JAVA_AWT_WM_NONREPARENTING = "1";
+    PROTON_ENABLE_NGX_UPDATER = "1";
+    GTK_USE_PORTAL = "1";
+    DIRENV_LOG_FORMAT = "";
+    SSH_AUTH_SOCK = "/run/user/1000/keyring/ssh";
+  };
+}
diff --git a/modules/desktop/variables/fcitx.nix b/modules/pc/variables/fcitx.nix
index 0ac550f..0ac550f 100644
--- a/modules/desktop/variables/fcitx.nix
+++ b/modules/pc/variables/fcitx.nix