misc changes

6 files changed, 78 insertions, 27 deletions

diff --git a/flake.nix b/flake.nix
index a4805cb..fc89ac8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,6 +33,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    copyparty = {
+      url = "github:9001/copyparty";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     tmux-tsunami = {
       url = "github:bluedragon1221/tmux-tsunami";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix
index 80c61e3..8dc8fe6 100644
--- a/hosts/mercury/nixos.nix
+++ b/hosts/mercury/nixos.nix
@@ -20,14 +20,16 @@
     dataDir = "/home/collin/.local/syncthing";
   };
 
+  security.soteria.enable = true;
+
   services.printing.enable = true;
 
   environment.defaultPackages = lib.mkForce []; # im not a noob
 
   programs.ssh.extraConfig = ''
     Host ganymede
-      HostName 192.168.50.2
-      Port 2222
+      HostName williamsfam.us.com
+      Port 22
   '';
 
   programs.firefox.policies.ExtensionSettings = {
diff --git a/modules/desktop/hjem/wm/sway.nix b/modules/desktop/hjem/wm/sway.nix
index 7051402..a6a4b09 100644
--- a/modules/desktop/hjem/wm/sway.nix
+++ b/modules/desktop/hjem/wm/sway.nix
@@ -54,6 +54,10 @@
       xkb_options caps:none
     }
 
+    input type:touchpad {
+      dwt disabled
+    }
+
     bindsym Mod4+1 workspace number 1
     bindsym Mod4+2 workspace number 2
     bindsym Mod4+3 workspace number 3
diff --git a/modules/desktop/nixos/programs/firefox.nix b/modules/desktop/nixos/programs/firefox.nix
index c8edca1..21c8e17 100644
--- a/modules/desktop/nixos/programs/firefox.nix
+++ b/modules/desktop/nixos/programs/firefox.nix
@@ -16,7 +16,6 @@ in
 
         OverrideFirstRunPage = "";
         OverridePostUpdatePage = "";
-        Homepage = "about:blank";
 
         NewTabPage = false;
 
@@ -36,13 +35,11 @@ in
 
           "browser.theme.content-theme" = opt 0;
           "browser.theme.toolbar-theme" = opt 0;
-          "browser.display.background_color.dark" =
-            if cfg.theme == "adwaita"
-            then opt "#1d1d1d"
-            else opt "";
+          "browser.display.background_color.dark" = opt "${config.collinux.palette.base00}";
 
           "browser.tabs.loadBookmarksInTabs" = opt true;
           "browser.toolbars.bookmarks.visibility" = opt "never";
+
           "browser.uiCustomization.state" = opt (lib.replaceStrings ["\n" " "] ["" ""] ''
             {
               "placements": {
@@ -91,8 +88,6 @@ in
           "accessibility.force_disabled" = opt 1;
           "browser.aboutConfig.showWarning" = opt false;
 
-          "startup.homepage_welcome_url" = opt "about:blank";
-          "trailhead.firstrun.didSeeAboutWelcome" = opt true;
           "datareporting.policy.dataSubmissionPolicyBypassNotification" = opt true;
           "browser.startup.homepage" = opt "about:blank";
 
diff --git a/pkgs/yo.nix b/pkgs/yo.nix
index 91f30f7..6846046 100644
--- a/pkgs/yo.nix
+++ b/pkgs/yo.nix
@@ -1,34 +1,79 @@
 {pkgs, ...}: let
   yo = pkgs.writeText "yo.lua" ''
-    local verb
+    local SUDO = os.getenv("SUDO") or "sudo"
 
-    local flags = {}
-    if arg[2] ~= nil then
-      for i = 2, #arg do
-        table.insert(flags, arg[i])
+    local function collectArgs(start)
+      local start = start or 2
+
+      local flags = {}
+      if arg[start] ~= nil then
+        for i = start, #arg do
+          table.insert(flags, arg[i])
+        end
+      end
+      return flags
+    end
+
+    local function nixosRebuild(args)
+      local sudo = (args.sudo or false) == true
+      local verb = args.verb or "switch"
+      local flake = args.flake or "/home/collin/nixos"
+      local extraArgs = table.concat(args.extraArgs or {}, " ")
+
+      cmd = ("nixos-rebuild %s --flake %s %s --log-format internal-json |& ${pkgs.nix-output-monitor}/bin/nom --json"):format(verb, flake, extraArgs)
+      if sudo then
+        local sudo_cmd = ("%s su -c '%s'"):format(SUDO, cmd)
+        print("+ "..sudo_cmd)
+        os.execute(sudo_cmd)
+      else
+        print("+ "..cmd)
+        os.execute(cmd)
       end
     end
 
     if arg[1] == "deploy" or arg[1] == "dep" or arg[1] == "d" then
-      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, " "))
+      local deploy_args = {}
+      local nix_args = {}
+
+      local found_dashes = false
+      if arg[2] ~= nil then
+        for i = 2, #arg do
+          if arg[i] == "--" then
+            found_dashes = true
+          elseif found_dashes then
+            table.insert(nix_args, arg[i])
+          else
+            table.insert(deploy_args, arg[i])
+          end
+        end
+      end
+
+      cmd = ("nix run github:serokell/deploy-rs -- --skip-checks %s -- --log-format internal-json %s |& ${pkgs.nix-output-monitor}/bin/nom --json"):format(table.concat(deploy_args, " "), table.concat(nix_args, " "))
       print("+ "..cmd)
       os.execute(cmd)
     elseif arg[1] == "switch" or arg[1] == "sw" or arg[1] == "s" then
-      verb = "switch"
+      local target = "/home/collin/nixos"
+      if arg[2] ~= nil and arg[2]:match("#") then
+        target = arg[2]
+      end
+
+      nixosRebuild{
+        sudo = true,
+        verb = "switch",
+        flake = target,
+        extraArgs = collectArgs(3)
+      }
     elseif arg[1] == "boot" or arg[1] == "bo" then
-      verb = "boot"
+      nixosRebuild{sudo = true, verb = "boot", extraArgs = collectArgs()}
     elseif arg[1] == "test" or arg[1] == "t" then
-      verb = "test"
+      nixosRebuild{sudo = true, verb = "test", extraArgs = collectArgs()}
     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
+      local target = "/home/collin/nixos"
+      if arg[2] ~= nil and arg[2]:match("#") then
+        target = arg[2]
+      end
 
-    if verb then
-      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)
+      nixosRebuild{verb = "build", flake = target, extraArgs = collectArgs(3)}
     end
   '';
 in
diff --git a/secrets.nix b/secrets.nix
index 2dae288..d766bc7 100644
--- a/secrets.nix
+++ b/secrets.nix
@@ -1,5 +1,5 @@
 let
-  inherit (builtins.fromTOML ./hosts.toml) mercury ganymede jupiter;
+  inherit ((builtins.fromTOML (builtins.readFile ./hosts.toml)).hosts) mercury ganymede jupiter;
 in {
   "caddy-env.age".publicKeys = [ganymede.host_pubkey];
   "tsnsrv-authkey.age".publicKeys = [ganymede.host_pubkey mercury.host_pubkey];