Refactor inventory

18 files changed, 97 insertions, 4 deletions

diff --git a/host_vars/arch-desktop-iso.local.yml b/host_vars/arch-desktop-iso.local.yml
new file mode 100644
index 0000000..05bc5b6
--- /dev/null
+++ b/host_vars/arch-desktop-iso.local.yml
diff --git a/host_vars/archiso.local.yml.example b/host_vars/arch-desktop-iso.local.yml.example
index d3967b0..69644d5 100644
--- a/host_vars/archiso.local.yml.example
+++ b/host_vars/arch-desktop-iso.local.yml.example
@@ -1,5 +1,5 @@
 ---
-hostname: "archlinux.local"
+hostname: "desktop.local"
 partition_disk: "/dev/nvme0n1"
 partition_wipe: true
 partition_boot:
diff --git a/host_vars/arch-laptop-iso.local.yml b/host_vars/arch-laptop-iso.local.yml
new file mode 100644
index 0000000..22b4bae
--- /dev/null
+++ b/host_vars/arch-laptop-iso.local.yml
diff --git a/host_vars/arch-laptop-iso.local.yml.example b/host_vars/arch-laptop-iso.local.yml.example
new file mode 100644
index 0000000..cc4ea7d
--- /dev/null
+++ b/host_vars/arch-laptop-iso.local.yml.example
@@ -0,0 +1,46 @@
+---
+hostname: "laptop.local"
+partition_disk: "/dev/sda"
+partition_wipe: false
+partition_boot:
+  num: 1
+  name: "boot"
+  flags: [boot, esp]
+  part_start: "0%"
+  part_end: "1.0GiB"
+  fstype: "vfat"
+  fstype_opts: "-F 32"
+  dev: "{{ partition_disk }}1"
+  mount_path: "/mnt/boot/efi"
+  fstab_opts: "defaults,nodev,nosuid,noexec,umask=0077"
+partition_swap:
+  num: 2
+  name: "swap"
+  flags: [swap]
+  part_start: "1.0GiB"
+  part_end: "9.0GiB"
+  fstype: "ext4"
+  dev: "{{ partition_disk }}2"
+  mount_path: "none"
+partition_root:
+  num: 4
+  name: "arch-root"
+  part_start: "59.0GiB"
+  part_end: "109.0GiB"
+  fstype: "ext4"
+  dev: "{{ partition_disk }}4"
+  mount_path: "/mnt"
+partition_extras:
+  - num: 3
+    name: "ubuntu-root"
+    part_start: "9.0GiB"
+    part_end: "59.0GiB"
+    fstype: "ext4"
+    dev: "{{ partition_disk }}3"
+  - num: 5
+    name: "home"
+    part_start: "109.0GiB"
+    part_end: "100%"
+    fstype: "ext4"
+    dev: "{{ partition_disk }}4"
+configure_playbook_dir: "../ansible-distro-configure"
diff --git a/host_vars/arch-macbook-iso.local.yml b/host_vars/arch-macbook-iso.local.yml
new file mode 100644
index 0000000..4b0015b
--- /dev/null
+++ b/host_vars/arch-macbook-iso.local.yml
diff --git a/host_vars/marchiso.local.yml.example b/host_vars/arch-macbook-iso.local.yml.example
index cbe391b..b99a244 100644
--- a/host_vars/marchiso.local.yml.example
+++ b/host_vars/arch-macbook-iso.local.yml.example
@@ -1,5 +1,5 @@
 ---
-hostname: "marchlinux.local"
+hostname: "macbook.local"
 partition_disk: "/dev/sda"
 partition_wipe: false
 partition_boot:
