summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2016-03-03 16:15:25 +0000
committerDomen Kožar <domen@dev.si>2016-03-03 16:15:25 +0000
commit73ba0ae2de11a2aa610649949c8f0de444c67763 (patch)
tree7838ab6cd866e9806fcd67876b8eb93323d03743 /nixos/modules
parent3b7b3da906c16cd873b9b7c4fcd190c2b884fd32 (diff)
downloadnixlib-73ba0ae2de11a2aa610649949c8f0de444c67763.tar
nixlib-73ba0ae2de11a2aa610649949c8f0de444c67763.tar.gz
nixlib-73ba0ae2de11a2aa610649949c8f0de444c67763.tar.bz2
nixlib-73ba0ae2de11a2aa610649949c8f0de444c67763.tar.lz
nixlib-73ba0ae2de11a2aa610649949c8f0de444c67763.tar.xz
nixlib-73ba0ae2de11a2aa610649949c8f0de444c67763.tar.zst
nixlib-73ba0ae2de11a2aa610649949c8f0de444c67763.zip
Remove which -> type -P alias.
Aliases are not the same as programs. They won't work in subshells.
It's better to just use which as it's only 88K.
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/profiles/base.nix1
-rw-r--r--nixos/modules/programs/bash/bash.nix2
2 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index b8057cadce25..09183ee18092 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -17,6 +17,7 @@
     pkgs.ddrescue
     pkgs.ccrypt
     pkgs.cryptsetup # needed for dm-crypt volumes
+    pkgs.which # 88K size
 
     # Some networking tools.
     pkgs.fuse
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index 1c3c07a1c210..e4e264ec0036 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -56,7 +56,7 @@ in
       */
 
       shellAliases = mkOption {
-        default = config.environment.shellAliases // { which = "type -P"; };
+        default = config.environment.shellAliases;
         description = ''
           Set of aliases for bash shell. See <option>environment.shellAliases</option>
           for an option format description.