From eec9015acc48df70b31052e2f2e1cc761ffc047b Mon Sep 17 00:00:00 2001 From: Ahmed Abdelhalim Date: Thu, 23 Apr 2026 14:38:51 +0200 Subject: Change the host_var mappings and inventory names --- README.md | 2 +- host_vars/archlinux.local.yml | Bin 964 -> 0 bytes host_vars/archlinux.local.yml.example | 52 ------------------------------- host_vars/desktop.local.yml | Bin 0 -> 964 bytes host_vars/desktop.local.yml.example | 52 +++++++++++++++++++++++++++++++ host_vars/laptop.local.yml | Bin 0 -> 587 bytes host_vars/laptop.local.yml.example | 41 ++++++++++++++++++++++++ host_vars/macbook.local.yml | Bin 0 -> 792 bytes host_vars/macbook.local.yml.example | 55 +++++++++++++++++++++++++++++++++ host_vars/marchlinux.local.yml | Bin 792 -> 0 bytes host_vars/marchlinux.local.yml.example | 55 --------------------------------- host_vars/mubuntu.local.yml | Bin 587 -> 0 bytes host_vars/mubuntu.local.yml.example | 41 ------------------------ host_vars/ubuntu.local.yml | Bin 587 -> 0 bytes host_vars/ubuntu.local.yml.example | 41 ------------------------ inventory/hosts.yml | 7 ++--- 16 files changed, 152 insertions(+), 194 deletions(-) delete mode 100644 host_vars/archlinux.local.yml delete mode 100644 host_vars/archlinux.local.yml.example create mode 100644 host_vars/desktop.local.yml create mode 100644 host_vars/desktop.local.yml.example create mode 100644 host_vars/laptop.local.yml create mode 100644 host_vars/laptop.local.yml.example create mode 100644 host_vars/macbook.local.yml create mode 100644 host_vars/macbook.local.yml.example delete mode 100644 host_vars/marchlinux.local.yml delete mode 100644 host_vars/marchlinux.local.yml.example delete mode 100644 host_vars/mubuntu.local.yml delete mode 100644 host_vars/mubuntu.local.yml.example delete mode 100644 host_vars/ubuntu.local.yml delete mode 100644 host_vars/ubuntu.local.yml.example 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.
-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/archlinux.local.yml deleted file mode 100644 index 4ba6bcf4..00000000 Binary files a/host_vars/archlinux.local.yml and /dev/null differ diff --git a/host_vars/archlinux.local.yml.example b/host_vars/archlinux.local.yml.example deleted file mode 100644 index ba2122ab..00000000 --- a/host_vars/archlinux.local.yml.example +++ /dev/null @@ -1,52 +0,0 @@ ---- -# Using raspberry pi as gateway (VPN) and DNS sinkhole (pihole) -network_ipv4_address: "10.0.0.201" -network_ipv4_gateway: "10.0.0.254" -network_ipv4_dns: "10.0.0.254" -network_ipv6_address: "fd5c:fd8b:2b8c::201/64" -network_ipv6_gateway: "fd5c:fd8b:2b8c::254" -network_ipv6_dns: "fd5c:fd8b:2b8c::254" - -go_versions: - - "latest" - - "1.25.3" -rust_versions: - - "latest" - - "1.83.0" -nodejs_versions: - - "lts" - - "22.22.0" -python_versions: - - "3.13.7" - - "3.12.11" -ansible_core_version: "2.20.1" -molecule_version: "25.9.0" -ansible_lint_version: "25.9.2" -yamllint_version: "1.37.1" - -wireguard_connections: - wg-vpn1: | - [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 - -fonts_extra: - - "ttf-dejavu" - - "noto-fonts" - -hyprland_nvidia: true -hyprland_monitors: | - env = GDK_SCALE,2 - monitor=HDMI-A-1,3840x2160@60,auto-left,1.6 - monitor=DP-1,3840x2160@60,auto-right,1.6 - -zen_browser_install_browserpass: true -zen_browser_install_passff: false -firefox_install_browserpass: false -firefox_install_passff: true diff --git a/host_vars/desktop.local.yml b/host_vars/desktop.local.yml new file mode 100644 index 00000000..4ba6bcf4 Binary files /dev/null and b/host_vars/desktop.local.yml differ diff --git a/host_vars/desktop.local.yml.example b/host_vars/desktop.local.yml.example new file mode 100644 index 00000000..ba2122ab --- /dev/null +++ b/host_vars/desktop.local.yml.example @@ -0,0 +1,52 @@ +--- +# Using raspberry pi as gateway (VPN) and DNS sinkhole (pihole) +network_ipv4_address: "10.0.0.201" +network_ipv4_gateway: "10.0.0.254" +network_ipv4_dns: "10.0.0.254" +network_ipv6_address: "fd5c:fd8b:2b8c::201/64" +network_ipv6_gateway: "fd5c:fd8b:2b8c::254" +network_ipv6_dns: "fd5c:fd8b:2b8c::254" + +go_versions: + - "latest" + - "1.25.3" +rust_versions: + - "latest" + - "1.83.0" +nodejs_versions: + - "lts" + - "22.22.0" +python_versions: + - "3.13.7" + - "3.12.11" +ansible_core_version: "2.20.1" +molecule_version: "25.9.0" +ansible_lint_version: "25.9.2" +yamllint_version: "1.37.1" + +wireguard_connections: + wg-vpn1: | + [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 + +fonts_extra: + - "ttf-dejavu" + - "noto-fonts" + +hyprland_nvidia: true +hyprland_monitors: | + env = GDK_SCALE,2 + monitor=HDMI-A-1,3840x2160@60,auto-left,1.6 + monitor=DP-1,3840x2160@60,auto-right,1.6 + +zen_browser_install_browserpass: true +zen_browser_install_passff: false +firefox_install_browserpass: false +firefox_install_passff: true diff --git a/host_vars/laptop.local.yml b/host_vars/laptop.local.yml new file mode 100644 index 00000000..c06c5d97 Binary files /dev/null and b/host_vars/laptop.local.yml differ diff --git a/host_vars/laptop.local.yml.example b/host_vars/laptop.local.yml.example new file mode 100644 index 00000000..f93ecd3b --- /dev/null +++ b/host_vars/laptop.local.yml.example @@ -0,0 +1,41 @@ +--- +# Not using raspberry pi as gateway or DNS sinkhole +network_ipv4_address: "10.0.0.202" +network_ipv4_gateway: "10.0.0.1" +network_ipv4_dns: "10.0.0.1" +network_ipv6_address: "fd5c:fd8b:2b8c::202/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: + "tabby@whatsyouridea.com": + 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/host_vars/macbook.local.yml b/host_vars/macbook.local.yml new file mode 100644 index 00000000..e02ab885 Binary files /dev/null and b/host_vars/macbook.local.yml differ diff --git a/host_vars/macbook.local.yml.example b/host_vars/macbook.local.yml.example new file mode 100644 index 00000000..a7fbcad8 --- /dev/null +++ b/host_vars/macbook.local.yml.example @@ -0,0 +1,55 @@ +--- +# Using raspberry pi as gateway (VPN) and DNS sinkhole (pihole) +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" +network_ipv6_gateway: "fd5c:fd8b:2b8c::254" +network_ipv6_dns: "fd5c:fd8b:2b8c::254" + +go_versions: + - "latest" + - "1.25.3" +rust_versions: + - "latest" + - "1.83.0" +nodejs_versions: + - "lts" + - "22.22.0" +python_versions: + - "3.13.7" + - "3.12.11" +ansible_core_version: "2.20.1" +molecule_version: "25.9.0" +ansible_lint_version: "25.9.2" +yamllint_version: "1.37.1" + +wireguard_connections: + wg-vpn1: | + [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 + +fonts_extra: + - "ttf-dejavu" + - "noto-fonts" + +zen_browser_install_browserpass: false +zen_browser_install_passff: false +zen_browser_extra_extensions: + "tabby@whatsyouridea.com": + installation_mode: "force_installed" + install_url: "https://addons.mozilla.org/firefox/downloads/latest/tabby-window-tab-manager/latest.xpi" + +firefox_install_browserpass: false +firefox_install_passff: false +firefox_extra_extensions: + "tabby@whatsyouridea.com": + installation_mode: "force_installed" + install_url: "https://addons.mozilla.org/firefox/downloads/latest/tabby-window-tab-manager/latest.xpi" diff --git a/host_vars/marchlinux.local.yml b/host_vars/marchlinux.local.yml deleted file mode 100644 index 229eb112..00000000 Binary files a/host_vars/marchlinux.local.yml and /dev/null differ diff --git a/host_vars/marchlinux.local.yml.example b/host_vars/marchlinux.local.yml.example deleted file mode 100644 index 1b876c9c..00000000 --- a/host_vars/marchlinux.local.yml.example +++ /dev/null @@ -1,55 +0,0 @@ ---- -# Using raspberry pi as gateway (VPN) and DNS sinkhole (pihole) -network_ipv4_address: "10.0.0.200" -network_ipv4_gateway: "10.0.0.254" -network_ipv4_dns: "10.0.0.254" -network_ipv6_address: "fd5c:fd8b:2b8c::200/64" -network_ipv6_gateway: "fd5c:fd8b:2b8c::254" -network_ipv6_dns: "fd5c:fd8b:2b8c::254" - -go_versions: - - "latest" - - "1.25.3" -rust_versions: - - "latest" - - "1.83.0" -nodejs_versions: - - "lts" - - "22.22.0" -python_versions: - - "3.13.7" - - "3.12.11" -ansible_core_version: "2.20.1" -molecule_version: "25.9.0" -ansible_lint_version: "25.9.2" -yamllint_version: "1.37.1" - -wireguard_connections: - wg-vpn1: | - [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 - -fonts_extra: - - "ttf-dejavu" - - "noto-fonts" - -zen_browser_install_browserpass: false -zen_browser_install_passff: false -zen_browser_extra_extensions: - "tabby@whatsyouridea.com": - installation_mode: "force_installed" - install_url: "https://addons.mozilla.org/firefox/downloads/latest/tabby-window-tab-manager/latest.xpi" - -firefox_install_browserpass: false -firefox_install_passff: false -firefox_extra_extensions: - "tabby@whatsyouridea.com": - installation_mode: "force_installed" - install_url: "https://addons.mozilla.org/firefox/downloads/latest/tabby-window-tab-manager/latest.xpi" diff --git a/host_vars/mubuntu.local.yml b/host_vars/mubuntu.local.yml deleted file mode 100644 index c06c5d97..00000000 Binary files a/host_vars/mubuntu.local.yml and /dev/null differ diff --git a/host_vars/mubuntu.local.yml.example b/host_vars/mubuntu.local.yml.example deleted file mode 100644 index f93ecd3b..00000000 --- a/host_vars/mubuntu.local.yml.example +++ /dev/null @@ -1,41 +0,0 @@ ---- -# Not using raspberry pi as gateway or DNS sinkhole -network_ipv4_address: "10.0.0.202" -network_ipv4_gateway: "10.0.0.1" -network_ipv4_dns: "10.0.0.1" -network_ipv6_address: "fd5c:fd8b:2b8c::202/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: - "tabby@whatsyouridea.com": - 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/host_vars/ubuntu.local.yml b/host_vars/ubuntu.local.yml deleted file mode 100644 index 739425b9..00000000 Binary files a/host_vars/ubuntu.local.yml and /dev/null differ 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: - "tabby@whatsyouridea.com": - 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: -- cgit v1.2.3