stuff

roles/base/handlers/main.yml

@@ -1,5 +1,5 @@
 ---
-- name: Restart NetworkManager
+- name: Restart resolvconf
   service:
-    name: NetworkManager
+    name: resolvconf
     state: restarted

roles/base/tasks/main.yml

@@ -8,7 +8,6 @@
 - name: Ensure Users are Configured Correctly
   user:
     name: "{{ item.value.name }}"
-    uid: "{{ item.value.uid }}"
     group: "{{ item.value.group }}"
     groups: "{{ item.value.groups }}"
     state: "{{ item.value.state }}"
@@ -47,40 +46,21 @@
     name: "{{ item }}"
   loop: "{{ ansible_galaxy_collections }}"
 
-- name: Add DNF configuration
-  template:
-    src: dnf.conf.j2
-    dest: /etc/dnf/dnf.conf
-    owner: root
-    group: root
-
 - name: Add NFS share mountpoint to fstab
   lineinfile:
     dest: /etc/fstab
     line: "cleric.opal.sh:/data/media      /home/opal/share      nfs   sec=sys 0 0"
 
-- name: Disable systemd-resolved systemd service
+- name: Ensure resolvconf is started
-  service:
+  systemd:
-    enabled: no
+    name: resolvconf
-    name: systemd-resolved
+    state: started
+    enabled: yes
 
-- name: Stop systemd-resolved systemd service
+- name: Add /etc/resolvconf template
-  service:
-    state: stopped
-    name: systemd-resolved
-
-- name: Add /etc/resolv.conf template
   template:
     src: resolv.conf.j2
-    dest: /etc/resolv.conf
+    dest: /etc/resolvconf/resolv.conf.d/base
     owner: root
     group: root
-
+  notify: 'Restart resolvconf'
-- name: Add /etc/NetworkManager/NetworkManager.conf template
-  template:
-    src: NetworkManager.conf.j2
-    dest: /etc/NetworkManager/NetworkManager.conf
-    owner: root
-    group: root
-  notify:
-    - Restart NetworkManager

roles/base/templates/dnf.conf.j2

@@ -1,8 +0,0 @@
-[main]
-fastestmirror=True
-max_parallel_downloads=10
-gpgcheck=True
-installonly_limit=3
-clean_requirements_on_remove=True
-best=False
-skip_if_unavailable=True

roles/base/templates/motd.j2

@@ -1,6 +0,0 @@
-██╗    ██╗███████╗██╗      ██████╗ ██████╗ ███╗   ███╗███████╗
-██║    ██║██╔════╝██║     ██╔════╝██╔═══██╗████╗ ████║██╔════╝
-██║ █╗ ██║█████╗  ██║     ██║     ██║   ██║██╔████╔██║█████╗
-██║███╗██║██╔══╝  ██║     ██║     ██║   ██║██║╚██╔╝██║██╔══╝
-╚███╔███╔╝███████╗███████╗╚██████╗╚██████╔╝██║ ╚═╝ ██║███████╗
- ╚══╝╚══╝ ╚══════╝╚══════╝ ╚═════╝ ╚═════╝ ╚═╝     ╚═╝╚══════╝

roles/base/templates/resolv.conf.j2

@@ -2,4 +2,3 @@
 nameserver 1.1.1.2
 nameserver 1.0.0.2
 nameserver 2606:4700:4700:0:0:0:0:1112
-nameserver 2606:4700:4700:0:0:0:0:1002

roles/base/vars/main.yml

@@ -1,6 +1,5 @@
 ---
 init_groups:
-  - wheel
   - docker
 
 remove_directories:
@@ -19,19 +18,16 @@ create_directories:
   - downloads
   - pictures
   - share
-  - code
+  - scripts
-  - code/scripts
+  - projects
-  - code/projects
-  - code/ansible
-  - code/repos
 
 init_users:
   opal:
     name: opal
-    uid: 2000
     group: opal
     groups: 
-      - wheel
+      - sudo
+      - docker
     state: present
     shell: /bin/bash
     create_home: true

roles/packages/tasks/main.yml

@@ -1,42 +1,38 @@
 ---
 - name: Upgrade all packages
-  ansible.builtin.dnf:
+  package:
     name: "*"
     state: latest
 
 - name: install window manager packages
