diff options
| author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2024-05-09 15:10:43 +0200 |
|---|---|---|
| committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2024-05-09 20:33:35 +0200 |
| commit | d1f0747ed32dca81f020fe8e42c9d1c2e294aa7e (patch) | |
| tree | 5dc27dbfa9f98d88f62f96ba5ed5ad2f7a91b957 | |
| parent | fix(sys/pkgs/yt): Don't require an thumbnail url (diff) | |
| download | nixos-config-d1f0747ed32dca81f020fe8e42c9d1c2e294aa7e.zip | |
refactor(hm/conf/zsh): Move xdg vars under the xdg directory
| -rw-r--r-- | hm/soispha/conf/xdg/default.nix | 4 | ||||
| -rw-r--r-- | hm/soispha/conf/xdg/xdg_vars.nix | 26 | ||||
| -rw-r--r-- | hm/soispha/conf/zsh/default.nix | 22 |
3 files changed, 30 insertions, 22 deletions
diff --git a/hm/soispha/conf/xdg/default.nix b/hm/soispha/conf/xdg/default.nix index 8327ea6e..4099720d 100644 --- a/hm/soispha/conf/xdg/default.nix +++ b/hm/soispha/conf/xdg/default.nix @@ -19,6 +19,10 @@ }; }; in { + imports = [ + ./xdg_vars.nix + ]; + xdg = { mimeApps = { enable = true; diff --git a/hm/soispha/conf/xdg/xdg_vars.nix b/hm/soispha/conf/xdg/xdg_vars.nix new file mode 100644 index 00000000..3f7d5e00 --- /dev/null +++ b/hm/soispha/conf/xdg/xdg_vars.nix @@ -0,0 +1,26 @@ +{config, ...}: let + inherit (config.xdg) dataHome; +in { + # 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 = { + CARGO_HOME = "${dataHome}/cargo"; + GRADLE_USER_HOME = "${dataHome}/gradle"; + + #_JAVA_OPTIONS = lib.concatStringsSep " " [ + # ''-Djava.util.prefs.userRoot="${config.xdg.configHome}/java"'' + # ''-Djavafx.cachedir="${config.xdg.cacheHome}/openjfx"'' + # ]; + #GOPATH = "${config.xdg.dataHome}/go"; + #GTK2_RC_FILES = "${config.xdg.configHome}/gtk-2.0/gtkrc"; + #RUSTUP_HOME = "${config.xdg.dataHome}/rustup"; + #NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc"; + #NUGET_PACKAGES = "${config.xdg.cacheHome}/NuGetPackages"; + #XAUTHORITY = "${config.xdg.stateHome}/Xauthority"; + #COMPDUMPFILE = "${config.xdg.dataHome}/zsh/.zcompdump}"; + #IPYTHONDIR = "${config.xdg.configHome}/ipython"; + #PARALLEL_HOME = "${config.xdg.configHome}/parallel"; + #STACK_XDG = "1"; + #WINEPREFIX = "${config.xdg.dataHome}/wine"; + }; +} diff --git a/hm/soispha/conf/zsh/default.nix b/hm/soispha/conf/zsh/default.nix index a184b5bc..1e71f0d5 100644 --- a/hm/soispha/conf/zsh/default.nix +++ b/hm/soispha/conf/zsh/default.nix @@ -93,28 +93,6 @@ BEMENU_BACKEND = "wayland"; BEMENU_OPTS = "--fn 'Source Code Pro 10' -c -l 30 -B 1 -W 0.9 --hf #ffffff"; - # Clean the home dir {{{ - CARGO_HOME = "${config.xdg.dataHome}/cargo"; - - #_JAVA_OPTIONS = lib.concatStringsSep " " [ - # ''-Djava.util.prefs.userRoot="${config.xdg.configHome}/java"'' - # ''-Djavafx.cachedir="${config.xdg.cacheHome}/openjfx"'' - # ]; - #GRADLE_USER_HOME = "${config.xdg.dataHome}/gradle"; - #GOPATH = "${config.xdg.dataHome}/go"; - #GTK2_RC_FILES = "${config.xdg.configHome}/gtk-2.0/gtkrc"; - #RUSTUP_HOME = "${config.xdg.dataHome}/rustup"; - #NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc"; - #NUGET_PACKAGES = "${config.xdg.cacheHome}/NuGetPackages"; - #PYTHONSTARTUP = "${config.xdg.configHome}/python/pythonrc"; - #XAUTHORITY = "${config.xdg.stateHome}/Xauthority"; - #COMPDUMPFILE = "${config.xdg.dataHome}/zsh/.zcompdump}"; - #IPYTHONDIR = "${config.xdg.configHome}/ipython"; - #PARALLEL_HOME = "${config.xdg.configHome}/parallel"; - #STACK_XDG = "1"; - #WINEPREFIX = "${config.xdg.dataHome}/wine"; - # }}} - # Export Wayland env Vars {{{ QT_QPA_PLATFORM = "wayland"; QT_QPA_PLATFORMTHEME = "qt5ct"; # needs qt5ct |