janus root

homeManagerModules/default.nix

@@ -55,9 +55,12 @@
     btop
     yazi
     uv
+    (writeShellScriptBin "nhms" ''
+      nix run home-manager -- switch --flake ~/.config/home-manager --impure
+    '')
     (writeShellScriptBin "nhmu" ''
       nix flake update --flake ~/.config/home-manager
-      nix run home-manager -- switch --flake ~/.config/home-manager --impure
+      nhms
     '')
     # # It is sometimes useful to fine-tune packages, for example, by applying
     # # overrides. You can do that directly here, just don't forget the

homeManagerModules/restic/profiles/base.nix

@@ -37,6 +37,7 @@
         "/home/*/Videos"
         "/home/*/go"
         "/home/*/snap"
+        "/home/john/john-nas"
       ];
       schedule-permission = "user";
       schedule-priority = "background";

homeManagerModules/restic/resticprofile.nix

@@ -46,20 +46,27 @@ in {
       resticprofileCmd = ''
         ${cfg.package}/bin/resticprofile --config "${config.xdg.configHome}/resticprofile/profiles.yaml"
       '';
+      
+      # Define the rp script as a variable so we can reference it
+      rpScript = pkgs.writeShellScriptBin "rp" ''
+        set -e
+        sudo ${cfg.package}/bin/resticprofile --config "${config.xdg.configHome}/resticprofile/profiles.yaml" $@
+      '';
+      rpbackupScript = pkgs.writeShellScriptBin "rp-backup" ''
+        ${rpScript}/bin/rp run-schedule backup@default
+      '';
     in {
       # Add a script to manually unschedule and reschedule all resticprofiles
       home.packages = [
         cfg.package
-        (pkgs.writeShellScriptBin "rp" ''
-          set -e
-          sudo ${cfg.package}/bin/resticprofile --config "${config.xdg.configHome}/resticprofile/profiles.yaml" $@
-        '')
+        rpScript
+        rpbackupScript
         (pkgs.writeShellScriptBin "rps" ''
           set -e
-          rp unschedule --all
-          rp schedule --all
+          ${rpScript}/bin/rp unschedule --all
+          ${rpScript}/bin/rp schedule --all
         '')
-        (pkgs.writeShellScriptBin "rp-test" "rp run-schedule backup@default --dry-run")
+        (pkgs.writeShellScriptBin "rp-test" "${rpbackupScript}/bin/rp-backup --dry-run")
       ];
       xdg.configFile."resticprofile/profiles.yaml".source = yamlFormat.generate "profiles" {
         version = "2";

homeManagerModules/ssh.nix

@@ -11,9 +11,18 @@
       {
         "*" = {
           user = "john";
-          forwardAgent = true;
-          serverAliveInterval = 60;
-          serverAliveCountMax = 2;
+
+          # From the help text about the deprecation of the default config:
+          forwardAgent = false;
+          addKeysToAgent = "no";
+          compression = false;
+          serverAliveInterval = 0;
+          serverAliveCountMax = 3;
+          hashKnownHosts = false;
+          userKnownHostsFile = "~/.ssh/known_hosts";
+          controlMaster = "no";
+          controlPath = "~/.ssh/master-%r@%n:%p";
+          controlPersist = "no";
         };
       }
       (lib.mkIf (config.profile == "personal") {
@@ -29,6 +38,10 @@
           hostname = "192.168.1.110";
           user = "root";
         };
+        "gitea" = {
+          hostname = "192.168.1.104";
+          user = "john";
+        };
         "hermes" = {
           hostname = "192.168.1.150";
           user = "root";
@@ -57,6 +70,28 @@
           hostname = "192.168.1.129";
           user = "root";
         };
+        "janus" = {
+          hostname = "janus.john-stream.com";
+          user = "root";
+          identitiesOnly = true;
+          identityFile = "~/.ssh/id_ed25519";
+          certificateFile = "~/.ssh/id_ed25519-cert.pub";
+        };
+        "soteria" = {
+          hostname = "soteria.john-stream.com";
+          user = "john";
+          identitiesOnly = true;
+          identityFile = "~/.ssh/id_ed25519";
+          certificateFile = "~/.ssh/id_ed25519-cert.pub";
+        };
+        "*.john-stream.com" = {
+          user = "john";
+          identitiesOnly = true;
+          identityFile = "~/.ssh/id_ed25519";
+          certificateFile = "~/.ssh/id_ed25519-cert.pub";
+          addKeysToAgent = "yes";
+          forwardAgent = true;
+        };
       })
       (lib.mkIf (config.profile == "work") {
         "ubuntu-nvidia" = {