diff --git a/users/rin/home.nix b/users/rin/home.nix index 2f9e019..d9821c3 100644 --- a/users/rin/home.nix +++ b/users/rin/home.nix @@ -38,6 +38,32 @@ nodePackages_latest.pnpm ]; + + sessionVariables = { + PATH = builtins.concatStringsSep ":" [ + "${config.home.homeDirectory}/.local/bin" + "${config.xdg.dataHome}/npm/bin" + "$PATH" + ]; + + XAUTHORITY = "$XDG_RUNTIME_DIR/Xauthority"; + EDITOR = "nvim"; + + _JAVA_OPTIONS = "-Djava.util.prefs.userRoot=${config.xdg.configHome}/java"; + CARGO_HOME = "${config.xdg.dataHome}/cargo"; + DIRENV_LOG_FORMAT = ""; + GNUPGHOME = "${config.xdg.dataHome}/gnupg"; + GTK2_RC_FILES = "${config.xdg.configHome}/gtk-2.0/gtkrc"; + LESSHISTFILE = "-"; + NODE_REPL_HISTORY="${config.xdg.dataHome}/nodejs/repl_history"; + NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc"; + PUB_CACHE = "${config.xdg.cacheHome}/dart"; + WGETRC = "${config.xdg.configHome}/wgetrc"; + XINITRC = "${config.xdg.configHome}/xorg/xinitrc"; + + WINEPREFIX = "${config.xdg.dataHome}/wine64"; + WINEARCH = "win64"; + }; }; imports = [ diff --git a/users/rin/zsh.nix b/users/rin/zsh.nix index 4ac8d0a..3a2e8cb 100644 --- a/users/rin/zsh.nix +++ b/users/rin/zsh.nix @@ -116,31 +116,6 @@ in rec { zmodload zsh/complist ''; - sessionVariables = { - PATH = builtins.concatStringsSep ":" [ - "${config.home.homeDirectory}/.local/bin" - "${config.xdg.dataHome}/npm/bin" - "$PATH" - ]; - - XAUTHORITY = "$XDG_RUNTIME_DIR/Xauthority"; - EDITOR = "nvim"; - - _JAVA_OPTIONS = "-Djava.util.prefs.userRoot=${config.xdg.configHome}/java"; - CARGO_HOME = "${config.xdg.dataHome}/cargo"; - DIRENV_LOG_FORMAT = ""; - GNUPGHOME = "${config.xdg.dataHome}/gnupg"; - GTK2_RC_FILES = "${config.xdg.configHome}/gtk-2.0/gtkrc"; - LESSHISTFILE = "-"; - NODE_REPL_HISTORY="${config.xdg.dataHome}/nodejs/repl_history"; - NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc"; - PUB_CACHE = "${config.xdg.cacheHome}/dart"; - WGETRC = "${config.xdg.configHome}/wgetrc"; - XINITRC = "${config.xdg.configHome}/xorg/xinitrc"; - - WINEPREFIX = "${config.xdg.dataHome}/wine64"; - WINEARCH = "win64"; - }; localVariables = { PS1 = "%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b "; ZSH_AUTOSUGGEST_STRATEGY = ["completion"];