Cleanup

README.md

@@ -53,6 +53,9 @@ More options for the built ISO:
 
     --drive=</dev/sdX>
       Which drive to install arch on, if absent, the first disk under /dev/ is used
+
+    --minimal
+    Starts a minimal installation, and skips looking for profiles.
     
     --size=100% (Default)
       Sets the size of the root filesystem (btrfs)
@@ -75,8 +78,10 @@ More options for the built ISO:
     --hostname=Arcinstall (Default)
       Sets the hostname of the box
     
-    --country=SE (Default)
+    --country=all (Default)
       Default mirror allocation for fetching packages.
+      If network is found, archinstall will try to attempt and guess which country the
+      install originates from, basing it off GeoIP off your public IP (uses https://hvornu.se/ip/ for lookups)
     
     --packages='' (Default)
       Which additional packages to install, defaults to none.
@@ -88,7 +93,7 @@ More options for the built ISO:
     --post=reboot (Default)
       After a successful install, reboots into the system. Use --post=stay to not reboot.
 
-    --default
+    --unattended
       This parameter causes the installation script to install arch unattended on the first disk
 
     --profile=<name>

deployments/00:11:22:33:44:55.json

@@ -6,14 +6,14 @@
         "post" : "don't reboot"
     },
     "post" : {
+        "Setup user" : {
+            "useradd -m -G wheel -s /bin/bash anton" : null,
+            "sh -c \"echo {user}:{password} | chpasswd\"" : {"pass-args" : true}
+        },
         "Setup a basic virtual environment": {
             "mkdir -p /home/{user}/virts" : {"pass-args" : true},
             "qemu-img create -f qcow2 /home/{user}/virts/test_deploy.qcow2 4G" : {"pass-args" : true},
             "chown -R {user}.{user} /home/{user}/virts" : {"pass-args" : true}
-        },
-        "Setup user" : {
-            "useradd -m -G wheel -s /bin/bash anton" : null,
-            "sh -c \"echo {user}:{password} | chpasswd\"" : {"pass-args" : true}
         }
     }
 }

deployments/default.json

@@ -1,6 +1,17 @@
 {
-    "args" : {
-        "password" : "<STDIN>",
-        "post" : "reboot"
-    }
+	"args" : {
+		"password" : "0000",
+		"post" : "stay"
+	},
+	"post" : {
+		"test exit codes" : {
+			"ssh test@77.80.220.176" : {"events" : {
+											"continue connecting" : "yes\n",
+											"s password" : "test\n"
+										},
+										"boot" : true,
+										"debug" : true
+									 }
+		}
+	}
 }

deployments/gitea.json

@@ -0,0 +1,13 @@
+{
+    "args" : {
+        "password" : "<STDIN>",
+        "_editor" : "nano",
+        "_utils" : "openssh git curl dhclient",
+        "post" : "don't reboot"
+    },
+    "post" : {
+        "Install workstation packages": {
+            "pacman -Syy --noconfirm {_utils}  {_editor}" : {"pass-args" : true}
+        }
+    }
+}

deployments/vmhost.json

@@ -0,0 +1,26 @@
+{
+    "args" : {
+        "password" : "<STDIN>",
+        "_keyboard_layout" : "us",
+        "_editor" : "vim",
+        "_window_manager" : "i3",
+        "_window_manager_dependencies" : "xorg-server xorg-xrandr xorg-xinit xterm",
+        "_window_manager_utilities" : "slock xscreensaver terminus-font-otb gnu-free-fonts ttf-liberation xsel",
+        "_virtulization" : "qemu ovmf",
+        "_utils" : "git htop dhclient curl",
+        "post" : "don't reboot"
+    },
+    "post" : {
+        "Install workstation packages": {
+            "pacman -Syy --noconfirm {_editor} {_utils} {_window_manager} {_window_manager_dependencies} {_window_manager_utilities} {_virtulization}" : {"pass-args" : true}
+        },
+        "Setup virtulization" : {
+            "sh -c \"Description=\\\"Bridge for virtual machines\\\"\nInterface=br0\nConnection=bridge\nBindsToInterfaces=(eno1)\nIP=no\nExecUpPost=\\\"ip link set dev br0 address $(cat /sys/class/net/eno1/address); IP=dhcp; ip_set\\\"\nExecDownPre=\\\"IP=dhcp\\\"\n\n## Ignore (R)STP and immediately activate the bridge\nSkipForwardingDelay=yes\"" : null
+        },
+        "Setup localization" : {
+            "sh -c \"echo 'setxkbmap us' >> /etc/X11/xinit/xinitrc\"" : null,
+            "sh -c \"echo 'KEYMAP={_keyboard_layout}\nFONT=lat9w-16' >> /etc/vconsole.conf\"" : {"pass-args" : true}
+        },
+        "Configure desktop environment" : "i3"
+    }
+}