12 files changed, 11 insertions, 15 deletions
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 03879b4..aeed06a 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -3,8 +3,8 @@
   imports = [
     ./networking
     ./software
-    ./variables
     ./virtualisation
+    ./variables.nix
   ];
 
   sops.defaultSopsFile = "${self}/secrets/${config.networking.hostName}.yaml";
diff --git a/modules/desktop/software/systemd.nix b/modules/desktop/software/systemd.nix
index c475d96..2d524ac 100644
--- a/modules/desktop/software/systemd.nix
+++ b/modules/desktop/software/systemd.nix
@@ -1,7 +1,5 @@
 { pkgs, ... }:
 {
-  boot.initrd.systemd.enable = true;
-
   systemd.services.containerd.path = with pkgs; [
     containerd
     runc
diff --git a/modules/desktop/variables/nvidia.nix b/modules/desktop/variables.nix
index 3d50fdf..3d50fdf 100644
--- a/modules/desktop/variables/nvidia.nix
+++ b/modules/desktop/variables.nix
diff --git a/modules/desktop/variables/default.nix b/modules/desktop/variables/default.nix
deleted file mode 100644
index 0ca8cf0..0000000
--- a/modules/desktop/variables/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  imports = [
-    ./electron.nix
-    ./mozilla.nix
-    ./nvidia.nix
-    ./opengl.nix
-    ./qt.nix
-    ./wayland.nix
-    ./wlroots.nix
-  ];
-}
diff --git a/modules/pc/software/boot/default.nix b/modules/pc/software/boot/default.nix
index 0798849..41531c8 100644
--- a/modules/pc/software/boot/default.nix
+++ b/modules/pc/software/boot/default.nix
@@ -10,6 +10,7 @@
     crashDump.enable = false;
     consoleLogLevel = 3;
     kernelPackages = pkgs.linuxPackages_zen;
+    initrd.systemd.enable = true;
 
     kernelParams = [
       "iommu=pt"
diff --git a/modules/pc/variables/default.nix b/modules/pc/variables/default.nix
index 1a0e958..c4f3d48 100644
--- a/modules/pc/variables/default.nix
+++ b/modules/pc/variables/default.nix
@@ -1,5 +1,13 @@
 {
-  imports = [ ./fcitx.nix ];
+  imports = [
+    ./electron.nix
+    ./fcitx.nix
+    ./mozilla.nix
+    ./opengl.nix
+    ./qt.nix
+    ./wayland.nix
+    ./wlroots.nix
+  ];
 
   environment.variables = {
     _JAVA_AWT_WM_NONREPARENTING = "1";
diff --git a/modules/desktop/variables/electron.nix b/modules/pc/variables/electron.nix
index 62e7c72..62e7c72 100644
--- a/modules/desktop/variables/electron.nix
+++ b/modules/pc/variables/electron.nix
diff --git a/modules/desktop/variables/mozilla.nix b/modules/pc/variables/mozilla.nix
index e85d27c..e85d27c 100644
--- a/modules/desktop/variables/mozilla.nix
+++ b/modules/pc/variables/mozilla.nix
diff --git a/modules/desktop/variables/opengl.nix b/modules/pc/variables/opengl.nix
index 1edce45..1edce45 100644
--- a/modules/desktop/variables/opengl.nix
+++ b/modules/pc/variables/opengl.nix
diff --git a/modules/desktop/variables/qt.nix b/modules/pc/variables/qt.nix
index cedf6a0..cedf6a0 100644
--- a/modules/desktop/variables/qt.nix
+++ b/modules/pc/variables/qt.nix
diff --git a/modules/desktop/variables/wayland.nix b/modules/pc/variables/wayland.nix
index ee21d52..ee21d52 100644
--- a/modules/desktop/variables/wayland.nix
+++ b/modules/pc/variables/wayland.nix
diff --git a/modules/desktop/variables/wlroots.nix b/modules/pc/variables/wlroots.nix
index 25aaf4d..25aaf4d 100644
--- a/modules/desktop/variables/wlroots.nix
+++ b/modules/pc/variables/wlroots.nix