Spring Cleaning

- create new module, `system`, that consumes the `boot` module and takes
in the more system-interested services from the `services` module
- touch up left over services (which are more self-hosting interested)
- touch up yo and yoshi configs

2 files changed, 11 insertions, 9 deletions

diff --git a/pkgs/yo.nix b/pkgs/yo.nix
index b98926a..91f30f7 100644
--- a/pkgs/yo.nix
+++ b/pkgs/yo.nix
@@ -4,25 +4,29 @@
 
     local flags = {}
     if arg[2] ~= nil then
-      for a = 2, #arg do
-        table.insert(flags, a)
+      for i = 2, #arg do
+        table.insert(flags, arg[i])
       end
     end
 
     if arg[1] == "deploy" or arg[1] == "dep" or arg[1] == "d" then
-      cmd = ("${pkgs.deploy-rs}/bin/deploy-rs --skip-checks %s -- --log-format internal-json |& ${pkgs.nix-output-monitor}/bin/nom --json"):format(table.concat(flags, " "))
+      cmd = ("nix run github:serokell/deploy-rs -- --skip-checks %s -- --log-format internal-json |& ${pkgs.nix-output-monitor}/bin/nom --json"):format(table.concat(flags, " "))
       print("+ "..cmd)
       os.execute(cmd)
     elseif arg[1] == "switch" or arg[1] == "sw" or arg[1] == "s" then
       verb = "switch"
-    elseif arg[1] == "boot" or arg[1] == "b" then
+    elseif arg[1] == "boot" or arg[1] == "bo" then
       verb = "boot"
     elseif arg[1] == "test" or arg[1] == "t" then
       verb = "test"
+    elseif arg[1] == "build" or arg[1] == "bu" then
+      cmd = ("nixos-rebuild build --flake /home/collin/nixos %s --log-format internal-json |& ${pkgs.nix-output-monitor}/bin/nom --json"):format(table.concat(flags, " "))
+      print("+ "..cmd)
+      os.execute(cmd)
     end
 
     if verb then
-      cmd = ("run0 sh -c 'nixos-rebuild %s --flake /home/collin/nixos %s --log-format internal-json |& ${pkgs.nix-output-monitor}/bin/nom --json'"):format(verb, table.concat(flags, " "))
+      cmd = ("run0 --background= sh -c 'nixos-rebuild %s --flake /home/collin/nixos %s --log-format internal-json |& ${pkgs.nix-output-monitor}/bin/nom --json'"):format(verb, table.concat(flags, " "))
       print("+ "..cmd)
       os.execute(cmd)
     end
diff --git a/pkgs/yoshi.nix b/pkgs/yoshi.nix
index 14341a0..3679ecf 100644
--- a/pkgs/yoshi.nix
+++ b/pkgs/yoshi.nix
@@ -18,14 +18,12 @@
         if isHome() then
           return yoshi.ssh{
             HostName = "192.168.50.2",
-            Port = 2222,
-            LocalForward = 8010
+            Port = 2222
           }
         else
           return yoshi.ssh{
             HostName = "williamsfam.us.com",
-            LocalForward = 8010,
-            DynamicFoward = 9090
+            DynamicForward = 9090
           }
         end
       end