diff --git a/home/scripts/default.nix b/home/scripts/default.nix
index a7ddf60..6c5eb48 100644
--- a/home/scripts/default.nix
+++ b/home/scripts/default.nix
@@ -5,14 +5,14 @@
   ...
 }:
 let
-  inherit (pkgs.writers) writeFishBin writeBashBin;
+  inherit (pkgs.writers) writeFishBin;
   nixos-rebuild =
     name: word:
-    pkgs.writers.writeBashBin name ''
-      env --chdir $HOME/.nixconf sudo nixos-rebuild ${word} --flake .#$(hostname) \
-          && ${lib.my.checkPath pkgs.libnotify "notify-send"} nixos-rebuild "Rebuild complete" \
-              -a nixos-rebuild \
-              -i ${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg
+    writeFishBin name ''
+      ${pkgs.nh}/bin/nh os ${word} $HOME/.nixconf $argv \
+        && ${lib.my.checkPath pkgs.libnotify "notify-send"} nixos-rebuild "Rebuild complete" \
+            -a nixos-rebuild \
+            -i ${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg
     '';
 in
 {
@@ -58,9 +58,9 @@ in
 
   getext = pkgs.writeScriptBin "ls | grep -E \"\.[a-zA-Z0-9]+$\" --only-matching  | sort | uniq";
 
-  rpaste = writeBashBin "rpaste" ''
+  rpaste = writeFishBin "rpaste" ''
     export $(cat ${config.age.secrets.rustypaste.path} | xargs)
-    curl -F "file=@$1" -H "Authorization: $AUTH_TOKEN" https://rusty.ccnlc.eu/
+    ${pkgs.rustypaste-cli}/bin/rpaste -a "$AUTH_TOKEN" -s "https://rusty.ccnlc.eu/" $argv
   '';
 
   gentest = nixos-rebuild "gentest" "test";
diff --git a/home/waybar/config.nix b/home/waybar/config.nix
index 4fde62d..6e6d681 100644
--- a/home/waybar/config.nix
+++ b/home/waybar/config.nix
@@ -126,7 +126,7 @@
 
   network = {
     format-wifi = "{essid} ({signalStrength}%) ";
-    on-click = "${pkgs.foot}/bin/foot -t nmtui -e nmtui";
+    on-click = "${pkgs.foot}/bin/foot -a nmtui nmtui";
   };
   privacy = {
     icon-size = 18;