diff --git a/host_vars/archiso.local.yml b/host_vars/archiso.local.yml
deleted file mode 100644
index fd13ed2..0000000
--- a/host_vars/archiso.local.yml
+++ /dev/null
diff --git a/host_vars/marchiso.local.yml b/host_vars/marchiso.local.yml
deleted file mode 100644
index 2d33954..0000000
--- a/host_vars/marchiso.local.yml
+++ /dev/null
diff --git a/host_vars/mubuntuiso.local.yml b/host_vars/mubuntuiso.local.yml
deleted file mode 100644
index b80ecbf..0000000
--- a/host_vars/mubuntuiso.local.yml
+++ /dev/null
diff --git a/host_vars/raspberryiso.local.yml b/host_vars/rpi5-iso.local.yml
index 04b3db2..04b3db2 100644
--- a/host_vars/raspberryiso.local.yml
+++ b/host_vars/rpi5-iso.local.yml
diff --git a/host_vars/raspberryiso.local.yml.example b/host_vars/rpi5-iso.local.yml.example
index 6a98993..6a98993 100644
--- a/host_vars/raspberryiso.local.yml.example
+++ b/host_vars/rpi5-iso.local.yml.example
diff --git a/host_vars/ubuntu-desktop-iso.local.yml b/host_vars/ubuntu-desktop-iso.local.yml
new file mode 100644
index 0000000..ccbcc47
--- /dev/null
+++ b/host_vars/ubuntu-desktop-iso.local.yml
diff --git a/host_vars/ubuntuiso.local.yml.example b/host_vars/ubuntu-desktop-iso.local.yml.example
index 51b5456..0376c61 100644
--- a/host_vars/ubuntuiso.local.yml.example
+++ b/host_vars/ubuntu-desktop-iso.local.yml.example
@@ -1,5 +1,5 @@
 ---
-hostname: "ubuntu.local"
+hostname: "desktop.local"
 partition_disk: "/dev/nvme0n1"
 partition_wipe: true
 partition_boot:
diff --git a/host_vars/ubuntu-laptop-iso.local.yml b/host_vars/ubuntu-laptop-iso.local.yml
new file mode 100644
index 0000000..07a6445
--- /dev/null
+++ b/host_vars/ubuntu-laptop-iso.local.yml
diff --git a/host_vars/ubuntu-laptop-iso.local.yml.example b/host_vars/ubuntu-laptop-iso.local.yml.example
new file mode 100644
index 0000000..a4e7b63
--- /dev/null
+++ b/host_vars/ubuntu-laptop-iso.local.yml.example
@@ -0,0 +1,47 @@
+---
+hostname: "laptop.local"
+partition_disk: "/dev/sda"
+partition_wipe: false
+partition_boot:
+  num: 1
+  name: "boot"
+  flags: [boot, esp]
+  part_start: "0%"
+  part_end: "1.0GiB"
+  fstype: "vfat"
+  fstype_opts: "-F 32"
+  dev: "{{ partition_disk }}1"
+  mount_path: "/mnt/boot/efi"
+  fstab_opts: "defaults,nodev,nosuid,noexec,umask=0077"
+partition_swap:
+  num: 2
+  name: "swap"
+  flags: [swap]
+  part_start: "1.0GiB"
+  part_end: "9.0GiB"
+  fstype: "ext4"
+  dev: "{{ partition_disk }}2"
+  mount_path: "none"
+partition_root:
+  num: 3
+  name: "ubuntu-root"
+  part_start: "9.0GiB"
+  part_end: "59.0GiB"
+  fstype: "ext4"
+  dev: "{{ partition_disk }}3"
+  mount_path: "/mnt"
+partition_extras:
+  - num: 4
+    name: "arch-root"
+    part_start: "59.0GiB"
+    part_end: "109.0GiB"
+    fstype: "ext4"
+    dev: "{{ partition_disk }}4"
+  - num: 5
+    name: "home"
+    part_start: "109.0GiB"
+    part_end: "100%"
+    fstype: "ext4"
+    dev: "{{ partition_disk }}5"
+    mount_path: "/mnt/home"
+configure_playbook_dir: "../ansible-distro-configure"
diff --git a/host_vars/ubuntu-macbook-iso.local.yml b/host_vars/ubuntu-macbook-iso.local.yml
new file mode 100644
index 0000000..86ce960
--- /dev/null
+++ b/host_vars/ubuntu-macbook-iso.local.yml
diff --git a/host_vars/mubuntuiso.local.yml.example b/host_vars/ubuntu-macbook-iso.local.yml.example
index 704bffe..6c07621 100644
--- a/host_vars/mubuntuiso.local.yml.example
+++ b/host_vars/ubuntu-macbook-iso.local.yml.example
@@ -1,5 +1,5 @@
 ---
-hostname: "mubuntu.local"
+hostname: "macbook.local"
 partition_disk: "/dev/sda"
 partition_wipe: false
 partition_boot:
diff --git a/host_vars/ubuntuiso.local.yml b/host_vars/ubuntuiso.local.yml
deleted file mode 100644
index 20831bf..0000000
--- a/host_vars/ubuntuiso.local.yml
+++ /dev/null