Refactor to reduce config in group_vars

group_vars/all/apps.yml

@@ -1,22 +1,4 @@
 ---
-dnf_add_repos:
-  - name: zsh-completions
-    description: zsh-completions from openSUSE
-    baseurl: https://download.opensuse.org/repositories/shells:zsh-users:zsh-completions/Fedora_Rawhide/
-    gpgkey: https://download.opensuse.org/repositories/shells:zsh-users:zsh-completions/Fedora_Rawhide/repodata/repomd.xml.key
-  - name: code
-    description: Visual Studio Code
-    baseurl: https://packages.microsoft.com/yumrepos/vscode
-    gpgkey: https://packages.microsoft.com/keys/microsoft.asc
-  - name: jriver
-    description: JRiver Media Center by BryanC
-    baseurl: https://repos.bryanroessler.com/jriver
-    gpgcheck: false
-
-dnf_add_repofiles:
-  - name: Mullvad VPN
-    url: https://repository.mullvad.net/rpm/stable/mullvad.repo
-
 dnf_remove_repos:
   - google-chrome
 
@@ -29,7 +11,12 @@ dnf_remove:
   - orca
   - rhythmbox
 
-dnf_install:
+services_system_disabled:
+  - qemu-guest-agent
+  - raid-check.timer
+  - fstrim.timer
+
+apps:
   - btrbk
   - btrfs-assistant
   - btrfsmaintenance
@@ -37,6 +24,7 @@ dnf_install:
   - cargo
   - code
   - dnf-automatic
+  - firefox
   - flatpak
   - gettext
   - gnome-tweaks
@@ -61,11 +49,6 @@ dnf_install:
   - zsh
   - zsh-completions
 
-# Cargo packages to install
-cargo_packages:
-  - aichat
-
-# Git repositories to clone
 git_add_repos:
   - repo: https://git.bryanroessler.com/bryan/installJRMC.git
     dest: "{{ ansible_facts['env']['HOME'] }}/.local/bin/installJRMC"
@@ -79,3 +62,5 @@ git_add_repos:
   # - repo: https://git.bryanroessler.com/bryan/deploy.git
   #   dest: "{{ ansible_facts['env']['HOME'] }}/.local/bin/deploy"
   #   version: dev
+
+

group_vars/all/dotfiles.yml

@@ -1,20 +0,0 @@
----
-symlinks:
-  - name: develop
-    src: "{{ lookup('env', 'HOME') }}/documents/develop"
-    dest: "{{ lookup('env', 'HOME') }}/develop"
-  - name: music
-    src: "{{ lookup('env', 'HOME') }}/media/music"
-    dest: "{{ lookup('env', 'HOME') }}/music"
-  - name: pictures
-    src: "{{ lookup('env', 'HOME') }}/media/pictures"
-    dest: "{{ lookup('env', 'HOME') }}/pictures"
-  - name: videos
-    src: "{{ lookup('env', 'HOME') }}/media/videos"
-    dest: "{{ lookup('env', 'HOME') }}/videos"
-  - name: ebooks
-    src: "{{ lookup('env', 'HOME') }}/media/ebooks"
-    dest: "{{ lookup('env', 'HOME') }}/ebooks"
-  - name: bin
-    src: "{{ lookup('env', 'HOME') }}/.local/bin"
-    dest: "{{ lookup('env', 'HOME') }}/bin"

group_vars/all/filesystems.yml

@@ -2,3 +2,23 @@
 directories:
   - path: "{{ ansible_facts['env']['HOME'] }}/.local/bin"
     mode: '0755'
+
+symlinks:
+  - name: develop
+    src: "{{ lookup('env', 'HOME') }}/documents/develop"
+    dest: "{{ lookup('env', 'HOME') }}/develop"
+  - name: music
+    src: "{{ lookup('env', 'HOME') }}/media/music"
+    dest: "{{ lookup('env', 'HOME') }}/music"
+  - name: pictures
+    src: "{{ lookup('env', 'HOME') }}/media/pictures"
+    dest: "{{ lookup('env', 'HOME') }}/pictures"
+  - name: videos
+    src: "{{ lookup('env', 'HOME') }}/media/videos"
+    dest: "{{ lookup('env', 'HOME') }}/videos"
+  - name: ebooks
+    src: "{{ lookup('env', 'HOME') }}/media/ebooks"
+    dest: "{{ lookup('env', 'HOME') }}/ebooks"
+  - name: bin
+    src: "{{ lookup('env', 'HOME') }}/.local/bin"
+    dest: "{{ lookup('env', 'HOME') }}/bin"

group_vars/all/services.yml

@@ -1,16 +0,0 @@
----
-services_system_enabled:
-  - dnf-automatic.timer
-  - btrfs-balance.timer
-  - btrfs-scrub.timer
-  - btrfs-trim.timer
-  - btrbk.timer
-  - tailscaled
-
-services_user_enabled:
-  - psd
-
-services_system_disabled:
-  - qemu-guest-agent
-  - raid-check.timer
-  - fstrim.timer