various yo* changes

3 files changed, 28 insertions, 2 deletions

diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix
index ebe88db..8504b64 100644
--- a/hosts/mercury/hjem.nix
+++ b/hosts/mercury/hjem.nix
@@ -53,4 +53,8 @@ in {
 
     socks5-addr = "localhost:1666"
   '';
+
+  files.".config/yo.conf".text = ''
+    sudo    run0 --background=
+  '';
 }
diff --git a/modules/terminal/nixos/github_ssh.nix b/modules/terminal/nixos/github_ssh.nix
index a2a0324..a9aa11b 100644
--- a/modules/terminal/nixos/github_ssh.nix
+++ b/modules/terminal/nixos/github_ssh.nix
@@ -6,6 +6,7 @@
   cfg = config.collinux.terminal.programs.git;
 in
   lib.mkIf cfg.installKey {
+    # public key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC3SjzIs3YI8PWJaNrAuaEeRcTcvIVHOKyCh2VwHTHEF"
     collinux.secrets = {
       "github-ssh-key" = {
         file = ./github-ssh-key.age;
@@ -23,6 +24,11 @@ in
           IdentityFile ${config.collinux.secrets."github-ssh-key".path}
           IdentitiesOnly yes
           AddKeysToAgent yes
+
+        Match host williamsfam.us.com user forgejo
+          IdentityFile ${config.collinux.secrets."github-ssh-key".path}
+          IdentitiesOnly yes
+          AddKeysToAgent yes
       '';
     };
   }
diff --git a/pkgs/yo.nix b/pkgs/yo.nix
index 6846046..11bab17 100644
--- a/pkgs/yo.nix
+++ b/pkgs/yo.nix
@@ -1,6 +1,22 @@
 {pkgs, ...}: let
   yo = pkgs.writeText "yo.lua" ''
-    local SUDO = os.getenv("SUDO") or "sudo"
+    local CONF_FILE = os.getenv("HOME") .. "/.config/yo.conf"
+
+    local conf = {}
+    for l in io.open(CONF_FILE):lines() do
+      if l:match("^(%a+)%s") then
+        local k, v = l:match("^(%a+)%s+(.*)$")
+        conf[k] = v
+      end
+    end
+
+    local SUDO = "sudo"
+    if conf.sudo then
+      SUDO = conf.sudo
+    end
+    if os.getenv("SUDO") then
+      SUDO = os.getenv("SUDO")
+    end
 
     local function collectArgs(start)
       local start = start or 2
@@ -20,7 +36,7 @@
       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)
+      cmd = ("${pkgs.nixos-rebuild-ng}/bin/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)