From 86438e6a1c9e9ec031d70a645205d2069e299a38 Mon Sep 17 00:00:00 2001
From: Tao Tien <29749622+taotien@users.noreply.github.com>
Date: Thu, 20 Feb 2025 19:05:45 -0800
Subject: [PATCH] home mgr

---
 users/tao/HOME.nix                   |  6 +--
 users/tao/nushell/extra/alias.nu     | 34 ---------------
 users/tao/nushell/extra/nix.nu       | 37 ----------------
 users/tao/nushell/extra/stuff.nu     | 62 --------------------------
 users/tao/nushell/extra/tailscale.nu | 65 ----------------------------
 5 files changed, 1 insertion(+), 203 deletions(-)
 delete mode 100644 users/tao/nushell/extra/alias.nu
 delete mode 100644 users/tao/nushell/extra/nix.nu
 delete mode 100644 users/tao/nushell/extra/stuff.nu
 delete mode 100644 users/tao/nushell/extra/tailscale.nu

diff --git a/users/tao/HOME.nix b/users/tao/HOME.nix
index 00bf1b4..6e709d5 100644
--- a/users/tao/HOME.nix
+++ b/users/tao/HOME.nix
@@ -116,11 +116,7 @@ in {
       configFile.source = ./nushell/config.nu;
       envFile.source = ./nushell/env.nu;
       # extraConfig = builtins.readFile ./nushell/stuff.nu;
-      extraConfig = lib.concatStrings (
-        map (
-          builtins.readFile builtins.readDir ./nushell/extra
-        )
-      );
+      extraConfig = lib.concatStrings (map builtins.readFile (map (x: ./nushell/extras/. + x) (map (x: "/" + x) (builtins.attrNames (builtins.readDir ./nushell/extras)))));
     };
 
     ssh = {
diff --git a/users/tao/nushell/extra/alias.nu b/users/tao/nushell/extra/alias.nu
deleted file mode 100644
index b67271e..0000000
--- a/users/tao/nushell/extra/alias.nu
+++ /dev/null
@@ -1,34 +0,0 @@
-alias xo = xdg-open
-# alias h = hx (sk)
-alias b = btm
-alias cringe = sudo bootctl set-oneshot auto-windows
-alias fetch = fastfetch
-alias ff = firefox
-alias pu = pueue
-alias t = task
-alias zl = zellij
-alias snapper = snapper -c home
-alias follow = readlink -f
-alias la = ls -a
-
-alias quiet = sudo ectool fanduty 42
-alias loud = sudo ectool autofanctrl
-
-alias cp-full = cp
-alias cp = cp -prv
-alias mv-full = mv
-alias mv = mv -pv
-
-alias j = jj
-alias ja = jj log -r 'all()'
-alias jc = jj desc
-alias jd = jj diff
-alias je = jj edit
-alias jf = jj git fetch
-alias jg = jj git clone --colocate
-alias jm = jj bookmark set main
-alias jp = jj git push
-alias js = jj status
-alias jw = jj workspace update-stale
-
-
diff --git a/users/tao/nushell/extra/nix.nu b/users/tao/nushell/extra/nix.nu
deleted file mode 100644
index 4aae58d..0000000
--- a/users/tao/nushell/extra/nix.nu
+++ /dev/null
@@ -1,37 +0,0 @@
-alias nd = nix develop
-def ns [package] {
-  nix shell $"nixpkgs#($package)"
-}
-def nr [package] {
-  nix search nixpkgs $package
-}
-
-def rebuild --wrapped [subcommand, --builders: string, ...rest] {
-  if (open /etc/hostname --raw) == "NOlaptop\n" and ($builders != "") {
-    sudo nix store info --store ssh://nocomputer
-  }
-  if ($builders == "") {
-    sudo systemd-inhibit nice -n19 nixos-rebuild $subcommand --flake . --impure --verbose --builders ""
-  } else {
-    sudo systemd-inhibit nice -n19 nixos-rebuild $subcommand --flake . --impure --verbose ...$rest
-  }
-  toastify send rebuild done!
-}
-def post-rebuild [] {
-    rm -r ~/.config/helix/runtime/grammars/
-    hx --grammar fetch; hx --grammar build
-    rustup update
-}
-def bump --wrapped [...rest] {
-  cd /home/tao/projects/NOflake/
-  jj new -m "bump"
-  nix flake update
-  # rc2nix | save -f /home/tao/projects/NOflake/users/tao/plasma.nix;
-  # sudo nix store ping --store ssh://nocomputer
-  rebuild boot ...$rest
-  jj new
-}
-alias rb = rebuild boot
-alias rs = rebuild switch
-alias gc = nh clean all
-
diff --git a/users/tao/nushell/extra/stuff.nu b/users/tao/nushell/extra/stuff.nu
deleted file mode 100644
index bfd2145..0000000
--- a/users/tao/nushell/extra/stuff.nu
+++ /dev/null
@@ -1,62 +0,0 @@
-# task
-
-def h [query?: path] {
-  (if ($query != null) {sk -1 -q ($query | path basename)} else {sk -1}) 
-  | complete
-  | if $in.exit_code == 0 {
-      $in.stdout | str trim | hx $in
-    }
-}
-
-def --env c [path: path = "~"] {
-  cd $path
-  l
-}
-
-def l [
-  --all (-a)
-  --long (-l)
-  path: path = "."
-] {
-  if $all and $long {
-    ls -la $path
-  } else if $all {
-    ls -a $path
-  } else if $long {
-    ls -l $path
-  } else {
-    ls $path
-  }
-  | sort-by type name -i -n
-}
-
-def srg [] {
-  sk --ansi -i -c 'rg --color=always --line-number "{}"'
-}
-
-
-def "config stuff" [] {
-  hx ~/projects/NOflake/users/tao/nushell/stuff.nu
-}
-def deluge-gtk [] {
-  tsr
-  deluge-gtk
-}
-alias deluge = deluge-gtk
-def fixme [] {
-  rg TODO --json
-    | lines
-    | each {from json}
-    | where type == "match"
-    | get data
-    | flatten
-    | each {$"($in.text):($in.line_number)"}
-    | hx ...$in
-}
-source ~/.cache/starship/init.nu
-# source ~/.cache/carapace/init.nu
-source ~/.zoxide.nu
-def --env z [path: string = "~"] {
-  zo $path
-  l
-}
diff --git a/users/tao/nushell/extra/tailscale.nu b/users/tao/nushell/extra/tailscale.nu
deleted file mode 100644
index 193b162..0000000
--- a/users/tao/nushell/extra/tailscale.nu
+++ /dev/null
@@ -1,65 +0,0 @@
-def check-mullvad [] {
-  loop {
-    print "checking connection status"
-    http get https://am.i.mullvad.net/json 
-      | if $in.mullvad_exit_ip == true {break} else {print $in}
-    sleep 1sec
-  }
-}
-def tse [exit_node: string = ""] {
-  if ($exit_node | is-empty) and (ps | find deluge | is-not-empty) {
-    return "stop summoning first!"
-  } else {
-    tailscale set --exit-node $exit_node
-  }
-  if ($exit_node | is-not-empty) {
-    check-mullvad
-  }
-  return "exit node set"
-}
-def tsp [] {
-  tailscale exit-node list
-    | split row "\n"
-    | each {str trim}
-    | filter {is-not-empty}
-    | skip 1
-    | last 19
-    | first 17
-    | split column -r '\s{2,}'
-    | reject column5 column3
-    | rename ip addr city
-    | par-each {
-      insert ping {
-        |row| $row.addr
-          | str replace "mullvad.ts.net" "relays.mullvad.net"
-          | ping -c5 -q $in
-          | split row "\n"
-          | last
-          | split column "/"
-          | get column6?
-          | get 0
-        }
-      }
-    | sort-by ping -n -r
- }
-def tsr [] {
-  tailscale status --json
-    | from json
-    | get Peer
-    | transpose nodekey node
-    | get node
-    | filter {$in.Location?.Country == USA}
-    | get TailscaleIPs
-    | each {get 0}
-    | select (random int 0..($in | length))
-    | tse $in.0
-  # tailscale status
-  check-mullvad
-}
-alias ts = tailscale
-alias tss = tailscale status
-alias tsu = tailscale up
-alias tsd = tailscale down
-alias tsx = tailscale exit-node list
-alias tsa = tailscale exit-node suggest
-