From 1e50e835f74b4b4d4a4979d8adad9e07aac307dc Mon Sep 17 00:00:00 2001
From: Tao Tien <29749622+taotien@users.noreply.github.com>
Date: Fri, 14 Mar 2025 18:07:44 -0700
Subject: [PATCH] cleaunup alsna

---
 flake.nix                         | 15 ++++-----------
 systems/BASED.nix                 |  2 +-
 users/tao/nushell/extras/alias.nu |  1 +
 users/tao/nushell/extras/nix.nu   | 16 ++++++++--------
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/flake.nix b/flake.nix
index ea5473c..81e3735 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,9 +2,11 @@
   description = "we say NO to shitty OSes";
 
   inputs = {
+    nixos.url = "nixpkgs/nixos-24.05";
     nixpkgs.url = "nixpkgs/nixos-unstable";
     nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
     nixos-hardware.url = "nixos-hardware/master";
+    determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/0.1";
     agenix = {
       url = "github:ryantm/agenix";
       inputs.darwin.follows = "";
@@ -17,10 +19,6 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    # plasma-manager = {
-    #   url = "github:pjones/plasma-manager";
-    #   inputs.nixpkgs.follows = "nixpkgs";
-    # };
     # helix = {
     #   url = "github:mattwparas/helix/steel-event-system";
     #   inputs.nixpkgs.follows = "nixpkgs";
@@ -29,14 +27,10 @@
       url = "github:lilyinstarlight/nixos-cosmic";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    # prescurve.url = "github:taotien/prescurve";
-    # prescurve.inputs.nixpkgs.follows = "nixpkgs";
     zen-browser = {
       url = "github:0xc000022070/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/0.1";
-    nixos.url = "nixpkgs/nixos-24.05";
   };
 
   nixConfig = {
@@ -53,18 +47,17 @@
   };
 
   outputs = {
+    nixos,
     self,
     nixpkgs,
     nixos-facter-modules,
     nixos-hardware,
+    determinate,
     agenix,
     disko,
     home-manager,
-    # plasma-manager,
     nixos-cosmic,
     zen-browser,
-    determinate,
-    nixos,
     ...
   } @ inputs: {
     nixosConfigurations = {
diff --git a/systems/BASED.nix b/systems/BASED.nix
index bbf6cc0..4fc9c80 100644
--- a/systems/BASED.nix
+++ b/systems/BASED.nix
@@ -26,7 +26,7 @@
     ouch
     pueue
     ripgrep
-    rustdesk
+    # rustdesk
     sendme
     skim
     tree
diff --git a/users/tao/nushell/extras/alias.nu b/users/tao/nushell/extras/alias.nu
index 70c922e..113e53c 100644
--- a/users/tao/nushell/extras/alias.nu
+++ b/users/tao/nushell/extras/alias.nu
@@ -13,6 +13,7 @@ alias la = ls -a
 
 alias quiet = sudo ectool fanduty 42
 alias loud = sudo ectool autofanctrl
+alias louder = sude ectool fanduty 100
 
 alias cp-full = cp
 alias cp = cp -prv
diff --git a/users/tao/nushell/extras/nix.nu b/users/tao/nushell/extras/nix.nu
index a5639db..6561f4c 100644
--- a/users/tao/nushell/extras/nix.nu
+++ b/users/tao/nushell/extras/nix.nu
@@ -4,11 +4,11 @@ def ns [package] {
   nix shell $"nixpkgs#($package)"
 }
 
-def nr [package] {
-  nix search nixpkgs $package
-}
+# def nr [package] {
+#   nix search nixpkgs $package
+# }
 
-def rebuild --wrapped [subcommand, --builders: string, ...rest] {
+def rebuild [subcommand, --builders: string] {
   mut builders = $builders;
   if (open /etc/hostname --raw) == "NOlaptop\n" and ($builders != "") {
     if (ping -c1 -W1 nocomputer | complete | $in.exit_code == 0) {
@@ -18,9 +18,9 @@ def rebuild --wrapped [subcommand, --builders: string, ...rest] {
     }
   }
   if ($builders == "") {
-    sudo systemd-inhibit nice -n19 nixos-rebuild $subcommand --flake . --impure --verbose --builders ""
+    sudo systemd-inhibit nice -n19 nixos-rebuild $subcommand --flake . --impure --verbose --builders "" --log-format internal-json o+e>| nom --json
   } else {
-    sudo systemd-inhibit nice -n19 nixos-rebuild $subcommand --flake . --impure --verbose ...$rest
+    sudo systemd-inhibit nice -n19 nixos-rebuild $subcommand --flake . --impure --verbose --log-format internal-json o+e>| nom --json
   }
   toastify send rebuild done!
 }
@@ -31,13 +31,13 @@ def post-rebuild [] {
     rustup update
 }
 
-def bump --wrapped [...rest] {
+def bump [...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
+  rebuild boot
   jj new
 }