home: use systemd for envvars

home/config/ensure-homedir-structure.nix

@@ -41,6 +41,6 @@
     "${home}/Downloads" = symlink "${home}/downloads";
 
     "${config.xdg.dataHome}/wallpapers" = symlink "${home}/pictures/wallpapers";
-    "${config.home.sessionVariables.TEXMFHOME}" = symlink "${home}/git/texmf";
+    "${config.systemd.user.sessionVariables.TEXMFHOME}" = symlink "${home}/git/texmf";
   };
 }

home/config/xdg/default.nix

@@ -24,7 +24,7 @@ in
     };
   };
 
-  home.sessionVariables.XDG_SCREENSHOTS_DIR = "${cfg.pictures}/screenshots";
+  systemd.user.sessionVariables.XDG_SCREENSHOTS_DIR = "${cfg.pictures}/screenshots";
 
   systemd.user.tmpfiles.settings."05-xdg-userdirs" = let
     dirCfg = {
@@ -42,6 +42,6 @@ in
     "${cfg.publicShare}" = dirCfg;
     "${cfg.templates}" = dirCfg;
     "${cfg.videos}" = dirCfg;
-    "${config.home.sessionVariables.XDG_SCREENSHOTS_DIR}" = dirCfg;
+    "${config.systemd.user.sessionVariables.XDG_SCREENSHOTS_DIR}" = dirCfg;
   };
 }

home/config/xdg/directory-spec-overrides.nix

@@ -4,7 +4,7 @@
 
   home.preferXdgDirectories = true;
 
-  home.sessionVariables = let
+  systemd.user.sessionVariables = let
     inherit (config.xdg) dataHome cacheHome configHome userDirs;
     runtimeDir = "/run/user/${toString config.home.uid}";
   in {

home/home.nix

@@ -38,11 +38,11 @@ in {
     };
 
     keyboard.options = [ "caps:escape" ];
+  };
 
-    sessionVariables = {
-      DO_NOT_TRACK = "1";
-      _JAVA_AWT_WM_NONREPARENTING = "1";
-    };
+  systemd.user.sessionVariables = {
+    DO_NOT_TRACK = "1";
+    _JAVA_AWT_WM_NONREPARENTING = "1";
   };
 
   dconf.settings = mkIf graphics {

home/modules/programs/cargo/default.nix

@@ -2,7 +2,7 @@
 let
   cfg = config.programs.cargo;
   format = pkgs.formats.toml { };
-  cargoHome = config.home.sessionVariables.CARGO_HOME or "${config.home.homeDirectory}/.cargo";
+  cargoHome = config.systemd.user.sessionVariables.CARGO_HOME or "${config.home.homeDirectory}/.cargo";
   relativeCargoHome = lib.strings.removePrefix config.home.homeDirectory cargoHome;
 in
 {
@@ -27,9 +27,9 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    home = {
-      sessionVariables.CARGO_HOME = lib.mkIf config.home.preferXdgDirectories (lib.mkDefault "${config.xdg.dataHome}/cargo");
+    systemd.user.sessionVariables.CARGO_HOME = lib.mkIf config.home.preferXdgDirectories (lib.mkDefault "${config.xdg.dataHome}/cargo");
 
+    home = {
       packages = lib.mkIf cfg.addPackageToEnvironment [ cfg.package ];
 
       file."${relativeCargoHome}/config.toml" = lib.mkIf (cfg.settings != { }) {

home/programs/cargo.nix

@@ -9,5 +9,5 @@ lib.mkIf cfg.enable {
     };
   };
 
-  home.sessionVariables.CARGO_NET_GIT_FETCH_WITH_CLI = "true";
+  systemd.user.sessionVariables.CARGO_NET_GIT_FETCH_WITH_CLI = "true";
 }

home/programs/hyprland/default.nix

@@ -16,7 +16,7 @@ in
   ];
 
   config = lib.mkIf cfg.enable {
-    home.sessionVariables = {
+    systemd.user.sessionVariables = {
       WLR_NO_HARDWARE_CURSORS = "1";
       WLR_RENDERER_ALLOW_SOFTWARE = "1";
       XDG_CURRENT_DESKTOP = "Hyprland";

home/programs/neovim/default.nix

@@ -154,6 +154,4 @@ lib.mkIf cfg.enable {
       vim.keymap.set('n', ';', paste_buf)
     '';
   };
-
-  home.sessionVariables = { EDITOR = "nvim"; };
 }

home/programs/python.nix

@@ -23,7 +23,7 @@ in
       sys.ps2='\x01\x1b[1;49;31m\x02...\x01\x1b[0m\x02 '  # bright red
     '';
 
-    home.sessionVariables = {
+    systemd.user.sessionVariables = {
       PYTHONSTARTUP = "${config.xdg.configHome}/python/pyrc";
       PYTHON_HISTORY = "${config.xdg.dataHome}/python_history";
     };

home/programs/sqlite.nix

@@ -19,6 +19,6 @@ in
       pkgs.sqlite-interactive
     ];
 
-    home.sessionVariables.SQLITE_HISTORY= "${config.xdg.dataHome}/sqlite_history";
+    systemd.user.sessionVariables.SQLITE_HISTORY= "${config.xdg.dataHome}/sqlite_history";
   };
 }