Layout refactor

Also included provisioning for htpc host

host_vars/desktop/network.yml

@@ -6,3 +6,8 @@ local_network_dns: 9.9.9.9 149.112.112.112
 local_network_gateway: 192.168.2.254
 
 hostname: desktop
+
+wireguard:
+  ip: 10.0.0.3
+wireguard_media:
+  ip: 10.0.1.3

host_vars/desktop/system.yml

@@ -1,15 +1,53 @@
+packages:
+  - nftables
+  - tmux
+  - unrar
+  - vim
+  - git
+  - openssl
+  - iproute2
+  - curl
+  - reflector
+  - otf-monaspace-nerd
+  - systemd-ukify
+  - efibootmgr
+  - git-delta
+
+  # custom packages
+  - keepassxc
+  - gimp
+  - firefox
+  - mpv
+  - yt-dlp
+  - nfs-utils
+  - syncthing
+  - mpd
+  - wireguard-tools
+  - okular
+  - postgresql
+  - plasma-meta
+  - wezterm
+  - kmail
+  - pipewire
+  - pipewire-pulse
+  - pipewire-alsa
+  - merkuro
+  - kmail
+  - aspell-nl
+  - aspell-en
+
 modprobe_templates:
-  - src: 'templates/personal/desktop/modprobe/99-amdgpu.conf.j2'
+  - src: 'templates/desktop/modprobe/99-amdgpu.conf.j2'
     dest: '/etc/modprobe.d/99-amdgpu.conf'
 
 mkinitcpio_templates:
-  - src: 'templates/personal/desktop/mkinitcpio/1-modules.conf.j2'
+  - src: 'templates/desktop/mkinitcpio/1-modules.conf.j2'
     dest: '/etc/mkinitcpio.conf.d/1-amdgpu.conf'
 
-  - src: 'templates/personal/desktop/mkinitcpio/linux.preset.j2'
+  - src: 'templates/desktop/mkinitcpio/linux.preset.j2'
     dest: '/etc/mkinitcpio.d/linux.preset'
 
-  - src: 'templates/personal/desktop/mkinitcpio/linux-lts.preset.j2'
+  - src: 'templates/desktop/mkinitcpio/linux-lts.preset.j2'
     dest: '/etc/mkinitcpio.d/linux-lts.preset'
 
 boot_configuration:

host_vars/desktop/vpn.yml

@@ -1,51 +0,0 @@
-# TODO: scope variables to their destination file
-vpn_default:
-  ip: 10.0.0.3
-  prefix: 24
-  interface: wg0
-  dns: 10.0.0.1
-  domains:
-    - '~vpn.{{ server_domain }}'
-    - '~transmission.{{ server_domain }}'
-    - '~syncthing.{{ server_domain }}'
-    - '~radicale.{{ server_domain }}'
-    - '~mpd.{{ server_domain }}'
-
-  public_key_path: '{{ vpn_config_dir }}/keys/public/default/desktop.pub'
-  private_key_path: '{{ vpn_config_dir }}/keys/private/default/desktop.key'
-
-  peers:
-    - name: fudiggity
-      allowed_ips:
-        - 10.0.0.0/24
-        - 172.16.238.0/24
-        - 172.32.238.0/24
-        - 172.64.238.0/24
-        - 172.128.238.0/24
-      endpoint: '{{ server_domain }}:51902'
-      public_key: CeybSMpJiicXmndIuhe89Bay3z3PEdYNyAwIFsacBEo=
-      preshared_key_path: '{{ vpn_config_dir }}/keys/private/default/preshared-zeus.psk'
-      preshared_key_source_path: files/personal/desktop/wireguard/default/preshared.psk
-
-vpn_media:
-  ip: 10.0.1.3
-  prefix: 24
-  interface: wg1
-  dns: 10.0.1.1
-  domains:
-    - '~media-vpn.{{ server_domain }}'
-    - '~jellyfin.{{ server_domain }}'
-
-  public_key_path: '{{ vpn_config_dir }}/keys/public/media/desktop.pub'
-  private_key_path: '{{ vpn_config_dir }}/keys/private/media/desktop.key'
-  private_key_source_path: files/personal/desktop/wireguard/media/desktop.key
-
-  peers:
-    - name: zeus-media
-      allowed_ips:
-        - 10.0.1.0/24
-        - 172.8.238.0/24
-      endpoint: '{{ server_domain }}:51903'
-      public_key: EugKeo63C5N5kz9ShMHtYswO9Qh6mE00MtfLSFmqqjg=
-      preshared_key_path: '{{ vpn_config_dir }}/keys/private/media/preshared-zeus.psk'
-      preshared_key_source_path: files/personal/desktop/wireguard/media/preshared.psk