From d8354d333f190e8683515f5026465c870f3c85f5 Mon Sep 17 00:00:00 2001
From: chase <chase@cathoderaytube.net>
Date: Sun, 19 Oct 2025 19:04:06 -0400
Subject: [PATCH] Move some stuff from base to desktop

---
 home/base.nix    |  7 -------
 home/desktop.nix | 12 ++++++++++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/home/base.nix b/home/base.nix
index bc26397..f28f375 100644
--- a/home/base.nix
+++ b/home/base.nix
@@ -20,15 +20,8 @@
     sessionVariables = {
       # Aspell stuff
       ASPELL_CONF = "per-conf $XDG_CONFIG_HOME/aspell/aspell.conf; personal $XDG_DATA_HOME/aspell/en.pws; repl $XDG_DATA_HOME/aspell/en.prepl";
-      # Bitwarden stuff
-      BITWARDEN_SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/.bitwarden-ssh-agent.sock";
-      SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/.bitwarden-ssh-agent.sock";
-      ELECTRON_OZONE_PLATFORM_HINT = "wayland";
       # Java stuff
       _JAVA_OPTIONS = "-Djava.util.prefs.userRoot='$XDG_CONFIG_HOME'/java";
-      # libx11 stuff
-      XCOMPOSECACHE = "$XDG_CACHE_HOME/X11/xcompose";
-      XCOMPOSEFILE = "$XDG_CONFIG_HOME/X11/xcompose";
     };
     shellAliases = {
       gs = "git status";
diff --git a/home/desktop.nix b/home/desktop.nix
index 319bad7..9900a3d 100644
--- a/home/desktop.nix
+++ b/home/desktop.nix
@@ -7,6 +7,18 @@
     ./base.nix
   ];
 
+  home = {
+    sessionVariables = { 
+      # Bitwarden stuff
+      BITWARDEN_SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/.bitwarden-ssh-agent.sock";
+      SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/.bitwarden-ssh-agent.sock";
+      ELECTRON_OZONE_PLATFORM_HINT = "wayland";
+      # libx11 stuff
+      XCOMPOSECACHE = "$XDG_CACHE_HOME/X11/xcompose";
+      XCOMPOSEFILE = "$XDG_CONFIG_HOME/X11/xcompose";
+    };
+  };
+
   catppuccin = {
     enable = true;
     flavor = "mocha";