diff --git a/maddie/common/xdg.nix b/maddie/common/xdg.nix
new file mode 100644
index 0000000..6506006
--- /dev/null
+++ b/maddie/common/xdg.nix
@@ -0,0 +1,21 @@
+{ config, ... }:
+
+{
+  home = {
+    sessionVariables = {
+      # Force use of XDG Dir Spec
+      CUDA_CACHE_PATH = "${config.xdg.cacheHome}/nv";
+      LESSHISTFILE = "${config.xdg.configHome}/less/history";
+      LESSKEY = "${config.xdg.configHome}/less/keys";
+      WINEPREFIX = "${config.xdg.dataHome}/wine";
+      _JAVA_OPTIONS = "-Djava.util.prefs.userRoot=${config.xdg.configHome}/java";
+    };
+
+    shellAliases = {
+      # Force use of XDG Dir Spec
+      wget = "wget --hsts-file='${config.xdg.dataHome}/wget-hsts'";
+      rxrdb = "xrdb -load '${config.xdg.configHome}/.config/X11/xresources'";
+      nvidia-settings = "nvidia-settings --config='${config.xdg.configHome}'/nvidia/settings";
+    };
+  };
+}
diff --git a/maddie/nixos/xdg.nix b/maddie/nixos/xdg.nix
index 08a1993..500e533 100644
--- a/maddie/nixos/xdg.nix
+++ b/maddie/nixos/xdg.nix
@@ -50,24 +50,10 @@
 
   home = {
     sessionVariables = {
-      # Force use of XDG Dir Spec
-      CUDA_CACHE_PATH = "${config.xdg.cacheHome}/nv";
-      LESSHISTFILE = "${config.xdg.configHome}/less/history";
-      LESSKEY = "${config.xdg.configHome}/less/keys";
-      WINEPREFIX = "${config.xdg.dataHome}/wine";
-      _JAVA_OPTIONS = "-Djava.util.prefs.userRoot=${config.xdg.configHome}/java";
-
       # Default programs
       EDITOR = "nvim";
       TERMINAL = "st";
       BROWSER = "librewolf";
     };
-
-    shellAliases = {
-      # Force use of XDG Dir Spec
-      wget = "wget --hsts-file='${config.xdg.dataHome}/wget-hsts'";
-      rxrdb = "xrdb -load '${config.xdg.configHome}/.config/X11/xresources'";
-      nvidia-settings = "nvidia-settings --config='${config.xdg.configHome}'/nvidia/settings";
-    };
   };
 }