floturcocantsee/frank-nix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: break XDG sesion variables out into a single feature module

Browse Source
This commit is contained in:
floturcocantsee
2026-10-20 09:15:42 -04:00
parent 0dc69ec7b6
commit 657173e8db
4 changed files with 45 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hosts/shared/darwin.nix
+1 -7
View File
@@ -50,14 +50,8 @@
};
environment = {
variables = rec {
XDG_CACHE_HOME = "$HOME/.cache";
XDG_CONFIG_HOME = "$HOME/.config";
XDG_DATA_HOME = "$HOME/.local/share";
XDG_STATE_HOME = "$HOME/.local/state";
};
shellAliases = import ../../features/aliases.nix { inherit pkgs; };
variables = import ../../features/xdg.nix { inherit pkgs; };
systemPackages = with pkgs; [
wget
hosts/shared/nixos-pc.nix
+3 -25
View File
@@ -119,9 +119,6 @@
};
};
# Completely disable xserver support (RIP X11).
xserver.enable = false;
# Enable KMSCON DRM TTY.
kmscon = {
enable = true;
@@ -346,6 +343,8 @@
nixpkgs = {
config.allowUnfree = true;
# Fix msitools compiling and failing it's test-suite.
overlays = [
(final: prev: {
msitools = prev.msitools.overrideAttrs (old: {
@@ -428,28 +427,7 @@
];
shellAliases = import ../../features/aliases.nix { inherit pkgs; };
sessionVariables = rec {
XDG_CACHE_HOME = "$HOME/.cache";
XDG_CONFIG_HOME = "$HOME/.config";
XDG_DATA_HOME = "$HOME/.local/share";
XDG_STATE_HOME = "$HOME/.local/state";
XDG_DATA_DIRS = [
"${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}"
"${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}"
];
ANDROID_USER_HOME = "$XDG_DATA_HOME/android";
AZURE_CONFIG_DIR = "$XDG_DATA_HOME/azure";
NPM_CONFIG_INIT_MODULE = "$XDG_CONFIG_HOME/npm/config/npm-init.js";
NPM_CONFIG_CACHE = "$XDG_CACHE_HOME/npm";
NPM_CONFIG_TMP = "$XDG_RUNTIME_DIR/npm";
_JAVA_OPTIONS = "-Djava.util.prefs.userRoot=$XDG_CONFIG_HOME/java";
PYTHON_HISTORY = "$XDG_STATE_HOME/python_history";
HISTFILE = "$XDG_STATE_HOME/bash/history";
GTK2_RC_FILES = "$XDG_CONFIG_HOME/gtk-2.0/gtkrc";
};
sessionVariables = import ../../features/xdg.nix { inherit pkgs; };
};
system.stateVersion = "26.05";
hosts/shared/nixos-server.nix
+1 -23
View File
@@ -193,29 +193,7 @@
];
shellAliases = import ../../features/aliases.nix { inherit pkgs; };
sessionVariables = rec {
XDG_CACHE_HOME = "$HOME/.cache";
XDG_CONFIG_HOME = "$HOME/.config";
XDG_DATA_HOME = "$HOME/.local/share";
XDG_STATE_HOME = "$HOME/.local/state";
XDG_DATA_DIRS = [
"${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}"
"${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}"
];
AZURE_CONFIG_DIR = "$XDG_DATA_HOME/azure";
NPM_CONFIG_INIT_MODULE = "$XDG_CONFIG_HOME/npm/config/npm-init.js";
NPM_CONFIG_CACHE = "$XDG_CACHE_HOME/npm";
NPM_CONFIG_TMP = "$XDG_RUNTIME_DIR/npm";
_JAVA_OPTIONS = "-Djava.util.prefs.userRoot=$XDG_CONFIG_HOME/java";
PYTHON_HISTORY = "$XDG_STATE_HOME/python_history";
HISTFILE = "$XDG_STATE_HOME/bash/history";
DOTNET_ROOT = "${pkgs.dotnet-sdk}/share/dotnet";
DOTNET_CLI_HOME = "$XDG_DATA_HOME/dotnet";
GTK2_RC_FILES = "$XDG_CONFIG_HOME/gtk-2.0/gtkrc";
};
sessionVariables = import ../../features/xdg.nix { inherit pkgs; };
};
nix = {