about summary refs log tree commit diff
path: root/modules/shell
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2022-01-03 22:55:38 +0000
committerAlyssa Ross <hi@alyssa.is>2022-02-21 20:28:30 +0000
commit53f50c91db7358dec89020856846c3a206f1ff3b (patch)
tree0bf8fa93d127e931b42cb3e8151d214b8d85655a /modules/shell
parente82149562e6b2e0cb0d0d76f466abdeb8b7aa3f7 (diff)
downloadnixlib-53f50c91db7358dec89020856846c3a206f1ff3b.tar
nixlib-53f50c91db7358dec89020856846c3a206f1ff3b.tar.gz
nixlib-53f50c91db7358dec89020856846c3a206f1ff3b.tar.bz2
nixlib-53f50c91db7358dec89020856846c3a206f1ff3b.tar.lz
nixlib-53f50c91db7358dec89020856846c3a206f1ff3b.tar.xz
nixlib-53f50c91db7358dec89020856846c3a206f1ff3b.tar.zst
nixlib-53f50c91db7358dec89020856846c3a206f1ff3b.zip
modules/shell: replace pstree with busybox's
Much nicer output.
Diffstat (limited to 'modules/shell')
-rw-r--r--modules/shell/default.nix8
-rw-r--r--modules/shell/zsh/zshrc.nix1
2 files changed, 7 insertions, 2 deletions
diff --git a/modules/shell/default.nix b/modules/shell/default.nix
index 806562b0e582..b213e9e1e0fd 100644
--- a/modules/shell/default.nix
+++ b/modules/shell/default.nix
@@ -32,7 +32,6 @@
     nmap
     openssh
     pciutils
-    pstree
     pv
     ranger
     silver-searcher
@@ -43,6 +42,13 @@
     unzip
     wget
     whois
+
+    (busybox.override {
+      enableMinimal = true;
+      extraConfig = ''
+        CONFIG_PSTREE y
+      '';
+    })
   ] ++ lib.optional stdenv.isDarwin pinentry_mac;
 
   environment.variables.CLICOLOR = "1";
diff --git a/modules/shell/zsh/zshrc.nix b/modules/shell/zsh/zshrc.nix
index 6ec4a8802ca4..a490e3d797f7 100644
--- a/modules/shell/zsh/zshrc.nix
+++ b/modules/shell/zsh/zshrc.nix
@@ -185,7 +185,6 @@ alias ls=${lib.escapeShellArg (if stdenv.isDarwin then
                                  "ls -AFh"
                                else
                                  "ls -AF --si --color=auto")}
-alias pstree='pstree -g 3'
 alias tree='tree -aRF -I .git'
 alias vim=nvim