.gitignore

@@ -1,5 +1,3 @@
-environments
-inventories
 .vagrant
 .vagrant_settings
 .vscode

Vagrantfile

@@ -45,7 +45,6 @@ Vagrant.configure("2") do |config|
   config.vm.provision "ansible" do |ansible|
     ENV['ANSIBLE_ROLES_PATH'] = File.dirname(__FILE__) + "/roles"
     ansible.compatibility_mode = "2.0"
-    ansible.playbook = "dev/workstation.yml"
+    ansible.playbook = "site-vagrant.yml"
-    ansible.raw_arguments = ["--diff"]
   end
 end

inventory.yml

@@ -9,27 +9,20 @@ packages:
 
   # Virtualization
   - qemu-system
-  - libvirt-daemon-system
   - vagrant-libvirt
-  - virt-manager
+  - libvirt-daemon-system
-
-  # Configuration management
-  - ansible
 
 users:
   - name: vagrant
     groups:
       - libvirt
 
-#manage_gui: true
+favorites:
+  - firefox-esr.desktop
+  - terminator.desktop
+  - org.kde.dolphin.desktop
+  - org.remmina.Remmina.desktop
 
-#darkmode: true
+pinned:
-#favorites:
+  - firefox-esr.desktop
-#  - firefox-esr.desktop
+  - terminator.desktop
-#  - terminator.desktop
-#  - org.kde.dolphin.desktop
-#  - org.remmina.Remmina.desktop
-
-#pinned:
-#  - firefox-esr.desktop
-#  - terminator.desktop

roles/common/defaults/main.yml

@@ -1,9 +1,7 @@
-darkmode: false
-development: false
 homedir: "/home/{{ item.name }}"
 
 # Follows homelab package list:
-# https://git.krislamo.org/kris/homelab/src/branch/main/roles/base/defaults/main.yml#L6
+# https://github.com/krislamo/homelab/blob/main/roles/base/defaults/main.yml#L5
 homelab_packages:
   - apache2-utils
   - cryptsetup
@@ -21,6 +19,5 @@ homelab_packages:
   - vim
   - wget
 
-manage_gui: false
 packages:
   - "{{ homelab_packages }}"

roles/common/tasks/development.yml

@@ -3,3 +3,4 @@
     name: vagrant
     password: "$6$xu0I8bbf.Nva7uCo$OHz5/64u0SjHa1jn0EwCLSNw7Zoj5ejhL\
                6NtaXYY6zlC0CQa0J4kZIxAp2Ls4lMdLmuo7oMQX/vlDucR9BbcA."
+

roles/common/tasks/gui.yml

@@ -5,17 +5,15 @@
     update_cache: true
 
 - name: Create autostart-scripts directory
-  ansible.builtin.file:
+  file:
     path: "{{ homedir }}/.config/autostart-scripts/"
     state: directory
     owner: "{{ item.name }}"
     group: "{{ item.name }}"
-    mode: 0700
   loop: "{{ users }}"
-  when: manage_gui
 
 - name: Enable KDE dark theme
-  ansible.builtin.copy:
+  copy:
     dest: "{{ homedir }}/.config/autostart-scripts/darkmode.sh"
     mode: a+x
     content: |
@@ -24,13 +22,16 @@
         lookandfeeltool -a $(lookandfeeltool --list | grep dark)
       fi
   loop: "{{ users }}"
-  when: manage_gui and darkmode
+
+- name: Install packages
+  ansible.builtin.apt:
+    name: "{{ item }}"
+  loop: "{{ packages }}"
 
 - name: Install sqlite3
   ansible.builtin.apt:
     name: sqlite3
     state: present
-  when: manage_gui and favorites is defined or pinned is defined
 
 - name: Change favorites menu
   ansible.builtin.template:
@@ -38,7 +39,6 @@
     dest: "{{ homedir }}/.config/autostart-scripts/favorites.sh"
     mode: a+x
   loop: "{{ users }}"
-  when: manage_gui and favorites is defined
 
 - name: Change task manager pinned apps
   ansible.builtin.template:
@@ -46,4 +46,11 @@
     dest: "{{ homedir }}/.config/autostart-scripts/pinnedapps.sh"
     mode: a+x
   loop: "{{ users }}"
-  when: manage_gui and pinned is defined
+
+- name: Ensure we have our own comment added to /etc/services
+  ansible.builtin.lineinfile:
+    path: "{{ homedir }}/.config/autostart-scripts/pinnedapps.sh"
+    regexp: '^# port for http'
+    insertbefore: '^www.*80/tcp'
+    line: '# port for http by default'
+  loop: "{{ users }}"

roles/common/tasks/system.yml

@@ -9,8 +9,15 @@
     name: "{{ item.name }}"
     state: present
     groups: "{{ item.groups }}"
-    append: true
+    append: yes
     shell: "{{ item.shell | default('/bin/bash') }}"
     create_home: "{{ item.home | default(false) }}"
   loop: "{{ users }}"
   when: users is defined
+
+- name: Change favorites menu
+  ansible.builtin.template:
+    src: favorites.sh.j2
+    dest: "{{ homedir }}/.config/autostart-scripts/favorites.sh"
+    mode: a+x
+  loop: "{{ users }}"

workstation.yml

@@ -1,5 +0,0 @@
-- name: Install Workstation
-  hosts: localhost
-  become: true
-  roles:
-    - common