Change the host_var mappings and inventory names

11 files changed, 5 insertions, 47 deletions

diff --git a/README.md b/README.md
index a5fef183..9dca1949 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ with your own version.
 
 If you are not using `git-crypt`, delete the `.gitattributes` file and override the encrypted files
 with your own version.<br>
-Ex. `rm .gitattributes && cp host_vars/ubuntuiso.local.yml.example host_vars/ubuntuiso.local.yml`
+Ex. `rm .gitattributes && cp host_vars/laptop.local.yml.example host_vars/laptop.local.yml`
 
 ## Playbook: distro-install
 
diff --git a/host_vars/archlinux.local.yml b/host_vars/desktop.local.yml
index 4ba6bcf4..4ba6bcf4 100644
--- a/host_vars/archlinux.local.yml
+++ b/host_vars/desktop.local.yml
diff --git a/host_vars/archlinux.local.yml.example b/host_vars/desktop.local.yml.example
index ba2122ab..ba2122ab 100644
--- a/host_vars/archlinux.local.yml.example
+++ b/host_vars/desktop.local.yml.example
diff --git a/host_vars/mubuntu.local.yml b/host_vars/laptop.local.yml
index c06c5d97..c06c5d97 100644
--- a/host_vars/mubuntu.local.yml
+++ b/host_vars/laptop.local.yml
diff --git a/host_vars/mubuntu.local.yml.example b/host_vars/laptop.local.yml.example
index f93ecd3b..f93ecd3b 100644
--- a/host_vars/mubuntu.local.yml.example
+++ b/host_vars/laptop.local.yml.example
diff --git a/host_vars/macbook.local.yml b/host_vars/macbook.local.yml
new file mode 100644
index 00000000..e02ab885
--- /dev/null
+++ b/host_vars/macbook.local.yml
diff --git a/host_vars/marchlinux.local.yml.example b/host_vars/macbook.local.yml.example
index 1b876c9c..a7fbcad8 100644
--- a/host_vars/marchlinux.local.yml.example
+++ b/host_vars/macbook.local.yml.example
@@ -1,6 +1,6 @@
 ---
 # Using raspberry pi as gateway (VPN) and DNS sinkhole (pihole)
-network_ipv4_address: "10.0.0.200"
+network_ipv4_address: "10.0.0.203"
 network_ipv4_gateway: "10.0.0.254"
 network_ipv4_dns: "10.0.0.254"
 network_ipv6_address: "fd5c:fd8b:2b8c::200/64"
diff --git a/host_vars/marchlinux.local.yml b/host_vars/marchlinux.local.yml
deleted file mode 100644
index 229eb112..00000000
--- a/host_vars/marchlinux.local.yml
+++ /dev/null
diff --git a/host_vars/ubuntu.local.yml b/host_vars/ubuntu.local.yml
deleted file mode 100644
index 739425b9..00000000
--- a/host_vars/ubuntu.local.yml
+++ /dev/null
diff --git a/host_vars/ubuntu.local.yml.example b/host_vars/ubuntu.local.yml.example
deleted file mode 100644
index e39c17db..00000000
--- a/host_vars/ubuntu.local.yml.example
+++ /dev/null
@@ -1,41 +0,0 @@
----
-# Not using raspberry pi as gateway or DNS sinkhole
-network_ipv4_address: "10.0.0.203"
-network_ipv4_gateway: "10.0.0.1"
-network_ipv4_dns: "10.0.0.1"
-network_ipv6_address: "fd5c:fd8b:2b8c::203/64"
-network_ipv6_gateway: "fd5c:fd8b:2b8c::1"
-network_ipv6_dns: "fd5c:fd8b:2b8c::1"
-
-python_versions:
-  - "3.13.7"
-  - "3.12.11"
-ansible_core_version: "2.18.7"
-molecule_version: "25.7.0"
-
-wireguard_connections:
-  wg-vpn3: |
-    [Interface]
-    PrivateKey = your_private_key_here
-    Address = 10.2.0.2/32
-    DNS = 10.2.0.1
-
-    [Peer]
-    PublicKey = server_public_key
-    AllowedIPs = 0.0.0.0/0
-    Endpoint = vpn.com:51820
-
-firefox_install_browserpass: false
-firefox_install_passff: true
-firefox_extra_extensions:
-  "[email protected]":
-    installation_mode: "force_installed"
-    install_url: "https://addons.mozilla.org/firefox/downloads/latest/tabby-window-tab-manager/latest.xpi"
-firefox_policies_override:
-  DisableAppUpdate: true
-  DisableFirefoxStudies: false
-  DisableTelemetry: false
-
-fonts_extra:
-  - "fonts-font-awesome"
-  - "fonts-google-fira"
diff --git a/inventory/hosts.yml b/inventory/hosts.yml
index e4c4be15..cb1a89ec 100644
--- a/inventory/hosts.yml
+++ b/inventory/hosts.yml
@@ -3,8 +3,7 @@ homelab:
   vars:
     ansible_connection: ssh
   hosts:
-    marchlinux.local:
-    archlinux.local:
-    mubuntu.local:
-    ubuntu.local:
+    desktop.local:
+    macbook.local:
+    laptop.local:
     rpi5.local: