Skip to content

Fix configDir prefix #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shikanime merged 1 commit into from
Feb 4, 2026
Merged

Fix configDir prefix #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/home/docker.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ with lib;
let
configDir =
if pkgs.stdenv.hostPlatform.isDarwin then
"Library/Application Support"
"Library/Application Support/docker"
else
removePrefix config.home.homeDirectory config.xdg.configHome;
"${removePrefix config.home.homeDirectory config.xdg.configHome}/docker";
in
{
home.packages = [
Expand All @@ -22,8 +22,8 @@ in

programs = {
docker-cli = {
inherit configDir;
enable = true;
configDir = "${configDir}/docker";
settings.auths = {
"asia.gcr.io" = { };
"eu.gcr.io" = { };
Expand Down
12 changes: 6 additions & 6 deletions modules/home/javascript.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
let
cacheDir =
if pkgs.stdenv.hostPlatform.isDarwin then
"${config.home.homeDirectory}/Library/Caches"
"${config.home.homeDirectory}/Library/Caches/npm"
else
config.xdg.cacheHome;
"${config.xdg.cacheHome}/npm";
configDir =
if pkgs.stdenv.hostPlatform.isDarwin then
"${config.home.homeDirectory}/Library/Application Support"
"${config.home.homeDirectory}/Library/Application Support/npm"
else
config.xdg.configHome;
"${config.xdg.configHome}/npm";
in
{
home.packages = [
Expand All @@ -25,8 +25,8 @@ in
];

home.sessionVariables = {
NPM_CONFIG_CACHE = "${cacheDir}/npm";
NPM_CONFIG_USERCONFIG = "${configDir}/npm";
NPM_CONFIG_CACHE = cacheDir;
NPM_CONFIG_USERCONFIG = configDir;
};

programs.nushell.extraConfig = ''
Expand Down
6 changes: 3 additions & 3 deletions modules/home/k8s.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
let
configDir =
if pkgs.stdenv.hostPlatform.isDarwin then
"${config.home.homeDirectory}/Library/Application Support"
"${config.home.homeDirectory}/Library/Application Support/skaffold"
else
config.xdg.configHome;
"${config.xdg.configHome}/skaffold";
in
{
home = {
Expand All @@ -21,6 +21,6 @@ in
pkgs.skaffold
];

sessionVariables.SKAFFOLD_CONFIG = "${configDir}/skaffold/config";
sessionVariables.SKAFFOLD_CONFIG = "${configDir}/config";
};
}
18 changes: 12 additions & 6 deletions modules/home/rust.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,29 @@
}:

let
configDir =
cargoConfigDir =
if pkgs.stdenv.hostPlatform.isDarwin then
"${config.home.homeDirectory}/Library/Application Support"
"${config.home.homeDirectory}/Library/Application Support/cargo"
else
config.xdg.configHome;
"${config.xdg.configHome}/cargo";

rustupConfigDir =
if pkgs.stdenv.hostPlatform.isDarwin then
"${config.home.homeDirectory}/Library/Application Support/rustup"
else
"${config.xdg.configHome}/rustup";
in
{
home = {
packages = [ pkgs.rustup ];

sessionPath = [
"${configDir}/cargo/bin"
"${cargoConfigDir}/bin"
];

sessionVariables = {
CARGO_HOME = "${configDir}/cargo";
RUSTUP_HOME = "${configDir}/rustup";
CARGO_HOME = cargoConfigDir;
RUSTUP_HOME = rustupConfigDir;
};
};

Expand Down