From 792212580481926eecf7491924f8e2f10fffb663 Mon Sep 17 00:00:00 2001 From: L3D Date: Sun, 29 Oct 2023 01:42:57 +0200 Subject: [PATCH] cleanup more modules --- .gitmodules | 12 +----- group_vars/all.yml | 5 ++- roles/akku-warning | 2 +- roles/amdgpu_firmware | 2 +- roles/do1jlr.htop | 2 +- roles/networkmanager/defaults/main.yml | 3 -- roles/networkmanager/tasks/main.yml | 46 --------------------- roles/networkmanager/tasks/versioncheck.yml | 46 --------------------- roles/networkmanager/vars/main.yml | 3 -- roles/no-sleep | 2 +- roles/polybar | 1 - roles/pulseaudio | 1 - roles/steam/defaults/main.yml | 20 --------- roles/steam/tasks/main.yml | 9 ---- roles/winehq | 1 - site.yml | 11 +++-- 16 files changed, 16 insertions(+), 150 deletions(-) delete mode 100644 roles/networkmanager/defaults/main.yml delete mode 100644 roles/networkmanager/tasks/main.yml delete mode 100644 roles/networkmanager/tasks/versioncheck.yml delete mode 100644 roles/networkmanager/vars/main.yml delete mode 160000 roles/polybar delete mode 160000 roles/pulseaudio delete mode 100644 roles/steam/defaults/main.yml delete mode 100644 roles/steam/tasks/main.yml delete mode 160000 roles/winehq diff --git a/.gitmodules b/.gitmodules index f97b0c0..7319ab7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,10 +2,6 @@ path = roles/dotfiles url = https://github.com/roles-ansible/ansible_role_dotfiles.git branch = main -[submodule "roles/pulseaudio"] - path = roles/pulseaudio - url = https://github.com/chaos-bodensee/role_pulseaudio_archlinux.git - branch = master [submodule "roles/authorized_keys"] path = roles/do1jlr.auth url = https://github.com/roles-ansible/ansible_role_auth.git @@ -22,14 +18,10 @@ path = roles/akku-warning url = https://github.com/roles-ansible/role_akku_warning.git branch = main -[submodule "roles/winehq"] - path = roles/winehq - url = https://github.com/ekultails/ansible_role_wine.git - branch = master [submodule "roles/no-sleep"] path = roles/no-sleep - url = https://github.com/chaos-bodensee/role_disable_sleep.git - branch = master + url = https://github.com/roles-ansible/ansible_role_disable_sleep.git + branch = main [submodule "roles/manage_users"] path = roles/do1jlr.users url = https://github.com/roles-ansible/ansible_role_users.git diff --git a/group_vars/all.yml b/group_vars/all.yml index 87c4fc0..dce855e 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -68,8 +68,6 @@ i3_run_on_startup: # - nextcloud - sudo nm-applet -htop__compile: true - # roles/do1jlr.base l3d_pkgs__install_advanced: true l3d_pkgs__install_python: true @@ -77,5 +75,8 @@ l3d_pkgs__install_cli: true l3d_pkgs__install_extra_packages: - keychain +# roles/do1jlr.htop +htop__compile: true + # globaly enably simple versionscheck - if available submodules_versioncheck: true diff --git a/roles/akku-warning b/roles/akku-warning index 1c12737..a8b5881 160000 --- a/roles/akku-warning +++ b/roles/akku-warning @@ -1 +1 @@ -Subproject commit 1c127375958550a7eefe1056aa466bf5f6b61d88 +Subproject commit a8b5881aa7939e18eadb9c324a6653f22c2e9064 diff --git a/roles/amdgpu_firmware b/roles/amdgpu_firmware index 311e600..645553c 160000 --- a/roles/amdgpu_firmware +++ b/roles/amdgpu_firmware @@ -1 +1 @@ -Subproject commit 311e600f078c04007aecd37e7e2233d3f5e86a90 +Subproject commit 645553cbb763ac541adef9d8373027f3b7dfaa0d diff --git a/roles/do1jlr.htop b/roles/do1jlr.htop index 46a2dde..3cb2647 160000 --- a/roles/do1jlr.htop +++ b/roles/do1jlr.htop @@ -1 +1 @@ -Subproject commit 46a2dde4efe40245f461cac542c0b3993a833850 +Subproject commit 3cb26476bb2aeb486ee44c48d149401aef15e7cf diff --git a/roles/networkmanager/defaults/main.yml b/roles/networkmanager/defaults/main.yml deleted file mode 100644 index bb6c5db..0000000 --- a/roles/networkmanager/defaults/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -# version management with this role? -submodules_versioncheck: true diff --git a/roles/networkmanager/tasks/main.yml b/roles/networkmanager/tasks/main.yml deleted file mode 100644 index fec5330..0000000 --- a/roles/networkmanager/tasks/main.yml +++ /dev/null @@ -1,46 +0,0 @@ ---- -- include_tasks: versioncheck.yml - when: submodules_versioncheck|bool - -- name: install needed packages on arch - become: yes - community.general.pacman: - name: - - wireless_tools - - iw - - crda - - networkmanager - - dnsutils - - mtr - state: latest - when: ansible_distribution == 'Archlinux' - -- name: install Networkmanager - become: yes - ansible.builtin.dnf: - name: NetworkManager - state: present - when: ansible_distribution == 'Fedora' - -- name: install NetworkManager - become: yes - ansible.builtin.apt: - name: networkmanager - state: present - when: ansible_os_family == 'Debian' - -- name: install needed packages for NetworkManager - become: yes - ansible.builtin.package: - name: - - dialog - - wpa_supplicant - - network-manager-applet - - nm-connection-editor - state: present - -- name: enable networkmanager - become: yes - ansible.builtin.systemd: - name: NetworkManager.service - enabled: yes diff --git a/roles/networkmanager/tasks/versioncheck.yml b/roles/networkmanager/tasks/versioncheck.yml deleted file mode 100644 index 7977e52..0000000 --- a/roles/networkmanager/tasks/versioncheck.yml +++ /dev/null @@ -1,46 +0,0 @@ ---- -- name: Create directory for versionscheck - become: true - file: - path: '/etc/.ansible-version' - state: directory - mode: 0755 - when: submodules_versioncheck|bool - -- name: check playbook version - become: true - slurp: - src: "/etc/.ansible-version/{{ playbook_version_path }}" - register: playbook_version - when: submodules_versioncheck|bool - ignore_errors: yes - failed_when: false - -- name: Print remote role version - debug: - msg: "Remote role version: {{ playbook_version.content | default('Y3VycmVudGx5IG5vdCBkZXBsb3llZAo=') | b64decode | string }}" - when: submodules_versioncheck|bool - -- name: Print locale role version - debug: - msg: "Local role version: '{{ playbook_version_number|string }}'." - when: submodules_versioncheck|bool - -- name: Check if your version is outdated - fail: - msg: "Your ansible module has the version '{{ playbook_version_number }}' and is outdated. You need to update it!" - when: - - playbook_version.content|default("Mgo=")|b64decode|int - 1 >= playbook_version_number|int and submodules_versioncheck|bool - -- name: check if '/etc/ansible-version/' is empty - find: - paths: '/etc/ansible-version/' - register: filesFound - -- name: write new version to remote disk - become: true - copy: - content: "{{ playbook_version_number }}" - dest: "/etc/.ansible-version/{{ playbook_version_path }}" - mode: 0644 - when: submodules_versioncheck|bool diff --git a/roles/networkmanager/vars/main.yml b/roles/networkmanager/vars/main.yml deleted file mode 100644 index d8c2a33..0000000 --- a/roles/networkmanager/vars/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -playbook_version_number: 9001 # should be over ninethousand -playbook_version_path: 'role-networkmanager_roles-ansible_github.com.version' diff --git a/roles/no-sleep b/roles/no-sleep index ef21e1c..04b2945 160000 --- a/roles/no-sleep +++ b/roles/no-sleep @@ -1 +1 @@ -Subproject commit ef21e1c1dda6b65f120ce5df1cf4c2b375d18baa +Subproject commit 04b2945454d98e6e917a5e1fcdb7d6d7158840e1 diff --git a/roles/polybar b/roles/polybar deleted file mode 160000 index 711bb86..0000000 --- a/roles/polybar +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 711bb864d2cbc36ef4e5dd19acb1452f7660efe0 diff --git a/roles/pulseaudio b/roles/pulseaudio deleted file mode 160000 index 0612c0e..0000000 --- a/roles/pulseaudio +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0612c0ee9dab907864bb5b286ff1003553367c65 diff --git a/roles/steam/defaults/main.yml b/roles/steam/defaults/main.yml deleted file mode 100644 index ae24f4b..0000000 --- a/roles/steam/defaults/main.yml +++ /dev/null @@ -1,20 +0,0 @@ - -steam_default_packages: - - steam - - steam-native-runtime - - lib32-keyutils - - lib32-harfbuzz - - lib32-freetype2 - - lib32-krb5 - - vkd3d - - lib32-vkd3d - - lib32-vulkan-validation-layers - - lib32-vulkan-intel - - libretro-shaders-slang - - vulkan-validation-layers - - vulkan-trace - - vulkan-tools - - vulkan-intel - - vulkan-headers - - vulkan-extra-layers - diff --git a/roles/steam/tasks/main.yml b/roles/steam/tasks/main.yml deleted file mode 100644 index 4b869b0..0000000 --- a/roles/steam/tasks/main.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: Install steam on arch - pacman: - name: "{{ steam_default_packages }}" - state: latest - update_cache: yes - become: yes - diff --git a/roles/winehq b/roles/winehq deleted file mode 160000 index 04bcf05..0000000 --- a/roles/winehq +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 04bcf054df11e1e999db8648e08fb38be5043fa5 diff --git a/site.yml b/site.yml index 366ef02..ce283c8 100644 --- a/site.yml +++ b/site.yml @@ -15,6 +15,8 @@ - {role: gantsign.bat, tags: bat} - {role: l3d.gopass, tags: gopass} - {role: do1jlr.i3wm, tags: i3wm} + - {role: amdgpu_firmware, tags: firmware} + - {role: do1jlr.htop, tags: htop} # - name: user specific setup # hosts: private @@ -24,8 +26,9 @@ # - {role: authorized_keys, tags: [ssh, auth, authorized_keys]} # - {role: sshd, tags: [ssh, sshd]} # - {role: akku-warning, tags: [akku, akku_warning, akku-warning]} -# - {role: pulseaudio, tags: pulseaudio} -# - {role: networkmanager, tags: [nm, networkmanager]} -# - {role: openvpn, tags: openvpn} -# - {role: winehq, tags: [wine, winehq]} # - {role: no-sleep, tags: no_sleep} + +- name: Setup business specific stuff + hosts: work + roles: + - {role: openvpn, tags: openvpn}