Merge pull request #67 from DO1JLR/lw

Add collection for librewolf
DO1JLR · Sep 19, 2024 · e59f2f1 · e59f2f1
2 parents f697b2c + e889063
commit e59f2f1
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -73,6 +70,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
diff --git a/collections/ansible_collections/l3d/linux b/collections/ansible_collections/l3d/linux
diff --git a/collections/ansible_collections/l3d/users b/collections/ansible_collections/l3d/users
diff --git a/collections/ansible_collections/l3d/wm b/collections/ansible_collections/l3d/wm
diff --git 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
diff --git a/roles/l3d.packages b/roles/l3d.packages
diff --git a/site.yml b/site.yml
@@ -20,15 +20,15 @@
 - 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}
     - {role: l3d.etesync_dav, tags: [etebase, etesync, dav]}
     - {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}