diff --git a/home/base/core/shells/default.nix b/home/base/core/shells/default.nix index 93470796..65adccf4 100644 --- a/home/base/core/shells/default.nix +++ b/home/base/core/shells/default.nix @@ -1,10 +1,18 @@ -{pkgs-unstable, ...}: let +{ + config, + pkgs-unstable, + ... +}: let shellAliases = { k = "kubectl"; urldecode = "python3 -c 'import sys, urllib.parse as ul; print(ul.unquote_plus(sys.stdin.read()))'"; urlencode = "python3 -c 'import sys, urllib.parse as ul; print(ul.quote_plus(sys.stdin.read()))'"; }; + + localBin = "${config.home.homeDirectory}/.local/bin"; + goBin = "${config.home.homeDirectory}/go/bin"; + rustBin = "${config.home.homeDirectory}/.cargo/bin"; in { # only works in bash/zsh, not nushell home.shellAliases = shellAliases; @@ -20,7 +28,7 @@ in { enable = true; enableCompletion = true; bashrcExtra = '' - export PATH="$HOME/.local/bin:$HOME/go/bin:$PATH" + export PATH="$PATH:${localBin}:${goBin}:${rustBin}" ''; }; } diff --git a/home/base/tui/editors/emacs/default.nix b/home/base/tui/editors/emacs/default.nix index 8eabf632..b3855f65 100644 --- a/home/base/tui/editors/emacs/default.nix +++ b/home/base/tui/editors/emacs/default.nix @@ -15,7 +15,7 @@ }: with lib; let cfg = config.modules.editors.emacs; - envExtra = '' + envExtra = lib.mkAfter '' export PATH="${config.xdg.configHome}/emacs/bin:$PATH" ''; shellAliases = { diff --git a/home/darwin/shell.nix b/home/darwin/shell.nix index 3f5edb09..2b6b3fc2 100644 --- a/home/darwin/shell.nix +++ b/home/darwin/shell.nix @@ -1,9 +1,9 @@ -let - envExtra = '' +{lib}: let + envExtra = lib.mkAfter '' export PATH="$PATH:/opt/homebrew/bin:/usr/local/bin" ''; # copied from the content generated by `conda init bash` - initExtra = '' + initExtra = lib.mkAfter '' arch=$(uname -m) if [ "aarch64" = "$arch" ] || [ "arm64" = "$arch" ]; then