Merge branch 'master' of https://git.joshuabell.xyz/ringofstorms/dotfiles

flakes/beszel/flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "beszel-nixpkgs": {
       "locked": {
-        "lastModified": 1765472234,
-        "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
+        "lastModified": 1767379071,
+        "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
+        "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
         "type": "github"
       },
       "original": {

flakes/common/hm_modules/ssh.nix

@@ -33,6 +33,7 @@ in
         controlMaster = "no";
         controlPath = "~/.ssh/master-%r@%n:%p";
         controlPersist = "no";
+        StrictHostKeyChecking = "accept-new";
       };
 
       # EXTERNAL
@@ -54,6 +55,11 @@ in
       "lio" = lib.mkIf (hasSecret "nix2lio") {
         identityFile = age.secrets.nix2lio.path;
         user = "josh";
+        extraOptions = {
+          "PubkeyAcceptedKeyTypes" = "ssh-ed25519";
+          "ServerAliveInterval" = "60";
+          "IPQoS" = "throughput";
+        };
       };
       "lio_" = lib.mkIf (hasSecret "nix2lio") {
         identityFile = age.secrets.nix2lio.path;

flakes/common/nix_modules/remote_lio_builds.nix

@@ -12,20 +12,11 @@ let
     secrets ? ${secret} && secrets.${secret} != null;
 in
 {
-  # Remote build off home lio computer
-  programs.ssh.extraConfig = lib.mkIf (hasSecret "nix2lio") ''
-    Host lio_
-      PubkeyAcceptedKeyTypes ssh-ed25519
-      ServerAliveInterval 60
-      IPQoS throughput
-      IdentityFile ${config.age.secrets.nix2lio.path}
-  '';
   nix = lib.mkIf (hasSecret "nix2lio") {
     distributedBuilds = true;
     buildMachines = [
       {
-        # TODO require hostname in ssh config?
-        hostName = "lio_";
+        hostName = "lio";
         system = "x86_64-linux";
         protocol = "ssh-ng";
         maxJobs = 32;
@@ -36,8 +27,10 @@ in
           "big-parallel"
           "kvm"
           "uid-range" # Often helpful
+          "recursive-nix"
         ];
         mandatoryFeatures = [ ];
+        sshKey = config.age.secrets.nix2lio.path;
       }
     ];
   };

flakes/opencode/flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1767026758,
-        "narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=",
+        "lastModified": 1767364772,
+        "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "346dd96ad74dc4457a9db9de4f4f57dab2e5731d",
+        "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
         "type": "github"
       },
       "original": {
@@ -21,11 +21,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1767126722,
-        "narHash": "sha256-bXBpPQ9altAzsuFKhIS83LKwuLIxKJ4gWMAG5xzk+fM=",
+        "lastModified": 1767556352,
+        "narHash": "sha256-iYP/fa9guprb2hn8ONJrJe6U076zbeKHdqyyL0gvH8s=",
         "owner": "sst",
         "repo": "opencode",
-        "rev": "3fe5d91372fdf859e09ed5a2aefe359e0648ed10",
+        "rev": "c545fa2a289518fda35be66d1c81936a54962702",
         "type": "github"
       },
       "original": {