Layout refactor

Also included provisioning for htpc host

host_vars/xps/main.yml

@@ -1 +0,0 @@
-wezterm_font_size: 10

host_vars/xps/network.yml

@@ -13,3 +13,8 @@ frans_network_gateway: 192.168.2.254
 default_network_dns: 9.9.9.9 149.112.112.112
 
 hostname: xps
+
+wireguard:
+  ip: 10.0.0.2
+wireguard_media: # TODO: add missing credentials
+  ip: 10.0.1.2

host_vars/xps/pa-dlna.yml

@@ -0,0 +1,2 @@
+pa_dlna_version: 0.16
+pa_dlna_systemd_version: 0.0.9

host_vars/xps/system.yml

@@ -1,41 +1,40 @@
 packages:
-  - keepassxc
-  - gimp
   - nftables
-  - okular
-  - postgresql
-  - plasma-meta
-  - wezterm
   - tmux
   - unrar
   - vim
   - git
   - openssl
-  - kmail
   - iproute2
   - curl
   - reflector
+  - otf-monaspace-nerd
+  - systemd-ukify
+  - efibootmgr
+  - git-delta
+
+  - 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
-  - otf-monaspace-nerd
-  - systemd-ukify
-  - efibootmgr
-  - git-delta
   - aspell-nl
   - aspell-en
 
-  # custom packages
-  - firefox
-  - mpv
-  - youtube-dl
-  - nfs-utils
-  - syncthing
-  - mpd
-  - wireguard-tools
-
   # custom host packages
   - iwd
   - nvidia
@@ -48,14 +47,16 @@ boot_configuration:
   partition: 1
 
 mkinitcpio_templates:
-  - src: 'templates/personal/xps/mkinitcpio/1-modules.conf.j2'
+  - src: 'templates/xps/mkinitcpio/1-modules.conf.j2'
     dest: '/etc/mkinitcpio.conf.d/1-modules.conf'
 
-  - src: 'templates/personal/xps/mkinitcpio/2-hooks.conf.j2'
+  - src: 'templates/xps/mkinitcpio/2-hooks.conf.j2'
     dest: '/etc/mkinitcpio.conf.d/2-hooks.conf'
 
-  - src: 'templates/personal/xps/mkinitcpio/linux.preset.j2'
+  - src: 'templates/xps/mkinitcpio/linux.preset.j2'
     dest: '/etc/mkinitcpio.d/linux.preset'
 
-  - src: 'templates/personal/xps/mkinitcpio/linux-lts.preset.j2'
+  - src: 'templates/xps/mkinitcpio/linux-lts.preset.j2'
     dest: '/etc/mkinitcpio.d/linux-lts.preset'
+
+wezterm_font_size: 10

host_vars/xps/vpn.yml

@@ -1,52 +0,0 @@
-pa_dlna_version: 0.16
-pa_dlna_systemd_version: 0.0.9
-
-vpn_default:
-  ip: 10.0.0.2
-  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/laptop.pub'
-  private_key_path: '{{ vpn_config_dir }}/keys/private/default/laptop.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/xps/wireguard/default/preshared.psk
-
-vpn_media:
-  ip: 10.0.1.2
-  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/laptop.pub'
-  private_key_path: '{{ vpn_config_dir }}/keys/private/media/laptop.key'
-
-  peers:
-    - name: fudiggity-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/xps/wireguard/media/preshared.psk