minor fixes/improvements in nixops files

4 files changed, 23 insertions, 10 deletions

diff --git a/nixos/nixos-generate/README.md b/nixos/nixos-generate/README.md
index 8519b4f..ce2ae46 100644
--- a/nixos/nixos-generate/README.md
+++ b/nixos/nixos-generate/README.md
@@ -3,7 +3,7 @@ as /dev/sda beeing the target disk etc..
 
 nix-shell -p nixos-generators nixops
 
-Adapt nixos-iso.nix/ nixos-extra.nix (public key & /dev/sdX)
+Adapt config-iso.nix/ config-extra.nix (public key & /dev/sdX)
 
 cp $(nixos-generate -c config-iso.nix -f iso) my-nixos.iso
 
@@ -17,4 +17,7 @@ reboot into new nixos
 back on host: 
 adapt nixops.nix
 
-run: nixops deploy .. etc
+run:    (optionally with "-d label" after each)
+	nixops create nixops.nix # only first time
+	nixops deploy .. etc
+	nixops ssh-for-each -- uptime
diff --git a/nixos/nixos-generate/config-extra.nix b/nixos/nixos-generate/config-extra.nix
index 60111be..92b2f33 100644
--- a/nixos/nixos-generate/config-extra.nix
+++ b/nixos/nixos-generate/config-extra.nix
@@ -6,4 +6,4 @@
   };
 
   boot.loader.grub.enable = true;
-}
+} # no newline afer this !
diff --git a/nixos/nixos-generate/miguel-quick-install.sh b/nixos/nixos-generate/miguel-quick-install.sh
index 369142b..3c3e7cb 100644
--- a/nixos/nixos-generate/miguel-quick-install.sh
+++ b/nixos/nixos-generate/miguel-quick-install.sh
@@ -3,21 +3,25 @@ mkdir -p $out/bin
 cat >> $out/bin/miguel-quick-install << EOL
 #!$bash/bin/bash
 
-set -e
+set -e # stop on error
+set -u # stop on undefined var
 
 echo
 echo =========================================================================
-echo -== Welcome to Miguel's Custom NixOS Quick Install ... Please Standby ==-
+echo == Welcome to Miguels Custom NixOS Quick Install ... Please Standby ==
 echo =========================================================================
 echo
 
+echo desired hosname = \$1
+echo
+
 echo 1. Create Target Partitions
 parted /dev/sda -- mklabel msdos
 parted /dev/sda -- mkpart primary 1MiB -8GiB
 mkfs.ext4 -L nixos /dev/sda1
 
 echo 2. Mount Target Partitions
-mkdir /mnt
+mkdir -p /mnt
 mount /dev/sda1 /mnt
 
 echo 3. Update Nix Channel
@@ -25,10 +29,11 @@ nix-channel --update
 
 echo 4. Generate Configs
 nixos-generate-config --root /mnt
-cp $configextra /mnt/etc/nixos/configuration.nix
 cp $configextra /mnt/etc/nixos/config-extra.nix
 cp $configiso   /mnt/etc/nixos/config-iso.nix
 cp $0           /mnt/etc/nixos/miguel-quick-install.sh
+cat $configextra | head -n -1       > /mnt/etc/nixos/configuration.nix
+echo "networking.hostName=\"\$1\";}" >> /mnt/etc/nixos/configuration.nix
 
 echo 5. Start NixOS Installer!
 nixos-install --no-root-passwd
diff --git a/nixos/nixos-generate/nixops.nix b/nixos/nixos-generate/nixops.nix
index 08b5fd9..6931455 100644
--- a/nixos/nixos-generate/nixops.nix
+++ b/nixos/nixos-generate/nixops.nix
@@ -1,16 +1,21 @@
 {
-  network.description = "My first nix cluster";
+  network.description = "My first NixOS cluster";
   network.enableRollback = true;
 
   nixos-01 = {config, pkgs,...}:
   {
     imports = [ ./config-extra.nix ];
     environment.systemPackages = with pkgs; [mc];
-    deployment.targetHost = "192.168.0.145";
+    deployment.targetHost = "nixos-01";
   };
 
   nixos-02 = {
     imports = [ ./config-extra.nix ];
-    deployment.targetHost = "192.168.0.146";
+    deployment.targetHost = "nixos-02";
+  };
+
+  nixos-03 = {
+    imports = [ ./config-extra.nix ];
+    deployment.targetHost = "nixos-03";
   };
 }