diff --git a/extras/dev.nix b/extras/dev.nix
index e547f19..94b643d 100644
--- a/extras/dev.nix
+++ b/extras/dev.nix
@@ -1,41 +1,41 @@
 {pkgs, ...}: {
   environment.systemPackages = with pkgs; [
-    devenv
-    act
-    aichat
     # (llm.withPlugins (ps: with ps; [llm-openrouter]))
-    # llm
-    aider-chat
-    # digital
-    asm-lsp
-    gh
     # bash-language-server
-    qemu
-    # quickemu
-    # lychee # link checker
+    # digital
     # etcher
-    # freecad
-    # vulkan-loader
     # fontforge
+    # freecad
+    # llm
+    # lychee # link checker
+    # quickemu
     # radicle-node
-    hyperfine # benchmarking
-    markdown-oxide
-    git-cliff
+    # vulkan-loader
+    # act
+    # aichat
+    # aider-chat
+    # asm-lsp
     b3sum
+    devenv
     direnv
+    gh
+    git-cliff
+    hyperfine
     jujutsu
     just
     lldb
     lua-language-server
+    markdown-oxide
     qFlipper
+    qemu
     sd
     sshfs
     taplo # toml lsp
     tio
-    tokei
+    tokei # repo code stats
     typos
 
-    # databases
+    # # databases
     # sqlite
     # sqls
     # sqlx-cli
@@ -73,11 +73,6 @@
     ruff
     ruff-lsp
 
-    # go
-    # go
-    # gopls
-    # delve
-
     # rust
     cargo-binstall
     bacon
diff --git a/systems/BASED.nix b/systems/BASED.nix
index 46a9def..0a06071 100644
--- a/systems/BASED.nix
+++ b/systems/BASED.nix
@@ -6,13 +6,13 @@
   ...
 }: {
   environment.systemPackages = with pkgs; [
-    inputs.zen-browser.packages."${system}".default
     # inputs.helix.packages.${pkgs.system}.default
+    # screen
     bat
     bottom
     cifs-utils
-    dumbpipe
     du-dust
+    dumbpipe
     exfatprogs
     fastfetch
     ffmpeg
@@ -20,14 +20,14 @@
     git
     helix
     inputs.agenix.packages.${pkgs.system}.default
-    sendme
+    inputs.zen-browser.packages."${system}".default
     mesa
     mpv
     ouch
     pueue
     ripgrep
     rustdesk
-    # screen
+    sendme
     skim
     tree
     wezterm
diff --git a/users/tao.nix b/users/tao.nix
index e39747b..dc5c220 100644
--- a/users/tao.nix
+++ b/users/tao.nix
@@ -6,7 +6,6 @@
   ...
 }: {
   users.users.tao.packages = with pkgs; [
-    gocryptfs
     # calibre
     # davinci-resolve
     # fractal
@@ -22,14 +21,15 @@
     aspell
     aspellDicts.en
     bottles
-    boxxy
-    carapace
-    cloud-hypervisor
+    # boxxy
+    # carapace
+    # cloud-hypervisor
     darktable
     deluge
     discord
     freecad-wayland
-    freerdp
+    # freerdp
+    gocryptfs
     gurk-rs
     jellyfin-media-player
     kdePackages.plasma-vault
@@ -47,7 +47,7 @@
     onlyoffice-bin
     pandoc
     pipe-rename
-    piper
+    # piper
     prusa-slicer
     qmk
     qmk-udev-rules
@@ -58,7 +58,7 @@
     starship
     syncthingtray
     taskwarrior3
-    thunderbird
+    # thunderbird
     tinymist
     toastify
     typst
diff --git a/users/tao/helix.nix b/users/tao/helix.nix
index f75b0fa..8f0cf31 100644
--- a/users/tao/helix.nix
+++ b/users/tao/helix.nix
@@ -63,6 +63,7 @@
       };
       keys.normal.space.t = {
         r = "@mip:reflow<ret>";
+        s = "@|lines | sort | to text<ret>";
       };
     };
     languages = {
diff --git a/users/tao/nushell/extras/nix.nu b/users/tao/nushell/extras/nix.nu
index d8c2ea0..a5639db 100644
--- a/users/tao/nushell/extras/nix.nu
+++ b/users/tao/nushell/extras/nix.nu
@@ -9,8 +9,13 @@ def nr [package] {
 }
 
 def rebuild --wrapped [subcommand, --builders: string, ...rest] {
+  mut builders = $builders;
   if (open /etc/hostname --raw) == "NOlaptop\n" and ($builders != "") {
-    sudo nix store info --store ssh://nocomputer
+    if (ping -c1 -W1 nocomputer | complete | $in.exit_code == 0) {
+       sudo nix store info --store ssh://nocomputer
+    } else {
+      $builders = ""
+    }
   }
   if ($builders == "") {
     sudo systemd-inhibit nice -n19 nixos-rebuild $subcommand --flake . --impure --verbose --builders ""