bash: add utilities

diff --git a/hosts/mermet/system.nix b/hosts/mermet/system.nix
index daaca56345cb690d611d4aa2a78f6e71f3df6fd2..0c96533ae5736a5f775157efec7a9bc088625c17 100644 (file)
--- a/hosts/mermet/system.nix
+++ b/hosts/mermet/system.nix
@@ -27,7 +27,7 @@ environment.systemPackages = with pkgs; [
   rsync
   smartctl-tbw
   socat
-  thttpd
+  #thttpd
   #iptables-nftables-compat
 ];
 }

diff --git a/nixos/defaults.nix b/nixos/defaults.nix
index c4ce915ad7698df31e143c379d1a267ec9379b19..5a8f54b4ab62455493923720288e3ef679725429 100644 (file)
--- a/nixos/defaults.nix
+++ b/nixos/defaults.nix
@@ -109,7 +109,8 @@ environment.systemPackages = with pkgs; [
   pv
   rdfind
   smem
-  stress
+  #stress
+  stress-ng
   swaplist
   tcpdump
   tmux
@@ -139,8 +140,11 @@ programs = {
 
       # Utilities
       mkcd() { mkdir -p "$1" && cd "$1"; }
-      sysenter() { nsenter -a -t "$(systemctl show --property MainPID --value "$1")"; }
-      systrace() { strace -f -p "$(systemctl show --property MainPID --value "$1")"; }
+      stress-mem() { fac="$1"; stress-ng --vm 1 --vm-keep --vm-bytes $(awk '/MemAvailable/{ printf "%d\n", $2 * $fac; }' </proc/meminfo)k; }
+      sysenter() { srv="$1"; shift; nsenter -a -t "$(systemctl show --property MainPID --value "$srv")" "$@"; }
+      systrace() { srv="$1"; shift; strace -f -p "$(systemctl show --property MainPID --value "$srv")" "$@"; }
+      zfs-mount () { for d in $(zfs list -rH -o name "$@"); do sudo zfs mount -l "$d"; done; }
+      zfs-unmount () { sudo zfs unmount -u "$@"; }
     '';
     shellAliases = {
       cl = "clear";
@@ -148,6 +152,7 @@ programs = {
       ll = "ls -al";
       ls = "ls --color=tty";
       mem = "ps -e -orss=,user=,args= | sort -b -k1,1n";
+      mem-top = "smem --sort rss --reverse --autosize";
 
       s="sudo systemctl";
       st="sudo systemctl status";