-  dnf:
+  package:
     name: "{{ item }}"
     state: present
   loop: "{{ wm_packages }}"
 
 - name: install cli packages
-  dnf:
+  package:
     name: "{{ item }}"
     state: present
   loop: "{{ general_packages }}"
 
 - name: install doom dependencies
-  dnf:
+  package:
     name: "{{ item }}"
     state: present
   loop: "{{ doom_dep_packages }}"
 
 - name: install networking packages
-  dnf:
+  package:
     name: "{{ item }}"
     state: present
   loop: "{{ networking_packages }}"
 
 - name: install font packages
-  dnf:
+  package:
     name: "{{ item }}"
     state: present
   loop: "{{ font_packages }}"
 
-- name: Add the flathub flatpak repository remote
+- name: Add flathub repository
-  community.general.flatpak_remote:
+  command: flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-    name: flathub
-    state: present
-    flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo
-    method: user

roles/packages/vars/main.yml

@@ -5,7 +5,6 @@ wm_packages:
   - swaybg
   - swaylock
   - waybar
-  - wofi
   - dunst
   - grim
   - light
@@ -24,47 +23,37 @@ general_packages:
   - make
   - tldr
   - gnupg2
-  - neovim
   - trash-cli
   - lshw
   - htop
   - rsync
   - p7zip
-  - neovim
   - hugo
-  - firefox
-  - gnome-tweaks
   - gimp
   - emacs
   - mpv
   - alacritty
-  - nfs-utils
+  - nfs-common
+  - rpcbind
+  - nfs-kernel-server
   - strawberry
   - ansible
-  - nicotine+
-  - easyeffects
-  - lsp-plugins
   - newsboat
   - udiskie
   - transmission-qt
   - pavucontrol
-  - pipewire-pulseaudio
-  - remove-retired-packages
-  - newsboat
-  - p7zip
-  - steam
   - thunderbird
-  - grimshot
   - zathura
-  - zathura-pdf-mupdf
+  - flatpak
+  - gnome-software-plugin-flatpak
+  - blueman
+  - resolvconf
 
 networking_packages:
   - nmap
   - whois
-  - network-manager-applet
+  - nm-tray
-  - nm-connection-editor
   - wireguard-tools
-  - bind
   - telnet
 
 doom_dep_packages:
@@ -72,20 +61,23 @@ doom_dep_packages:
   - libtool     # Needed to compile vterm in Doom Emacs
   - cmake       # Needed to compile vterm in Doom Emacs
   - discount    # Markdown Compiler
-  - ShellCheck  # Shell linter for Doom Emacs
+  - shellcheck  # Shell linter for Doom Emacs
   - python3-pyflakes
   - python3-isort
   - pipenv
   - python3-nose2
   - python3-nose
   - python3-pytest
-  - python3-lsp-black
+  - python3-pylsp-black
 
 font_packages:
-  - fontawesome5-fonts
+  - fonts-font-awesome
-  - abattis-cantarell-fonts
+  - fonts-cantarell
-  - google-noto-cjk-fonts
+  - fonts-noto-cjk
-  - google-noto-sans-ugaritic-fonts
+  - fonts-noto-core
+  - fonts-hack
 
 flatpak_packages:
   - org.signal.Signal
+  - org.nicotine_plus.Nicotine
+  - net.ankiweb.Anki

roles/yay/tasks.yml

@@ -1,19 +0,0 @@
----
-- name: Clone yay
-  git:
-    repo: https://aur.archlinux.org/yay-bin.git
-    dest: "{{ srcdir }}/yay"
-    update: true
-
-- name: Build and install yay
-  command:
-    chdir: "{{ srcdir }}/yay"
-    cmd: "makepkg -sfi --noconfirm"
-    creates: /usr/bin/yay
-
-- name: Install yay packages
-  community.general.pacman:
-    name: "{{ item }}"
-    state: present
-    executable: yay
-  loop: "{{ yay_packages }}"

roles/yay/vars.yml

@@ -1,7 +0,0 @@
----
-homedir: "{{ lookup('env','HOME') }}"
-srcdir: "{{ homedir }}/code/repos/yay"
-
-yay_packages:
-  - grimshot
-  - wlsunset

site.yml

@@ -13,6 +13,3 @@
       become: yes
       become_user: opal
       become_method: su
-
-    - role: docker
-      tags: docker_tag