Cleaned up and refactored

README.md

@@ -92,13 +92,4 @@ Kevin Veen-Birkenbach
 
 ## License
 
-This project is licensed under the GNU Affero General Public License v3.0. The full license text is available in the `LICENSE` file of this repository.
-
-## todo 
-- implement: https://archlinux.org/packages/extra/x86_64/signal-desktop/
-
-## See
-- https://www.middlewareinventory.com/blog/run-ansible-playbook-locally/
-- https://stackoverflow.com/questions/30533372/run-an-ansible-task-only-when-the-hostname-contains-a-string
-- https://archived.forum.manjaro.org/t/running-android-applications-on-arch-using-anbox/53332
-- https://www.reddit.com/r/ManjaroLinux/comments/cbkblb/guide_run_android_apps_on_manjaro_super_simple/ 
+This project is licensed under the GNU Affero General Public License v3.0. The full license text is available in the `LICENSE` file of this repository. 

playbook.yml

@@ -20,19 +20,19 @@
   hosts: wireguard_server
   become: true
   roles:
-    - application-wireguard
+    - wireguard
 
 - name: setup wireguard client behind firewall\nat
   hosts: wireguard_behind_firewall
   become: true
   roles:
-    - client_application-wireguard-behind-firewall
+    - client-wireguard-behind-firewall
 
 - name: setup wireguard client
   hosts: wireguard_client
   become: true
   roles:
-    - client_application-wireguard
+    - client-wireguard
 
 # Native Webserver Roles
 - name: setup homepages
@@ -260,7 +260,7 @@
   hosts: gnome
   become: true
   roles:
-    - system-gnome
+    - desktop-gnome
 
 - name: setup msi rgb keyboard
   hosts: msi_perkeyrgb
@@ -272,7 +272,7 @@
   hosts: ssh
   become: false
   roles:
-    - application-ssh
+    - client-ssh
 
 - name: setup swapfile hosts
   hosts: swapfile
@@ -302,13 +302,13 @@
   hosts: torbrowser
   become: true
   roles:
-    - application-torbrowser
+    - desktop-torbrowser
 
 - name: setup nextcloud
   hosts: nextcloud_client
   become: true
   roles:
-    - application-nextcloud
+    - client-nextcloud
 
 - name: setup docker
   hosts: docker

roles/client-ssh/Readme.md

@@ -0,0 +1,2 @@
+# Client SSH
+Setups SSH on the client side

roles/client-ssh/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- git-client
+- client-git

roles/client-wireguard-behind-firewall/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+- client-wireguard

roles/client-wireguard/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+- wireguard

roles/client_application-wireguard-behind-firewall/meta/main.yml

@@ -1,2 +0,0 @@
-dependencies:
-- client_application-wireguard

roles/client_application-wireguard/meta/main.yml

@@ -1,2 +0,0 @@
-dependencies:
-- application-wireguard

roles/collection-administrator-base/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- git-client
+- client-git

roles/collection-office/meta/main.yml

@@ -1,3 +1,3 @@
 dependencies:
-- application-libreoffice
+- desktop-libreoffice
 - collection-video-conference

roles/desktop-gnome/Readme.md

@@ -1,3 +1,3 @@
-# system-gnome
+# desktop-gnome
 ## further information
 - https://askubuntu.com/questions/1029376/how-do-i-enable-and-disable-gnome-extensions-from-the-command-line

roles/desktop-gnome/meta/main.yml

@@ -0,0 +1,3 @@
+dependencies:
+- client-git
+- desktop-caffeine

roles/desktop-virtual-box/Readme.md

@@ -1,4 +1,4 @@
-# application-virtual-box
+# desktop-virtual-box
 
 ```bash
 	sudo pacman -S virtualbox "$(pacman -Qsq "^linux" | grep "^linux[0-9]*[-rt]*$" | awk '{print $1"-virtualbox-host-modules"}' ORS=' ')" &&

roles/system-gnome/meta/main.yml

@@ -1,3 +0,0 @@
-dependencies:
-- git-client
-- application-caffeine

roles/system-swapfile/meta/main.yml

@@ -1,2 +1,2 @@
 dependencies:
-- git-client
+- client-git

roles/wireguard/files/wireguard-ip.conf

@@ -1,5 +1,5 @@
 # This file is created by 
-# https://github.com/kevinveenbirkenbach/computer-playbook/tree/main/roles/application-wireguard
+# https://github.com/kevinveenbirkenbach/computer-playbook/tree/main/roles/wireguard
 
 net.ipv6.conf.all.disable_ipv6      = 0
 net.ipv6.conf.default.disable_ipv6  = 0