From 765adfd3f65c909875b789061e310b0a3e8b00b4 Mon Sep 17 00:00:00 2001 From: L3D Date: Thu, 19 Sep 2024 11:25:29 +0200 Subject: [PATCH 1/2] Add collection for librewolf --- .gitmodules | 6 +++--- collections/ansible_collections/community/general | 2 +- collections/ansible_collections/l3d/linux | 1 + collections/ansible_collections/l3d/users | 2 +- collections/ansible_collections/l3d/wm | 2 +- group_vars/all.yml | 4 ++++ roles/hax0rbana_adam.librewolf | 1 - site.yml | 2 +- 8 files changed, 12 insertions(+), 8 deletions(-) create mode 160000 collections/ansible_collections/l3d/linux delete mode 160000 roles/hax0rbana_adam.librewolf diff --git a/.gitmodules b/.gitmodules index 2187d6f..cf8e6c2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -73,6 +73,6 @@ [submodule "roles/roles-ansible.gopass"] path = roles/roles-ansible.gopass url = https://github.com/roles-ansible/ansible_role_gopass.git -[submodule "roles/hax0rbana_adam.librewolf"] - path = roles/hax0rbana_adam.librewolf - url = https://gitlab.hax0rbana.org/public-repos/ansible/librewolf.git +[submodule "collections/ansible_collections/l3d/linux"] + path = collections/ansible_collections/l3d/linux + url = https://github.com/roles-ansible/ansible_collection_linux.git diff --git a/collections/ansible_collections/community/general b/collections/ansible_collections/community/general index 40f1ab3..6af74d1 160000 --- a/collections/ansible_collections/community/general +++ b/collections/ansible_collections/community/general @@ -1 +1 @@ -Subproject commit 40f1ab31f5b8cee640c42318fbda7ff5cc0b8e86 +Subproject commit 6af74d1ba6a8f5378d4fa775bc474f525599e18f diff --git a/collections/ansible_collections/l3d/linux b/collections/ansible_collections/l3d/linux new file mode 160000 index 0000000..c558240 --- /dev/null +++ b/collections/ansible_collections/l3d/linux @@ -0,0 +1 @@ +Subproject commit c558240a8c9c34a55c342703de405b9d259f78ad diff --git a/collections/ansible_collections/l3d/users b/collections/ansible_collections/l3d/users index b750665..0cb07ba 160000 --- a/collections/ansible_collections/l3d/users +++ b/collections/ansible_collections/l3d/users @@ -1 +1 @@ -Subproject commit b750665aae34884114b00faa149612aa78f93c53 +Subproject commit 0cb07bae03013e7ed0a67717f52fddc2073b8514 diff --git a/collections/ansible_collections/l3d/wm b/collections/ansible_collections/l3d/wm index 1353084..6e5fb94 160000 --- a/collections/ansible_collections/l3d/wm +++ b/collections/ansible_collections/l3d/wm @@ -1 +1 @@ -Subproject commit 13530844022738d6004cd2412f8ee93f1321d1af +Subproject commit 6e5fb94f20fefe8c67c54c36f95fe66171683330 diff --git a/group_vars/all.yml b/group_vars/all.yml index 621b5a7..cb72775 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -104,3 +104,7 @@ submodules_versioncheck: true # gopass dir gopass_prefix: '' + +# librewolf +librewolf__xdg_settings: true +librewolf__xdg_settings_user: "{{ sway__user_list }}" diff --git a/roles/hax0rbana_adam.librewolf b/roles/hax0rbana_adam.librewolf deleted file mode 160000 index df230cb..0000000 --- a/roles/hax0rbana_adam.librewolf +++ /dev/null @@ -1 +0,0 @@ -Subproject commit df230cb887e3ecbf25dcbfa3dbc3409af3446ab1 diff --git a/site.yml b/site.yml index 800d1b4..72c145e 100644 --- a/site.yml +++ b/site.yml @@ -28,7 +28,7 @@ - {role: gantsign.bat, tags: bat} - {role: l3d.wm.i3, tags: i3wm} - {role: l3d.wm.sway, tags: sway} - - {role: hax0rbana_adam.librewolf, tags: librewolf, become: true} + - {role: l3d.linux.librewolf, tags: librewolf} # - {role: amdgpu_firmware, tags: firmware} - {role: do1jlr.htop, tags: htop} From e88906365a3508fac7922759eadfe9231da1f4e4 Mon Sep 17 00:00:00 2001 From: L3D Date: Thu, 19 Sep 2024 11:27:49 +0200 Subject: [PATCH 2/2] Update packages to use collection --- .gitmodules | 3 --- roles/l3d.packages | 1 - site.yml | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) delete mode 160000 roles/l3d.packages diff --git a/.gitmodules b/.gitmodules index cf8e6c2..e7cbc1f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -55,9 +55,6 @@ [submodule "collections/ansible_collections/l3d/avahi"] path = collections/ansible_collections/l3d/avahi url = https://github.com/roles-ansible/ansible_collection_avahi.git -[submodule "roles/l3d.packages"] - path = roles/l3d.packages - url = https://github.com/roles-ansible/ansible_role_packages.git [submodule "roles/l3d.etesync_dav"] path = roles/l3d.etesync_dav url = https://github.com/roles-ansible/ansible_role_etesync_dav.git diff --git a/roles/l3d.packages b/roles/l3d.packages deleted file mode 160000 index 7694165..0000000 --- a/roles/l3d.packages +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 76941650c150e5ebca9f1131be0bfb8edc776239 diff --git a/site.yml b/site.yml index 72c145e..1ef6f11 100644 --- a/site.yml +++ b/site.yml @@ -20,7 +20,7 @@ - name: Generic Workstation Preperation hosts: [work, private] roles: - - {role: l3d.packages, tags: [packages, apt]} + - {role: l3d.linux.packages, tags: [packages, apt]} - {role: l3d.time.ntp, tags: ntp} - {role: l3d.avahi.client, tags: avahi} - {role: l3d.avahi.daemon, tags: avahi}