diff --git a/admin-cli.yml b/admin-cli.yaml similarity index 93% rename from admin-cli.yml rename to admin-cli.yaml index f685b15..2a5c3f2 100755 --- a/admin-cli.yml +++ b/admin-cli.yaml @@ -20,4 +20,4 @@ gui: false tasks: - name: Include main - ansible.builtin.include_tasks: main.yml + ansible.builtin.include_tasks: main.yaml diff --git a/admin-gui.yml b/admin-gui.yaml similarity index 93% rename from admin-gui.yml rename to admin-gui.yaml index e61268f..78eb0cc 100755 --- a/admin-gui.yml +++ b/admin-gui.yaml @@ -20,4 +20,4 @@ gui: true tasks: - name: Include main - ansible.builtin.include_tasks: main.yml + ansible.builtin.include_tasks: main.yaml diff --git a/console.sh b/console.sh index 6b8375f..1c210a4 100755 --- a/console.sh +++ b/console.sh @@ -1,3 +1,3 @@ #!/bin/sh . ./roles/home-cli/files/profile -./user-cli.yml -i ./inventories/$(uname -s).ini +./user-cli.yaml -i ./inventories/$(uname -s).ini diff --git a/desktop.sh b/desktop.sh index 54c8e69..a7fcd59 100755 --- a/desktop.sh +++ b/desktop.sh @@ -1,3 +1,3 @@ #!/bin/sh . ./roles/home-cli/files/profile -./user-gui.yml -i ./inventories/$(uname -s).ini +./user-gui.yaml -i ./inventories/$(uname -s).ini diff --git a/main.yml b/main.yaml similarity index 100% rename from main.yml rename to main.yaml diff --git a/roles/arch/tasks/localbin.yml b/roles/arch/tasks/localbin.yaml similarity index 100% rename from roles/arch/tasks/localbin.yml rename to roles/arch/tasks/localbin.yaml diff --git a/roles/arch/tasks/locale.yml b/roles/arch/tasks/locale.yaml similarity index 100% rename from roles/arch/tasks/locale.yml rename to roles/arch/tasks/locale.yaml diff --git a/roles/arch/tasks/main.yml b/roles/arch/tasks/main.yaml similarity index 71% rename from roles/arch/tasks/main.yml rename to roles/arch/tasks/main.yaml index 35b2d7e..60f3448 100644 --- a/roles/arch/tasks/main.yml +++ b/roles/arch/tasks/main.yaml @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -- import_tasks: packages-cli.yml -- import_tasks: packages-gui.yml +- import_tasks: packages-cli.yaml +- import_tasks: packages-gui.yaml when: gui == true -- import_tasks: modules.yml -- import_tasks: ssh.yml -- import_tasks: solokeys.yml -- import_tasks: locale.yml -- import_tasks: printing.yml -- import_tasks: localbin.yml +- import_tasks: modules.yaml +- import_tasks: ssh.yaml +- import_tasks: solokeys.yaml +- import_tasks: locale.yaml +- import_tasks: printing.yaml +- import_tasks: localbin.yaml diff --git a/roles/arch/tasks/modules.yml b/roles/arch/tasks/modules.yaml similarity index 100% rename from roles/arch/tasks/modules.yml rename to roles/arch/tasks/modules.yaml diff --git a/roles/arch/tasks/packages-cli.yml b/roles/arch/tasks/packages-cli.yaml similarity index 100% rename from roles/arch/tasks/packages-cli.yml rename to roles/arch/tasks/packages-cli.yaml diff --git a/roles/arch/tasks/packages-gui.yml b/roles/arch/tasks/packages-gui.yaml similarity index 100% rename from roles/arch/tasks/packages-gui.yml rename to roles/arch/tasks/packages-gui.yaml diff --git a/roles/arch/tasks/printing.yml b/roles/arch/tasks/printing.yaml similarity index 100% rename from roles/arch/tasks/printing.yml rename to roles/arch/tasks/printing.yaml diff --git a/roles/arch/tasks/solokeys.yml b/roles/arch/tasks/solokeys.yaml similarity index 100% rename from roles/arch/tasks/solokeys.yml rename to roles/arch/tasks/solokeys.yaml diff --git a/roles/arch/tasks/ssh.yml b/roles/arch/tasks/ssh.yaml similarity index 100% rename from roles/arch/tasks/ssh.yml rename to roles/arch/tasks/ssh.yaml diff --git a/roles/debian/tasks/apt-sources.yml b/roles/debian/tasks/apt-sources.yaml similarity index 100% rename from roles/debian/tasks/apt-sources.yml rename to roles/debian/tasks/apt-sources.yaml diff --git a/roles/debian/tasks/build-env.yml b/roles/debian/tasks/build-env.yaml similarity index 100% rename from roles/debian/tasks/build-env.yml rename to roles/debian/tasks/build-env.yaml diff --git a/roles/debian/tasks/gdm.yml b/roles/debian/tasks/gdm.yaml similarity index 100% rename from roles/debian/tasks/gdm.yml rename to roles/debian/tasks/gdm.yaml diff --git a/roles/debian/tasks/google-chrome.yml b/roles/debian/tasks/google-chrome.yaml similarity index 100% rename from roles/debian/tasks/google-chrome.yml rename to roles/debian/tasks/google-chrome.yaml diff --git a/roles/debian/tasks/main.yml b/roles/debian/tasks/main.yaml similarity index 61% rename from roles/debian/tasks/main.yml rename to roles/debian/tasks/main.yaml index b848c3e..fffc4f1 100644 --- a/roles/debian/tasks/main.yml +++ b/roles/debian/tasks/main.yaml @@ -13,23 +13,23 @@ # See the License for the specific language governing permissions and # limitations under the License. -- import_tasks: apt-sources.yml -- import_tasks: packages-cli.yml -- import_tasks: packages-devel.yml -- import_tasks: packages-gui.yml +- import_tasks: apt-sources.yaml +- import_tasks: packages-cli.yaml +- import_tasks: packages-devel.yaml +- import_tasks: packages-gui.yaml when: gui == true -- import_tasks: modules.yml -- import_tasks: ssh.yml -- import_tasks: solokeys.yml +- import_tasks: modules.yaml +- import_tasks: ssh.yaml +- import_tasks: solokeys.yaml when: wsl == false -- import_tasks: sudo.yml -- import_tasks: packagekit.yml +- import_tasks: sudo.yaml +- import_tasks: packagekit.yaml when: gui == true and wsl == false -- import_tasks: timezone.yml +- import_tasks: timezone.yaml when: wsl == false -- import_tasks: systemd.yml +- import_tasks: systemd.yaml when: wsl == false -- import_tasks: gdm.yml -- import_tasks: podman.yml -- import_tasks: sysctl.yml -- import_tasks: sssd.yml +- import_tasks: gdm.yaml +- import_tasks: podman.yaml +- import_tasks: sysctl.yaml +- import_tasks: sssd.yaml diff --git a/roles/debian/tasks/modules.yml b/roles/debian/tasks/modules.yaml similarity index 100% rename from roles/debian/tasks/modules.yml rename to roles/debian/tasks/modules.yaml diff --git a/roles/debian/tasks/packagekit.yml b/roles/debian/tasks/packagekit.yaml similarity index 100% rename from roles/debian/tasks/packagekit.yml rename to roles/debian/tasks/packagekit.yaml diff --git a/roles/debian/tasks/packages-cli.yml b/roles/debian/tasks/packages-cli.yaml similarity index 100% rename from roles/debian/tasks/packages-cli.yml rename to roles/debian/tasks/packages-cli.yaml diff --git a/roles/debian/tasks/packages-devel.yml b/roles/debian/tasks/packages-devel.yaml similarity index 100% rename from roles/debian/tasks/packages-devel.yml rename to roles/debian/tasks/packages-devel.yaml diff --git a/roles/debian/tasks/packages-gui.yml b/roles/debian/tasks/packages-gui.yaml similarity index 100% rename from roles/debian/tasks/packages-gui.yml rename to roles/debian/tasks/packages-gui.yaml diff --git a/roles/debian/tasks/podman.yml b/roles/debian/tasks/podman.yaml similarity index 100% rename from roles/debian/tasks/podman.yml rename to roles/debian/tasks/podman.yaml diff --git a/roles/debian/tasks/solokeys.yml b/roles/debian/tasks/solokeys.yaml similarity index 100% rename from roles/debian/tasks/solokeys.yml rename to roles/debian/tasks/solokeys.yaml diff --git a/roles/debian/tasks/ssh.yml b/roles/debian/tasks/ssh.yaml similarity index 100% rename from roles/debian/tasks/ssh.yml rename to roles/debian/tasks/ssh.yaml diff --git a/roles/debian/tasks/sssd.yml b/roles/debian/tasks/sssd.yaml similarity index 100% rename from roles/debian/tasks/sssd.yml rename to roles/debian/tasks/sssd.yaml diff --git a/roles/debian/tasks/sudo.yml b/roles/debian/tasks/sudo.yaml similarity index 100% rename from roles/debian/tasks/sudo.yml rename to roles/debian/tasks/sudo.yaml diff --git a/roles/debian/tasks/sysctl.yml b/roles/debian/tasks/sysctl.yaml similarity index 100% rename from roles/debian/tasks/sysctl.yml rename to roles/debian/tasks/sysctl.yaml diff --git a/roles/debian/tasks/systemd.yml b/roles/debian/tasks/systemd.yaml similarity index 100% rename from roles/debian/tasks/systemd.yml rename to roles/debian/tasks/systemd.yaml diff --git a/roles/debian/tasks/timezone.yml b/roles/debian/tasks/timezone.yaml similarity index 100% rename from roles/debian/tasks/timezone.yml rename to roles/debian/tasks/timezone.yaml diff --git a/roles/debian/tasks/vscode.yml b/roles/debian/tasks/vscode.yaml similarity index 100% rename from roles/debian/tasks/vscode.yml rename to roles/debian/tasks/vscode.yaml diff --git a/roles/debian/tasks/vscodium.yml b/roles/debian/tasks/vscodium.yaml similarity index 100% rename from roles/debian/tasks/vscodium.yml rename to roles/debian/tasks/vscodium.yaml diff --git a/roles/debian/tasks/xkb-lv5.yml b/roles/debian/tasks/xkb-lv5.yaml similarity index 100% rename from roles/debian/tasks/xkb-lv5.yml rename to roles/debian/tasks/xkb-lv5.yaml diff --git a/roles/el/tasks/journald.yml b/roles/el/tasks/journald.yaml similarity index 100% rename from roles/el/tasks/journald.yml rename to roles/el/tasks/journald.yaml diff --git a/roles/el/tasks/legacy-openssl.yml b/roles/el/tasks/legacy-openssl.yaml similarity index 100% rename from roles/el/tasks/legacy-openssl.yml rename to roles/el/tasks/legacy-openssl.yaml diff --git a/roles/el/tasks/main.yml b/roles/el/tasks/main.yaml similarity index 67% rename from roles/el/tasks/main.yml rename to roles/el/tasks/main.yaml index f8c679b..e567e61 100644 --- a/roles/el/tasks/main.yml +++ b/roles/el/tasks/main.yaml @@ -13,14 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -- import_tasks: repos.yml -- import_tasks: packages-cli.yml -- import_tasks: packages-gui.yml +- import_tasks: repos.yaml +- import_tasks: packages-cli.yaml +- import_tasks: packages-gui.yaml when: gui == true -- import_tasks: modules.yml -- import_tasks: ssh.yml -- import_tasks: solokeys.yml -- import_tasks: packagekit.yml -- import_tasks: zram.yml -- import_tasks: journald.yml -- import_tasks: timezone.yml +- import_tasks: modules.yaml +- import_tasks: ssh.yaml +- import_tasks: solokeys.yaml +- import_tasks: packagekit.yaml +- import_tasks: zram.yaml +- import_tasks: journald.yaml +- import_tasks: timezone.yaml diff --git a/roles/el/tasks/modules.yml b/roles/el/tasks/modules.yaml similarity index 100% rename from roles/el/tasks/modules.yml rename to roles/el/tasks/modules.yaml diff --git a/roles/el/tasks/packagekit.yml b/roles/el/tasks/packagekit.yaml similarity index 100% rename from roles/el/tasks/packagekit.yml rename to roles/el/tasks/packagekit.yaml diff --git a/roles/el/tasks/packages-cli.yml b/roles/el/tasks/packages-cli.yaml similarity index 100% rename from roles/el/tasks/packages-cli.yml rename to roles/el/tasks/packages-cli.yaml diff --git a/roles/el/tasks/packages-gui.yml b/roles/el/tasks/packages-gui.yaml similarity index 100% rename from roles/el/tasks/packages-gui.yml rename to roles/el/tasks/packages-gui.yaml diff --git a/roles/el/tasks/repos.yml b/roles/el/tasks/repos.yaml similarity index 100% rename from roles/el/tasks/repos.yml rename to roles/el/tasks/repos.yaml diff --git a/roles/el/tasks/solokeys.yml b/roles/el/tasks/solokeys.yaml similarity index 100% rename from roles/el/tasks/solokeys.yml rename to roles/el/tasks/solokeys.yaml diff --git a/roles/el/tasks/ssh.yml b/roles/el/tasks/ssh.yaml similarity index 100% rename from roles/el/tasks/ssh.yml rename to roles/el/tasks/ssh.yaml diff --git a/roles/el/tasks/timezone.yml b/roles/el/tasks/timezone.yaml similarity index 100% rename from roles/el/tasks/timezone.yml rename to roles/el/tasks/timezone.yaml diff --git a/roles/el/tasks/vscode.yml b/roles/el/tasks/vscode.yaml similarity index 100% rename from roles/el/tasks/vscode.yml rename to roles/el/tasks/vscode.yaml diff --git a/roles/el/tasks/zram.yml b/roles/el/tasks/zram.yaml similarity index 100% rename from roles/el/tasks/zram.yml rename to roles/el/tasks/zram.yaml diff --git a/roles/fedora/tasks/google-chrome.yml b/roles/fedora/tasks/google-chrome.yaml similarity index 100% rename from roles/fedora/tasks/google-chrome.yml rename to roles/fedora/tasks/google-chrome.yaml diff --git a/roles/fedora/tasks/main.yml b/roles/fedora/tasks/main.yaml similarity index 73% rename from roles/fedora/tasks/main.yml rename to roles/fedora/tasks/main.yaml index b7d526d..d75c8c8 100644 --- a/roles/fedora/tasks/main.yml +++ b/roles/fedora/tasks/main.yaml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -- import_tasks: timezone.yml -- import_tasks: packages-cli.yml -- import_tasks: packages-gui.yml +- import_tasks: timezone.yaml +- import_tasks: packages-cli.yaml +- import_tasks: packages-gui.yaml when: gui == true -- import_tasks: modules.yml -- import_tasks: ssh.yml -- import_tasks: solokeys.yml -- import_tasks: packagekit.yml +- import_tasks: modules.yaml +- import_tasks: ssh.yaml +- import_tasks: solokeys.yaml +- import_tasks: packagekit.yaml diff --git a/roles/fedora/tasks/modules.yml b/roles/fedora/tasks/modules.yaml similarity index 100% rename from roles/fedora/tasks/modules.yml rename to roles/fedora/tasks/modules.yaml diff --git a/roles/fedora/tasks/packagekit.yml b/roles/fedora/tasks/packagekit.yaml similarity index 100% rename from roles/fedora/tasks/packagekit.yml rename to roles/fedora/tasks/packagekit.yaml diff --git a/roles/fedora/tasks/packages-cli.yml b/roles/fedora/tasks/packages-cli.yaml similarity index 100% rename from roles/fedora/tasks/packages-cli.yml rename to roles/fedora/tasks/packages-cli.yaml diff --git a/roles/fedora/tasks/packages-gui.yml b/roles/fedora/tasks/packages-gui.yaml similarity index 100% rename from roles/fedora/tasks/packages-gui.yml rename to roles/fedora/tasks/packages-gui.yaml diff --git a/roles/fedora/tasks/solokeys.yml b/roles/fedora/tasks/solokeys.yaml similarity index 100% rename from roles/fedora/tasks/solokeys.yml rename to roles/fedora/tasks/solokeys.yaml diff --git a/roles/fedora/tasks/ssh.yml b/roles/fedora/tasks/ssh.yaml similarity index 100% rename from roles/fedora/tasks/ssh.yml rename to roles/fedora/tasks/ssh.yaml diff --git a/roles/fedora/tasks/sublime-text.yml b/roles/fedora/tasks/sublime-text.yaml similarity index 100% rename from roles/fedora/tasks/sublime-text.yml rename to roles/fedora/tasks/sublime-text.yaml diff --git a/roles/fedora/tasks/timezone.yml b/roles/fedora/tasks/timezone.yaml similarity index 100% rename from roles/fedora/tasks/timezone.yml rename to roles/fedora/tasks/timezone.yaml diff --git a/roles/fedora/tasks/vscode.yml b/roles/fedora/tasks/vscode.yaml similarity index 100% rename from roles/fedora/tasks/vscode.yml rename to roles/fedora/tasks/vscode.yaml diff --git a/roles/fedora/tasks/vscodium.yml b/roles/fedora/tasks/vscodium.yaml similarity index 100% rename from roles/fedora/tasks/vscodium.yml rename to roles/fedora/tasks/vscodium.yaml diff --git a/roles/freebsd/tasks/gettytab.yml b/roles/freebsd/tasks/gettytab.yaml similarity index 100% rename from roles/freebsd/tasks/gettytab.yml rename to roles/freebsd/tasks/gettytab.yaml diff --git a/roles/freebsd/tasks/gnome.yml b/roles/freebsd/tasks/gnome.yaml similarity index 100% rename from roles/freebsd/tasks/gnome.yml rename to roles/freebsd/tasks/gnome.yaml diff --git a/roles/freebsd/tasks/hikari.yml b/roles/freebsd/tasks/hikari.yaml similarity index 100% rename from roles/freebsd/tasks/hikari.yml rename to roles/freebsd/tasks/hikari.yaml diff --git a/roles/freebsd/tasks/kde.yml b/roles/freebsd/tasks/kde.yaml similarity index 100% rename from roles/freebsd/tasks/kde.yml rename to roles/freebsd/tasks/kde.yaml diff --git a/roles/freebsd/tasks/main.yml b/roles/freebsd/tasks/main.yaml similarity index 75% rename from roles/freebsd/tasks/main.yml rename to roles/freebsd/tasks/main.yaml index c779c6b..d8fdbd3 100644 --- a/roles/freebsd/tasks/main.yml +++ b/roles/freebsd/tasks/main.yaml @@ -13,14 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -- import_tasks: packages-cli.yml -- import_tasks: packages-gui.yml +- import_tasks: packages-cli.yaml +- import_tasks: packages-gui.yaml when: gui == true -- import_tasks: rc.yml -- import_tasks: sysctl.yml -- import_tasks: gettytab.yml -- import_tasks: sudo.yml -- import_tasks: xorg.yml +- import_tasks: rc.yaml +- import_tasks: sysctl.yaml +- import_tasks: gettytab.yaml +- import_tasks: sudo.yaml +- import_tasks: xorg.yaml when: gui == true -- import_tasks: qemu-guest.yml +- import_tasks: qemu-guest.yaml when: ansible_virtualization_role == "guest" and ansible_virtualization_type == "kvm" diff --git a/roles/freebsd/tasks/packages-cli.yml b/roles/freebsd/tasks/packages-cli.yaml similarity index 100% rename from roles/freebsd/tasks/packages-cli.yml rename to roles/freebsd/tasks/packages-cli.yaml diff --git a/roles/freebsd/tasks/packages-gui.yml b/roles/freebsd/tasks/packages-gui.yaml similarity index 100% rename from roles/freebsd/tasks/packages-gui.yml rename to roles/freebsd/tasks/packages-gui.yaml diff --git a/roles/freebsd/tasks/qemu-guest.yml b/roles/freebsd/tasks/qemu-guest.yaml similarity index 100% rename from roles/freebsd/tasks/qemu-guest.yml rename to roles/freebsd/tasks/qemu-guest.yaml diff --git a/roles/freebsd/tasks/rc.yml b/roles/freebsd/tasks/rc.yaml similarity index 100% rename from roles/freebsd/tasks/rc.yml rename to roles/freebsd/tasks/rc.yaml diff --git a/roles/freebsd/tasks/sudo.yml b/roles/freebsd/tasks/sudo.yaml similarity index 100% rename from roles/freebsd/tasks/sudo.yml rename to roles/freebsd/tasks/sudo.yaml diff --git a/roles/freebsd/tasks/sysctl.yml b/roles/freebsd/tasks/sysctl.yaml similarity index 100% rename from roles/freebsd/tasks/sysctl.yml rename to roles/freebsd/tasks/sysctl.yaml diff --git a/roles/freebsd/tasks/xorg.yml b/roles/freebsd/tasks/xorg.yaml similarity index 100% rename from roles/freebsd/tasks/xorg.yml rename to roles/freebsd/tasks/xorg.yaml diff --git a/roles/home-cli/tasks/dirs.yml b/roles/home-cli/tasks/dirs.yaml similarity index 100% rename from roles/home-cli/tasks/dirs.yml rename to roles/home-cli/tasks/dirs.yaml diff --git a/roles/home-cli/tasks/dotfiles.yml b/roles/home-cli/tasks/dotfiles.yaml similarity index 100% rename from roles/home-cli/tasks/dotfiles.yml rename to roles/home-cli/tasks/dotfiles.yaml diff --git a/roles/home-cli/tasks/main.yml b/roles/home-cli/tasks/main.yaml similarity index 91% rename from roles/home-cli/tasks/main.yml rename to roles/home-cli/tasks/main.yaml index bb55b27..f1c5fd7 100644 --- a/roles/home-cli/tasks/main.yml +++ b/roles/home-cli/tasks/main.yaml @@ -33,8 +33,8 @@ wsl: true when: '"microsoft" in check_wsl.stdout' -- import_tasks: shell.yml +- import_tasks: shell.yaml -- import_tasks: dirs.yml -- import_tasks: dotfiles.yml -- import_tasks: ssh.yml +- import_tasks: dirs.yaml +- import_tasks: dotfiles.yaml +- import_tasks: ssh.yaml diff --git a/roles/home-cli/tasks/shell.yml b/roles/home-cli/tasks/shell.yaml similarity index 100% rename from roles/home-cli/tasks/shell.yml rename to roles/home-cli/tasks/shell.yaml diff --git a/roles/home-cli/tasks/ssh.yml b/roles/home-cli/tasks/ssh.yaml similarity index 100% rename from roles/home-cli/tasks/ssh.yml rename to roles/home-cli/tasks/ssh.yaml diff --git a/roles/home-cli/tasks/vim.yml b/roles/home-cli/tasks/vim.yaml similarity index 100% rename from roles/home-cli/tasks/vim.yml rename to roles/home-cli/tasks/vim.yaml diff --git a/roles/home-gui/files/alacritty-linux.yml b/roles/home-gui/files/alacritty-linux.yaml similarity index 100% rename from roles/home-gui/files/alacritty-linux.yml rename to roles/home-gui/files/alacritty-linux.yaml diff --git a/roles/home-gui/files/alacritty-windows.yml b/roles/home-gui/files/alacritty-windows.yaml similarity index 100% rename from roles/home-gui/files/alacritty-windows.yml rename to roles/home-gui/files/alacritty-windows.yaml diff --git a/roles/home-gui/tasks/dirs.yml b/roles/home-gui/tasks/dirs.yaml similarity index 100% rename from roles/home-gui/tasks/dirs.yml rename to roles/home-gui/tasks/dirs.yaml diff --git a/roles/home-gui/tasks/dotfiles.yml b/roles/home-gui/tasks/dotfiles.yaml similarity index 100% rename from roles/home-gui/tasks/dotfiles.yml rename to roles/home-gui/tasks/dotfiles.yaml diff --git a/roles/home-gui/tasks/emacs.yml b/roles/home-gui/tasks/emacs.yaml similarity index 100% rename from roles/home-gui/tasks/emacs.yml rename to roles/home-gui/tasks/emacs.yaml diff --git a/roles/home-gui/tasks/firefox.yml b/roles/home-gui/tasks/firefox.yaml similarity index 100% rename from roles/home-gui/tasks/firefox.yml rename to roles/home-gui/tasks/firefox.yaml diff --git a/roles/home-gui/tasks/flatpak.yml b/roles/home-gui/tasks/flatpak.yaml similarity index 100% rename from roles/home-gui/tasks/flatpak.yml rename to roles/home-gui/tasks/flatpak.yaml diff --git a/roles/home-gui/tasks/gnome.yml b/roles/home-gui/tasks/gnome.yaml similarity index 100% rename from roles/home-gui/tasks/gnome.yml rename to roles/home-gui/tasks/gnome.yaml diff --git a/roles/home-gui/tasks/kde.yml b/roles/home-gui/tasks/kde.yaml similarity index 100% rename from roles/home-gui/tasks/kde.yml rename to roles/home-gui/tasks/kde.yaml diff --git a/roles/home-gui/tasks/main.yml b/roles/home-gui/tasks/main.yaml similarity index 72% rename from roles/home-gui/tasks/main.yml rename to roles/home-gui/tasks/main.yaml index f16c60c..ced978a 100644 --- a/roles/home-gui/tasks/main.yml +++ b/roles/home-gui/tasks/main.yaml @@ -13,13 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -- import_tasks: dirs.yml +- import_tasks: dirs.yaml -- import_tasks: dotfiles.yml -- import_tasks: flatpak.yml +- import_tasks: dotfiles.yaml +- import_tasks: flatpak.yaml when: wsl == false -- import_tasks: firefox.yml -- import_tasks: gnome.yml -- import_tasks: kde.yml -- import_tasks: mate.yml -- import_tasks: sublimetext.yml +- import_tasks: firefox.yaml +- import_tasks: gnome.yaml +- import_tasks: kde.yaml +- import_tasks: mate.yaml +- import_tasks: sublimetext.yaml diff --git a/roles/home-gui/tasks/mate.yml b/roles/home-gui/tasks/mate.yaml similarity index 100% rename from roles/home-gui/tasks/mate.yml rename to roles/home-gui/tasks/mate.yaml diff --git a/roles/home-gui/tasks/sublimetext.yml b/roles/home-gui/tasks/sublimetext.yaml similarity index 100% rename from roles/home-gui/tasks/sublimetext.yml rename to roles/home-gui/tasks/sublimetext.yaml diff --git a/roles/kali/tasks/main.yml b/roles/kali/tasks/main.yaml similarity index 83% rename from roles/kali/tasks/main.yml rename to roles/kali/tasks/main.yaml index c2f545e..6fa7cd8 100644 --- a/roles/kali/tasks/main.yml +++ b/roles/kali/tasks/main.yaml @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -- import_tasks: packages-cli.yml -- import_tasks: packages-gui.yml +- import_tasks: packages-cli.yaml +- import_tasks: packages-gui.yaml when: gui == true -- import_tasks: ssh.yml -- import_tasks: sudo.yml +- import_tasks: ssh.yaml +- import_tasks: sudo.yaml diff --git a/roles/kali/tasks/packages-cli.yml b/roles/kali/tasks/packages-cli.yaml similarity index 100% rename from roles/kali/tasks/packages-cli.yml rename to roles/kali/tasks/packages-cli.yaml diff --git a/roles/kali/tasks/packages-gui.yml b/roles/kali/tasks/packages-gui.yaml similarity index 100% rename from roles/kali/tasks/packages-gui.yml rename to roles/kali/tasks/packages-gui.yaml diff --git a/roles/kali/tasks/ssh.yml b/roles/kali/tasks/ssh.yaml similarity index 100% rename from roles/kali/tasks/ssh.yml rename to roles/kali/tasks/ssh.yaml diff --git a/roles/kali/tasks/sudo.yml b/roles/kali/tasks/sudo.yaml similarity index 100% rename from roles/kali/tasks/sudo.yml rename to roles/kali/tasks/sudo.yaml diff --git a/roles/netbsd/tasks/console.yml b/roles/netbsd/tasks/console.yaml similarity index 100% rename from roles/netbsd/tasks/console.yml rename to roles/netbsd/tasks/console.yaml diff --git a/roles/netbsd/tasks/main.yml b/roles/netbsd/tasks/main.yaml similarity index 83% rename from roles/netbsd/tasks/main.yml rename to roles/netbsd/tasks/main.yaml index 343c2bc..bf08926 100644 --- a/roles/netbsd/tasks/main.yml +++ b/roles/netbsd/tasks/main.yaml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -- import_tasks: packages-cli.yml -- import_tasks: packages-gui.yml +- import_tasks: packages-cli.yaml +- import_tasks: packages-gui.yaml when: gui == true -- import_tasks: sudo.yml -- import_tasks: xorg.yml +- import_tasks: sudo.yaml +- import_tasks: xorg.yaml when: gui == true diff --git a/roles/netbsd/tasks/packages-cli.yml b/roles/netbsd/tasks/packages-cli.yaml similarity index 100% rename from roles/netbsd/tasks/packages-cli.yml rename to roles/netbsd/tasks/packages-cli.yaml diff --git a/roles/netbsd/tasks/packages-gui.yml b/roles/netbsd/tasks/packages-gui.yaml similarity index 100% rename from roles/netbsd/tasks/packages-gui.yml rename to roles/netbsd/tasks/packages-gui.yaml diff --git a/roles/netbsd/tasks/sudo.yml b/roles/netbsd/tasks/sudo.yaml similarity index 100% rename from roles/netbsd/tasks/sudo.yml rename to roles/netbsd/tasks/sudo.yaml diff --git a/roles/netbsd/tasks/xorg.yml b/roles/netbsd/tasks/xorg.yaml similarity index 100% rename from roles/netbsd/tasks/xorg.yml rename to roles/netbsd/tasks/xorg.yaml diff --git a/roles/openbsd/tasks/main.yml b/roles/openbsd/tasks/main.yaml similarity index 82% rename from roles/openbsd/tasks/main.yml rename to roles/openbsd/tasks/main.yaml index a594110..1ff6dc3 100644 --- a/roles/openbsd/tasks/main.yml +++ b/roles/openbsd/tasks/main.yaml @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -- import_tasks: packages-cli.yml -- import_tasks: packages-gui.yml +- import_tasks: packages-cli.yaml +- import_tasks: packages-gui.yaml when: gui == true -- import_tasks: rc.yml -- import_tasks: ssh.yml -- import_tasks: qemu-guest.yml +- import_tasks: rc.yaml +- import_tasks: ssh.yaml +- import_tasks: qemu-guest.yaml when: gui == true and ansible_virtualization_role == "guest" and ansible_virtualization_type == "kvm" diff --git a/roles/openbsd/tasks/packages-cli.yml b/roles/openbsd/tasks/packages-cli.yaml similarity index 100% rename from roles/openbsd/tasks/packages-cli.yml rename to roles/openbsd/tasks/packages-cli.yaml diff --git a/roles/openbsd/tasks/packages-gui.yml b/roles/openbsd/tasks/packages-gui.yaml similarity index 100% rename from roles/openbsd/tasks/packages-gui.yml rename to roles/openbsd/tasks/packages-gui.yaml diff --git a/roles/openbsd/tasks/qemu-guest.yml b/roles/openbsd/tasks/qemu-guest.yaml similarity index 100% rename from roles/openbsd/tasks/qemu-guest.yml rename to roles/openbsd/tasks/qemu-guest.yaml diff --git a/roles/openbsd/tasks/rc.yml b/roles/openbsd/tasks/rc.yaml similarity index 100% rename from roles/openbsd/tasks/rc.yml rename to roles/openbsd/tasks/rc.yaml diff --git a/roles/openbsd/tasks/ssh.yml b/roles/openbsd/tasks/ssh.yaml similarity index 100% rename from roles/openbsd/tasks/ssh.yml rename to roles/openbsd/tasks/ssh.yaml diff --git a/roles/opensuse-leap/tasks/main.yml b/roles/opensuse-leap/tasks/main.yaml similarity index 79% rename from roles/opensuse-leap/tasks/main.yml rename to roles/opensuse-leap/tasks/main.yaml index f752ba4..f014ebd 100644 --- a/roles/opensuse-leap/tasks/main.yml +++ b/roles/opensuse-leap/tasks/main.yaml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -- import_tasks: packages-cli.yml -- import_tasks: packages-gui.yml +- import_tasks: packages-cli.yaml +- import_tasks: packages-gui.yaml when: gui == true -- import_tasks: modules.yml -- import_tasks: ssh.yml -- import_tasks: solokeys.yml +- import_tasks: modules.yaml +- import_tasks: ssh.yaml +- import_tasks: solokeys.yaml diff --git a/roles/opensuse-leap/tasks/modules.yml b/roles/opensuse-leap/tasks/modules.yaml similarity index 100% rename from roles/opensuse-leap/tasks/modules.yml rename to roles/opensuse-leap/tasks/modules.yaml diff --git a/roles/opensuse-leap/tasks/packages-cli.yml b/roles/opensuse-leap/tasks/packages-cli.yaml similarity index 100% rename from roles/opensuse-leap/tasks/packages-cli.yml rename to roles/opensuse-leap/tasks/packages-cli.yaml diff --git a/roles/opensuse-leap/tasks/packages-gui.yml b/roles/opensuse-leap/tasks/packages-gui.yaml similarity index 100% rename from roles/opensuse-leap/tasks/packages-gui.yml rename to roles/opensuse-leap/tasks/packages-gui.yaml diff --git a/roles/opensuse-leap/tasks/solokeys.yml b/roles/opensuse-leap/tasks/solokeys.yaml similarity index 100% rename from roles/opensuse-leap/tasks/solokeys.yml rename to roles/opensuse-leap/tasks/solokeys.yaml diff --git a/roles/opensuse-leap/tasks/ssh.yml b/roles/opensuse-leap/tasks/ssh.yaml similarity index 100% rename from roles/opensuse-leap/tasks/ssh.yml rename to roles/opensuse-leap/tasks/ssh.yaml diff --git a/roles/opensuse-tumbleweed/tasks/main.yml b/roles/opensuse-tumbleweed/tasks/main.yaml similarity index 79% rename from roles/opensuse-tumbleweed/tasks/main.yml rename to roles/opensuse-tumbleweed/tasks/main.yaml index f752ba4..f014ebd 100644 --- a/roles/opensuse-tumbleweed/tasks/main.yml +++ b/roles/opensuse-tumbleweed/tasks/main.yaml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -- import_tasks: packages-cli.yml -- import_tasks: packages-gui.yml +- import_tasks: packages-cli.yaml +- import_tasks: packages-gui.yaml when: gui == true -- import_tasks: modules.yml -- import_tasks: ssh.yml -- import_tasks: solokeys.yml +- import_tasks: modules.yaml +- import_tasks: ssh.yaml +- import_tasks: solokeys.yaml diff --git a/roles/opensuse-tumbleweed/tasks/modules.yml b/roles/opensuse-tumbleweed/tasks/modules.yaml similarity index 100% rename from roles/opensuse-tumbleweed/tasks/modules.yml rename to roles/opensuse-tumbleweed/tasks/modules.yaml diff --git a/roles/opensuse-tumbleweed/tasks/packages-cli.yml b/roles/opensuse-tumbleweed/tasks/packages-cli.yaml similarity index 100% rename from roles/opensuse-tumbleweed/tasks/packages-cli.yml rename to roles/opensuse-tumbleweed/tasks/packages-cli.yaml diff --git a/roles/opensuse-tumbleweed/tasks/packages-gui.yml b/roles/opensuse-tumbleweed/tasks/packages-gui.yaml similarity index 100% rename from roles/opensuse-tumbleweed/tasks/packages-gui.yml rename to roles/opensuse-tumbleweed/tasks/packages-gui.yaml diff --git a/roles/opensuse-tumbleweed/tasks/solokeys.yml b/roles/opensuse-tumbleweed/tasks/solokeys.yaml similarity index 100% rename from roles/opensuse-tumbleweed/tasks/solokeys.yml rename to roles/opensuse-tumbleweed/tasks/solokeys.yaml diff --git a/roles/opensuse-tumbleweed/tasks/ssh.yml b/roles/opensuse-tumbleweed/tasks/ssh.yaml similarity index 100% rename from roles/opensuse-tumbleweed/tasks/ssh.yml rename to roles/opensuse-tumbleweed/tasks/ssh.yaml diff --git a/roles/ubuntu/tasks/build-env.yml b/roles/ubuntu/tasks/build-env.yaml similarity index 100% rename from roles/ubuntu/tasks/build-env.yml rename to roles/ubuntu/tasks/build-env.yaml diff --git a/roles/ubuntu/tasks/main.yaml b/roles/ubuntu/tasks/main.yaml new file mode 100644 index 0000000..6226258 --- /dev/null +++ b/roles/ubuntu/tasks/main.yaml @@ -0,0 +1,21 @@ +--- +# Copyright 2019-2025 Anthony Rose +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +- import_tasks: packages-cli.yaml +- import_tasks: packages-gui.yaml + when: gui == true +- import_tasks: build-env.yaml +- import_tasks: modules.yaml +- import_tasks: ssh.yaml diff --git a/roles/ubuntu/tasks/main.yml b/roles/ubuntu/tasks/main.yml deleted file mode 100644 index e45657b..0000000 --- a/roles/ubuntu/tasks/main.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -# Copyright 2019-2025 Anthony Rose -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -- import_tasks: packages-cli.yml -- import_tasks: packages-gui.yml - when: gui == true -- import_tasks: build-env.yml -- import_tasks: modules.yml -- import_tasks: ssh.yml diff --git a/roles/ubuntu/tasks/modules.yml b/roles/ubuntu/tasks/modules.yaml similarity index 100% rename from roles/ubuntu/tasks/modules.yml rename to roles/ubuntu/tasks/modules.yaml diff --git a/roles/ubuntu/tasks/packages-cli.yml b/roles/ubuntu/tasks/packages-cli.yaml similarity index 100% rename from roles/ubuntu/tasks/packages-cli.yml rename to roles/ubuntu/tasks/packages-cli.yaml diff --git a/roles/ubuntu/tasks/packages-gui.yml b/roles/ubuntu/tasks/packages-gui.yaml similarity index 100% rename from roles/ubuntu/tasks/packages-gui.yml rename to roles/ubuntu/tasks/packages-gui.yaml diff --git a/roles/ubuntu/tasks/ssh.yml b/roles/ubuntu/tasks/ssh.yaml similarity index 100% rename from roles/ubuntu/tasks/ssh.yml rename to roles/ubuntu/tasks/ssh.yaml diff --git a/user-cli.yml b/user-cli.yaml similarity index 100% rename from user-cli.yml rename to user-cli.yaml diff --git a/user-gui.yml b/user-gui.yaml similarity index 100% rename from user-gui.yml rename to user-gui.yaml