about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorBenedikt Peetz <benedikt.peetz@b-peetz.de>2024-10-21 22:42:14 +0200
committerBenedikt Peetz <benedikt.peetz@b-peetz.de>2024-10-21 22:42:14 +0200
commit4ce5e1a51aab22540a21d7fe38fadc7c8bcb3893 (patch)
tree78fbdf0354bf81a05922d57d81d0479ea5563ff8
parentfeat(modules/zsh): Nearly completely rewrite (diff)
downloadnixos-config-4ce5e1a51aab22540a21d7fe38fadc7c8bcb3893.tar.gz
nixos-config-4ce5e1a51aab22540a21d7fe38fadc7c8bcb3893.zip
fix(modules/*): Set all xdg-basedir env vars independently of active shell
There is now reason, why these variables should only be used when `zsh`
is running.
-rw-r--r--modules/home.legacy/conf/python/default.nix2
-rw-r--r--modules/home.legacy/conf/xdg/xdg_vars.nix5
2 files changed, 5 insertions, 2 deletions
diff --git a/modules/home.legacy/conf/python/default.nix b/modules/home.legacy/conf/python/default.nix
index 826d466d..09f5c5ce 100644
--- a/modules/home.legacy/conf/python/default.nix
+++ b/modules/home.legacy/conf/python/default.nix
@@ -1,6 +1,6 @@
 {config, ...}: {
   xdg.configFile."python/pythonrc".source = ./pythonrc.py;
-  programs.zsh.sessionVariables = {
+  home.sessionVariables = {
     "PYTHONSTARTUP" = "${config.xdg.configHome}/python/pythonrc";
   };
 }
diff --git a/modules/home.legacy/conf/xdg/xdg_vars.nix b/modules/home.legacy/conf/xdg/xdg_vars.nix
index 3f7d5e00..aa2f30d4 100644
--- a/modules/home.legacy/conf/xdg/xdg_vars.nix
+++ b/modules/home.legacy/conf/xdg/xdg_vars.nix
@@ -1,9 +1,12 @@
 {config, ...}: let
   inherit (config.xdg) dataHome;
 in {
+  # FIXME: Move these options in relevant modules, that are connected to their software.
+  #        <2024-10-21>
+
   # Variables that only have to be set because special applications fail to set reasonable
   # defaults (mostly understandable because of backwards-compatibility, but yeah)
-  programs.zsh.sessionVariables = {
+  home.sessionVariables = {
     CARGO_HOME = "${dataHome}/cargo";
     GRADLE_USER_HOME = "${dataHome}/gradle";