incorporated john-p14s, big squash merge of stuff

modules/hosts/john-pc/default.nix

@@ -1,52 +1,56 @@
-{ inputs, ... }:
+{ self, inputs, ... }:
 let
   username = "john";
   hostname = "john-pc-ubuntu";
-  # testTarget = "fded:fb16:653e:25da:be24:11ff:fea0:753f"; # test-nix
-  testTarget = "fded:fb16:653e:25da:be24:11ff:fe89:1cc3"; # soteria
+
+  testHost = "soteria";
+  testTarget = "fded:fb16:653e:25da:be24:11ff:fea0:753f"; # test-nix
+  # testTarget = "fded:fb16:653e:25da:be24:11ff:fe89:1cc3"; # soteria
+
 in
 {
-  flake.modules.homeManager."${hostname}" = { pkgs, config, ... }:
+  flake.modules.homeManager."${hostname}" = { config, pkgs, lib, ... }:
   let
     flakeDir = "${config.xdg.configHome}/home-manager/jsl-dendritic";
     certDir = "${config.mtls.certDir}";
-    CACert = "${certDir}/root_ca.crt";
     mtlsBundle = "${certDir}/${config.mtls.bundleFilename}";
     resticPasswordFile = "${config.xdg.configHome}/restic/password.txt";
+
+    testPushCmd = (pkgs.writeShellScriptBin "test-push" ''
+      ${lib.getExe' pkgs.coreutils "mkdir"} -p /var/tmp/nix-build
+      ${lib.getExe' pkgs.coreutils "chmod"} 1777 /var/tmp/nix-build
+      ${lib.getExe pkgs.nixos-rebuild} switch \
+        --flake ${flakeDir}#${testHost} \
+        --target-host root@${testTarget}
+    '');
   in
   {
     imports = with inputs.self.modules.homeManager; [
       rebuild
       john
       mysops
+      janus-ca
       step-ssh-user
       mtls
       restic
       docker
       desktop
     ];
-    targets.genericLinux.enable = true;
-
-    shell.program = "zsh";
-
-    home.username = "${username}";
-    home.homeDirectory = "/home/${username}";
-
-    home.packages = with pkgs; [
-      nixos-rebuild
-      (writeShellScriptBin "test-push" ''
-        mkdir -p /var/tmp/nix-build
-        chmod 1777 /var/tmp/nix-build
-        nixos-rebuild switch \
-          --flake ${flakeDir}#john-pc-ubuntu \
-          --target-host root@${testTarget}
-      '')
-    ];
-
     # TODO: make this more restrictive, rather than allowing all unfree packages
     nixpkgs.config.allowUnfree = true;
     nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ];
 
+    targets.genericLinux.enable = true;
+
+    home.username = "${username}";
+    home.homeDirectory = "/home/${username}";
+    home.packages = [
+      pkgs.nixos-rebuild
+      testPushCmd
+    ];
+
+    shell.program = "zsh";
+  
     homeManagerFlakeDir = flakeDir;
     docker.enable = true;
 
@@ -91,10 +95,6 @@ in
     mtls = {
       enable = true;
       subject = hostname;
-      ca = {
-        url = "https://janus.john-stream.com/";
-        fingerprint = "2036c44f7b5901566ff7611ea6c927291ecc6d2dd00779c0eead70ec77fa10d6";
-      };
       san = [
         "${hostname}"
         "192.168.1.85"