From f45a6d9f372f1a2b26a2a33624b1984a4db17adf Mon Sep 17 00:00:00 2001
From: Tao Tien <29749622+taotien@users.noreply.github.com>
Date: Mon, 17 Mar 2025 18:09:46 -0700
Subject: [PATCH] nushmhel

---
 users/tao/nushell/extras/alias.nu | 43 ++++++++++++++++++---------
 users/tao/nushell/extras/stuff.nu | 48 ++-----------------------------
 2 files changed, 32 insertions(+), 59 deletions(-)

diff --git a/users/tao/nushell/extras/alias.nu b/users/tao/nushell/extras/alias.nu
index 4793326..9c83a53 100644
--- a/users/tao/nushell/extras/alias.nu
+++ b/users/tao/nushell/extras/alias.nu
@@ -1,25 +1,28 @@
-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 d = sudo dmesg -w
+alias p = pueue
 alias zl = zellij
+alias fetch = fastfetch
 alias snapper = snapper -c home
 alias follow = readlink -f
-alias la = ls -a
+# alias cringe = sudo bootctl set-oneshot auto-windows
+
+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 srg [] {
+  sk --ansi -i -c 'rg --color=always --line-number "{}"'
+}
 
 alias quiet = sudo ectool fanduty 42
 alias loud = sudo ectool autofanctrl
 alias louder = sude ectool fanduty 100
 
-# alias cp-full = cp
-alias ccp = cp -prv
-# alias mv-full = mv
-alias mvp = mv-full -pv
-
 alias j = jj
 alias ja = jj log -r 'all()'
 alias jc = jj desc
@@ -27,7 +30,6 @@ 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
@@ -40,3 +42,16 @@ def jm --wrapped [-r: string = "@", ...rest] {
   jj bookmark set main -r $r ...$rest
   jj git push
 }
+
+alias la = ls -a
+alias ccp = cp -prv
+alias mvp = mv-full -pv
+
+def --env c [path: path = "~"] {
+  cd $path
+  l
+}
+
+def l --wrapped [...rest] {
+  ls ...$rest | sort-by type name -i -n
+}
diff --git a/users/tao/nushell/extras/stuff.nu b/users/tao/nushell/extras/stuff.nu
index d9534ea..edcf225 100644
--- a/users/tao/nushell/extras/stuff.nu
+++ b/users/tao/nushell/extras/stuff.nu
@@ -1,50 +1,9 @@
-# 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
+  rg FIXME --json
     | lines
     | each {from json}
     | where type == "match"
@@ -53,8 +12,7 @@ def fixme [] {
     | 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