bump

flake.lock

@@ -89,11 +89,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732919362,
+        "lastModified": 1732988076,
-        "narHash": "sha256-3SxlMD3nSI90+pHOF27SuLEt3+wew8xl+sUJaJMeHOI=",
+        "narHash": "sha256-2uMaVAZn7fiyTUGhKgleuLYe5+EAAYB/diKxrM7g3as=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "b71e3faca99b40fb801f03fd950fbefbbba691a4",
+        "rev": "2814a5224a47ca19e858e027f7e8bff74a8ea9f1",
         "type": "github"
       },
       "original": {
@@ -341,11 +341,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1732757557,
+        "lastModified": 1733009147,
-        "narHash": "sha256-zADldaLfiSb2iGPhcSJPokGypYa1Fix0llhWkMvm8pQ=",
+        "narHash": "sha256-ioE5M49nUcGVu1OsdbSJ/29YAVXueRr/CFjnTT1Jyp8=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "5116835b8eb2ec18ec258050a11d374d38ac8764",
+        "rev": "24c8e2624356e9e6077b087510c13b600ba6858a",
         "type": "github"
       },
       "original": {
@@ -434,11 +434,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1731797254,
+        "lastModified": 1732749044,
-        "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
+        "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
+        "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685",
         "type": "github"
       },
       "original": {
@@ -494,11 +494,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1732521221,
+        "lastModified": 1732837521,
-        "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
+        "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
+        "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
         "type": "github"
       },
       "original": {
@@ -515,11 +515,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732639391,
+        "lastModified": 1733005589,
-        "narHash": "sha256-kFtXjoCIqx9xe0ZryPXpqS6l/HVg71aNcuL8Y5e8+pI=",
+        "narHash": "sha256-NAym0oWYwKgFuAif6Z7HacU6Su/SJNTW4wEYC5urSYU=",
         "owner": "pjones",
         "repo": "plasma-manager",
-        "rev": "06e3209d11797d9c741e25df06ab61048746bf93",
+        "rev": "88ca377ff58b5c30a2879745829842554d4b21d5",
         "type": "github"
       },
       "original": {
@@ -551,11 +551,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732588352,
+        "lastModified": 1732847586,
-        "narHash": "sha256-J2/hxOO1VtBA/u+a+9E+3iJpWT3xsBdghgYAVfoGCJo=",
+        "narHash": "sha256-SnHHSBNZ+aj8mRzYxb6yXBl9ei3K3j5agC/D8Vjw/no=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "414e748aae5c9e6ca63c5aafffda03e5dad57ceb",
+        "rev": "97210ddff72fe139815f4c1ac5da74b5b0dde2d7",
         "type": "github"
       },
       "original": {

users/tao.nix

@@ -179,7 +179,8 @@
   '';
 
   fonts.packages = with pkgs; [
-    (nerdfonts.override {fonts = ["FiraCode"];})
+    # (nerdfonts.override {fonts = ["FiraCode"];})
+    nerd-fonts.fira-code
     noto-fonts-cjk-sans
     noto-fonts-cjk-serif
     noto-fonts-color-emoji

users/tao/nushell/stuff.nu

@@ -69,7 +69,7 @@ def nr [package] {
   nix search nixpkgs $package
 }
 def rebuild --wrapped [subcommand, ...rest] {
-      if ((open /etc/hostname --raw) == NOlaptop) {
+      if ((open /etc/hostname --raw) == "NOlaptop\n") {
         sudo nix store info --store ssh://nocomputer
       }
       sudo nice -n19 nixos-rebuild $subcommand --flake /home/tao/projects/NOflake/ --impure --verbose ...$rest

users/tao/nushell/stuff.sync-conflict-20241124-232033-TOQAAMI.nu

@@ -1,175 +0,0 @@
-task
-
-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 quiet = sudo ectool fanduty 30
-alias loud = sudo ectool autofanctrl
-
-alias cp = cp -prv
-alias mv = mv -pv
-
-alias ja = 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
-
-def h [] {
-  sk | 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 "{}"'
-}
-alias nd = nix develop
-def ns [package] {
-  nix shell $"nixpkgs#($package)"
-}
-def nr [package] {
-  nix search nixpkgs $package
-}
-def rebuild --wrapped [subcommand, ...rest] {
-      if ((open /etc/hostname) == NOlaptop) {
-        sudo nix store info --store ssh://nocomputer
-      }
-      sudo nice -n19 nixos-rebuild $subcommand --flake /home/tao/projects/NOflake/ --impure --verbose ...$rest
-}
-# def post-rebuild [] {
-#     # rm -r ~/.config/helix/runtime/grammars/
-#     # hx --grammar fetch; hx --grammar build
-#     # rustup update
-# }
-def bump [] {
-  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
-  jj new
-}
-alias rb = rebuild boot
-alias rs = rebuild switch
-alias gc = nh clean all
-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) {
-    print "stop summoning first!"
-    return
-  } else {
-    tailscale set --exit-node $exit_node
-  }
-  if ($exit_node | is-not-empty) {
-    check-mullvad
-  }
-}
-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
-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 ~/.zoxide.nu