fix: minor adjustments to bootstrapping

SwarselSystems.org

@@ -1180,7 +1180,7 @@ Every host is housed in the =hosts/= directory, which is then subdivided by each
 
 This is a list of all physical machines that I maintain.
 
-**** live (ISO)
+**** drugstore (ISO)
 :PROPERTIES:
 :CUSTOM_ID: h:8583371d-5d47-468b-84ba-210aad7e2c90
 :END:
@@ -1257,7 +1257,7 @@ This is a live environment ISO that I use to bootstrap new systems. It only load
     system.stateVersion = lib.mkForce "23.05";
 
     networking = {
-      hostName = "live";
+      hostName = "drugstore";
       wireless.enable = false;
     };
 
@@ -2840,13 +2840,9 @@ This program sets up a new NixOS host.
   # __________________________
 
   if yes_or_no "Add ssh host fingerprints for git upstream repositories? (This is needed for building the full config)"; then
-      if [ "$target_user" == "root" ]; then
-          home_path="/root"
-      else
-          home_path="/home/$target_user"
-      fi
       green "Adding ssh host fingerprints for git{lab,hub}"
-      $ssh_cmd "mkdir -p $home_path/.ssh/; ssh-keyscan -t ssh-ed25519 gitlab.com github.com swagit.swarsel.win >>$home_path/.ssh/known_hosts"
+      $ssh_cmd "mkdir -p /home/target_user/.ssh/; ssh-keyscan -t ssh-ed25519 gitlab.com github.com swagit.swarsel.win >> /home/$target_user/.ssh/known_hosts"
+      $ssh_root_cmd "mkdir -p /root/.ssh/; ssh-keyscan -t ssh-ed25519 gitlab.com github.com swagit.swarsel.win >> /root/.ssh/known_hosts"
   fi
   # --------------------------
 
@@ -2859,7 +2855,6 @@ This program sets up a new NixOS host.
 
       if yes_or_no "Do you want to rebuild immediately?"; then
           green "Rebuilding nix-config on $target_hostname"
-          #FIXME:(bootstrap) there are still a gitlab fingerprint request happening during the rebuild
           $ssh_cmd -oForwardAgent=yes "cd .dotfiles && sudo nixos-rebuild --show-trace --flake .#$target_hostname switch"
       fi
   else
@@ -2881,7 +2876,10 @@ This program sets up a new NixOS host.
       deadnix hosts/nixos/"$target_hostname"/hardware-configuration.nix -qe
       nixpkgs-fmt hosts/nixos/"$target_hostname"/hardware-configuration.nix
       (pre-commit run --all-files 2> /dev/null || true) &&
-          git add "$git_root/hosts/$target_hostname/hardware-configuration.nix" && (git commit -m "feat: hardware-configuration.nix for $target_hostname" || true) && git push
+          git add "$git_root/hosts/nixos/$target_hostname/hardware-configuration.nix" &&
+          git add "$git_root/.sops.nix" &&
+          git add "$git_root/secrets" &&
+          (git commit -m "feat: deployed $target_hostname" || true) && git push
   fi
 #+end_src
 

scripts/bootstrap.sh

@@ -213,13 +213,9 @@ $ssh_root_cmd "chown $target_user:users /home/swarsel/.ssh/ssh_host_ed25519_key"
 # __________________________
 
 if yes_or_no "Add ssh host fingerprints for git upstream repositories? (This is needed for building the full config)"; then
-    if [ "$target_user" == "root" ]; then
-        home_path="/root"
-    else
-        home_path="/home/$target_user"
-    fi
     green "Adding ssh host fingerprints for git{lab,hub}"
-    $ssh_cmd "mkdir -p $home_path/.ssh/; ssh-keyscan -t ssh-ed25519 gitlab.com github.com swagit.swarsel.win >>$home_path/.ssh/known_hosts"
+    $ssh_cmd "mkdir -p /home/target_user/.ssh/; ssh-keyscan -t ssh-ed25519 gitlab.com github.com swagit.swarsel.win >> /home/$target_user/.ssh/known_hosts"
+    $ssh_root_cmd "mkdir -p /root/.ssh/; ssh-keyscan -t ssh-ed25519 gitlab.com github.com swagit.swarsel.win >> /root/.ssh/known_hosts"
 fi
 # --------------------------
 
@@ -232,7 +228,6 @@ if yes_or_no "Do you want to copy your full nix-config and nix-secrets to $targe
 
     if yes_or_no "Do you want to rebuild immediately?"; then
         green "Rebuilding nix-config on $target_hostname"
-        #FIXME:(bootstrap) there are still a gitlab fingerprint request happening during the rebuild
         $ssh_cmd -oForwardAgent=yes "cd .dotfiles && sudo nixos-rebuild --show-trace --flake .#$target_hostname switch"
     fi
 else
@@ -254,5 +249,8 @@ if yes_or_no "You can now commit and push the nix-config, which includes the har
     deadnix hosts/nixos/"$target_hostname"/hardware-configuration.nix -qe
     nixpkgs-fmt hosts/nixos/"$target_hostname"/hardware-configuration.nix
     (pre-commit run --all-files 2> /dev/null || true) &&
-        git add "$git_root/hosts/$target_hostname/hardware-configuration.nix" && (git commit -m "feat: hardware-configuration.nix for $target_hostname" || true) && git push
+        git add "$git_root/hosts/nixos/$target_hostname/hardware-configuration.nix" &&
+        git add "$git_root/.sops.nix" &&
+        git add "$git_root/secrets" &&
+        (git commit -m "feat: deployed $target_hostname" || true) && git push
 fi