diff --git a/.gitmodules b/.gitmodules index a407f8a..816439e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -46,3 +46,6 @@ [submodule "roles/tailscale"] path = roles/tailscale url = https://codeberg.org/ansible/tailscale.git +[submodule "roles/browser-firefox"] + path = roles/browser-firefox + url = https://codeberg.org/ansible/browser-firefox.git diff --git a/README.md b/README.md index df7b66b..d0a5713 100644 --- a/README.md +++ b/README.md @@ -63,14 +63,23 @@ Add a new role as a git submodule (standing in the playbook root): $ git submodule add https://codeberg.org/ansible/dotfiles.git roles/dotfiles ``` +Note that if the submodule has submodules of its own, they must be added in a separate +step by first entering the root of the submodule, then +``` +git submodule update --init --recursive +``` + Update all the roles from their respective remotes: ``` $ git submodule foreach git fetch -$ git submodule foreach git pull origin main +$ git submodule foreach --recursive git pull origin main ``` +(`--recursive` is only needed if your submodule has submodules of its own). + + https://stackoverflow.com/a/1032863 + https://stackoverflow.com/questions/10906554/how-do-i-revert-my-changes-to-a-git-submodule ++ https://stackoverflow.com/questions/28110097/adding-a-git-submodule-inside-of-a-submodule-nested-submodules ### Installing Ansible from pip diff --git a/local.yml b/local.yml index fb3d861..a8a32cf 100644 --- a/local.yml +++ b/local.yml @@ -47,6 +47,8 @@ # https://codeberg.org/ansible/tailscale - { role: tailscale, become: true, tags: [ tailscale ] } #### software + # https://codeberg.org/ansible/browser-firefox + - { role: browser-firefox, become: true, tags: [ browser-firefox, firefox ] } # https://codeberg.org/ansible/qbittorrent - { role: qbittorrent, become: true, tags: [ qbittorrent ] } @@ -74,16 +76,12 @@ changed_when: true tags: always -# # #### software -# - { role: ansible, become: true, tags: [ ansible ] } -# - { role: bluetooth, become: true, tags: [ bluetooth ] } # # - { role: browser-agregore, become: true, tags: [ browser-agregore ] } # - { role: browser-beaker, become: true, tags: [ browser-beaker, beaker ] } # - { role: browser-brave, become: true, tags: [ browser-brave, brave ] } # - { role: browser-chrome, become: true, tags: [ browser-chrome, chrome ] } # - { role: browser-chromium, become: true, tags: [ browser-chromium, chromium ] } -# - { role: browser-firefox, become: true, tags: [ browser-firefox, firefox ] } # - { role: browser-min, become: true, tags: [ browser-min ] } # - { role: browser-opera, become: true, tags: [ browser-opera ] } # - { role: browser-vivaldi, become: true, tags: [ browser-vivaldi ] } @@ -97,24 +95,15 @@ # - { role: etcher, become: true, tags: [ etcher ] } # - { role: ffmpeg, become: true, tags: [ ffmpeg ] } # - { role: fsearch, become: true, tags: [ fsearch ] } -# # - { role: firejail, become: true, tags: [ firejail ] } # - { role: fityk, become: true, tags: [ fityk ] } -# ## use thorium instead -# # - { role: foliate-ebookreader, become: true, tags: [ foliate-ebookreader, foliate ] } # - { role: freemind, become: true, tags: [ freemind ] } # - { role: freerdp, become: true, tags: [ freerdp ] } -# - { role: google-earth, become: true, tags: [ google-earth ] } -# - { role: gprename, become: true, tags: [ gprename ] } -# - { role: handbrake, become: true, tags: [ handbrake ] } # - { role: imagemagick, become: true, tags: [ imagemagick ] } # - { role: iriun-webcam, become: true, tags: [ iriun-webcam, iriun ] } # - { role: java-openjdk, become: true, tags: [ java-openjdk ] } -# - { role: jupyterlab-desktop, become: true, tags: [ jupyterlab-desktop ] } # - { role: libreoffice, become: true, tags: [ libreoffice ] } -# - { role: magnus, become: true, tags: [ magnus ] } # screen magnifier # - { role: mpv, become: true, tags: [ mpv ] } -# # - { role: nextcloud-desktop, become: true, tags: [ nextcloud-desktop ] } -# # - { role: nuclear-musicplayer, become: true, tags: [ nuclear-musicplayer, nuclear ] } +# - { role: nuclear-musicplayer, become: true, tags: [ nuclear-musicplayer, nuclear ] } # - { role: okular, become: true, tags: [ okular ] } # - { role: pandoc, become: true, tags: [ pandoc ] } # - { role: pcmanfm, become: true, tags: [ pcmanfm ] } @@ -128,25 +117,17 @@ # - { role: R, become: true, tags: [ R ] } # - { role: radian, become: true, tags: [ radian ] } # - { role: rofi-calc, tags: [ rofi-calc ] } -# - { role: scrcpy, become: true, tags: [ scrcpy ] } # - { role: screenkey, become: true, tags: [ screenkey ] } # - { role: shutter, become: true, tags: [ shutter ] } -# - { role: signal-desktop, become: true, tags: [ signal-desktop ] } # - { role: sioyek-pdf, become: true, tags: [ sioyek-pdf ] } # - { role: speech-to-text, become: true, tags: [ speech-to-text ] } # - { role: thorium-reader, become: true, tags: [ thorium-reader ] } # - { role: thunderbird, become: true, tags: [ thunderbird ] } -# - { role: tmux-xpanes, become: true, tags: [ tmux-xpanes ] } # - { role: ultimaker-cura, become: true, tags: [ ultimaker-cura ] } # - { role: unison, become: true, tags: [ unison ] } -# # consider whether vino is required for remote desktop -# # - { role: vino, become: true, tags: [ vino ] } -# - { role: virtualbox, become: true, tags: [ virtualbox ] } # - { role: vlc, become: true, tags: [ vlc, vlc-videolan ] } # - { role: x2goclient, become: true, tags: [ x2goclient ] } # - { role: x2goserver, become: true, tags: [ x2goserver ] } # - { role: xournalpp, become: true, tags: [ xournalpp ] } -# # zathura PDF viewer -# - { role: zathura, become: true, tags: [ zathura ] } # - { role: zoom-client, become: true, tags: [ zoom-client ] } # - { role: zotero, become: true, tags: [ zotero ] } diff --git a/roles/browser-firefox b/roles/browser-firefox new file mode 160000 index 0000000..83f4208 --- /dev/null +++ b/roles/browser-firefox @@ -0,0 +1 @@ +Subproject commit 83f4208c70921d4f71ed5ccd3fe0fb326f159b59