From 3314ec4312a6a4a0a6b5332de59bfa5ac66550c3 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Mon, 13 Apr 2026 14:25:43 +0900 Subject: [PATCH] home: use systemd for envvars --- home/config/ensure-homedir-structure.nix | 2 +- home/config/xdg/default.nix | 4 ++-- home/config/xdg/directory-spec-overrides.nix | 2 +- home/home.nix | 8 ++++---- home/modules/programs/cargo/default.nix | 6 +++--- home/programs/cargo.nix | 2 +- home/programs/hyprland/default.nix | 2 +- home/programs/neovim/default.nix | 2 -- home/programs/python.nix | 2 +- home/programs/sqlite.nix | 2 +- 10 files changed, 15 insertions(+), 17 deletions(-) diff --git a/home/config/ensure-homedir-structure.nix b/home/config/ensure-homedir-structure.nix index 918090d..6f96713 100644 --- a/home/config/ensure-homedir-structure.nix +++ b/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"; }; } diff --git a/home/config/xdg/default.nix b/home/config/xdg/default.nix index b04f0e4..3e2c945 100644 --- a/home/config/xdg/default.nix +++ b/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; }; } diff --git a/home/config/xdg/directory-spec-overrides.nix b/home/config/xdg/directory-spec-overrides.nix index 9546515..02f75f9 100644 --- a/home/config/xdg/directory-spec-overrides.nix +++ b/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 { diff --git a/home/home.nix b/home/home.nix index fca6060..9b2105c 100644 --- a/home/home.nix +++ b/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 { diff --git a/home/modules/programs/cargo/default.nix b/home/modules/programs/cargo/default.nix index ac7f3e0..2df4713 100644 --- a/home/modules/programs/cargo/default.nix +++ b/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 != { }) { diff --git a/home/programs/cargo.nix b/home/programs/cargo.nix index d9f8dba..ca56660 100644 --- a/home/programs/cargo.nix +++ b/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"; } diff --git a/home/programs/hyprland/default.nix b/home/programs/hyprland/default.nix index 11dfa3d..e552695 100644 --- a/home/programs/hyprland/default.nix +++ b/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"; diff --git a/home/programs/neovim/default.nix b/home/programs/neovim/default.nix index f107184..9918bb6 100644 --- a/home/programs/neovim/default.nix +++ b/home/programs/neovim/default.nix @@ -154,6 +154,4 @@ lib.mkIf cfg.enable { vim.keymap.set('n', ';', paste_buf) ''; }; - - home.sessionVariables = { EDITOR = "nvim"; }; } diff --git a/home/programs/python.nix b/home/programs/python.nix index 558863e..daf6cdc 100644 --- a/home/programs/python.nix +++ b/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"; }; diff --git a/home/programs/sqlite.nix b/home/programs/sqlite.nix index 622e7c3..3de4ed4 100644 --- a/home/programs/sqlite.nix +++ b/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"; }; }