Merge 096439b6bb678a6a65e778684da47c49c246055a into 9a0892c9b40060e94057fc9298c63ab311724ff3

group_vars/all.yaml

@@ -3,6 +3,10 @@ timeout_blank: 1800
 timeout_lock: 30
 grub_timeout: 10
 
+ssh_keys:
+  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEm981GRiUIsp8e4bTDv+d9SyHfQ8P18W5oovgmAfnip em@x210
+  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDqmyaaIqRU9hx8PxRnIqe/pRANIxrEEscuMWrHZF1yh snowflake@flakeX230
+
 xbps_install:
   # General
   - htop

roles/bakalari/defaults/main.yaml

@@ -1,4 +0,0 @@
-bakalari_desktop_src: bakalari.desktop
-bakalari_desktop_dest: /usr/share/applications/bakalari.desktop
-bakalari_icon_src: bakalari.png
-bakalari_icon_dest: /usr/share/icons/bakalari.png

roles/bakalari/tasks/main.yaml

@@ -1,21 +0,0 @@
-- name: Ensure the applications directory exists
-  file:
-    path: /usr/share/applications
-    state: directory
-
-- name: Ensure the icons directory exists
-  file:
-    path: /usr/share/icons
-    state: directory
-
-- name: Copy Bakaláři desktop shortcut
-  copy:
-    src: bakalari.desktop
-    dest: /usr/share/applications/bakalari.desktop
-    mode: 0644
-
-- name: Copy Bakaláři icon
-  copy:
-    src: bakalari.png
-    dest: /usr/share/icons/bakalari.png
-    mode: 0644

roles/ssh/defaults/main.yaml

@@ -1,3 +0,0 @@
-ssh_user: root
-ssh_dir: /root/.ssh
-ssh_keys: []

roles/ssh/tasks/main.yaml

@@ -1,14 +0,0 @@
-- name: Ensure SSH directory exists
-  file:
-    path: "{{ ssh_dir }}"
-    state: directory
-    owner: "{{ ssh_user }}"
-    group: "{{ ssh_user }}"
-    mode: 0700
-
-- name: Import SSH keys
-  authorized_key:
-    user: "{{ ssh_user }}"
-    key: "{{ item }}"
-    state: present
-  loop: "{{ ssh_keys }}"

setup.yaml

@@ -2,12 +2,19 @@
 - name: SSH
   hosts: all
   tags: ssh
-  roles:
-    - role: ssh
-      vars:
-        ssh_keys:
-          - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEm981GRiUIsp8e4bTDv+d9SyHfQ8P18W5oovgmAfnip em@x210
-          - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDqmyaaIqRU9hx8PxRnIqe/pRANIxrEEscuMWrHZF1yh snowflake@flakeX230
+
+  tasks:
+    - name: Ensure root ssh directory exists
+      file:
+        path: /root/.ssh
+        state: directory
+
+    - name: Import SSH keys
+      authorized_key:
+        user: root
+        key: '{{ item }}'
+        state: present
+      loop: '{{ ssh_keys }}'
 
 
 - name: General
@@ -269,5 +276,15 @@
 
 - name: Bakaláři
   hosts: teachers
-  roles:
-    - bakalari
+  tags: bakalari
+
+  tasks:
+    - name: Create a desktop shortcut for Bakaláři
+      copy:
+        src: "{{ item.src }}"
+        dest: "{{ item.dest }}"
+      loop:
+        - src: "files/bakalari/bakalari.desktop"
+          dest: "/usr/share/applications/bakalari.desktop"
+        - src: "files/bakalari/bakalari.png"
+          dest: "/usr/share/icons/bakalari.png"