From 3b31dc06fe6a03f2234a75e6d67269c58499f640 Mon Sep 17 00:00:00 2001 From: "Kenneth Benzie (Benie)" Date: Sat, 3 Jun 2023 11:19:03 +0100 Subject: [PATCH] Rearrange playbooks, add Linux specific ones --- playbooks/Linux.yaml | 3 +++ playbooks/LinuxCLI.yaml | 5 +++++ playbooks/UnixCLI.yaml | 7 ------- playbooks/UnixGUI.yaml | 1 - playbooks/WSL.yaml | 7 +++++-- playbooks/macOS.yaml | 4 ++++ 6 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 playbooks/Linux.yaml create mode 100644 playbooks/LinuxCLI.yaml diff --git a/playbooks/Linux.yaml b/playbooks/Linux.yaml new file mode 100644 index 0000000..8f0aec6 --- /dev/null +++ b/playbooks/Linux.yaml @@ -0,0 +1,3 @@ +--- +- import_playbook: LinuxCLI.yaml +- import_playbook: UnixGUI.yaml diff --git a/playbooks/LinuxCLI.yaml b/playbooks/LinuxCLI.yaml new file mode 100644 index 0000000..3bd2092 --- /dev/null +++ b/playbooks/LinuxCLI.yaml @@ -0,0 +1,5 @@ +--- +- hosts: localhost + roles: + - role: gdb + - role: system-info diff --git a/playbooks/UnixCLI.yaml b/playbooks/UnixCLI.yaml index 79b0ba7..3ed5a60 100644 --- a/playbooks/UnixCLI.yaml +++ b/playbooks/UnixCLI.yaml @@ -8,8 +8,6 @@ - role: zsh - role: neovim - role: tmux - - role: system-info - when: '"WSL" not in ansible_kernel' - role: ag - role: bash @@ -30,10 +28,5 @@ - role: wget - role: yq - - role: gdb - when: ansible_os_family != "Darwin" - role: llvm - role: nodejs - - - role: wsl - when: '"WSL" in ansible_kernel' diff --git a/playbooks/UnixGUI.yaml b/playbooks/UnixGUI.yaml index 635170a..dab2d80 100644 --- a/playbooks/UnixGUI.yaml +++ b/playbooks/UnixGUI.yaml @@ -1,5 +1,4 @@ --- -- import_playbook: UnixCLI.yaml - hosts: localhost roles: - role: 1password diff --git a/playbooks/WSL.yaml b/playbooks/WSL.yaml index 8d4672f..4e5a610 100644 --- a/playbooks/WSL.yaml +++ b/playbooks/WSL.yaml @@ -1,3 +1,6 @@ --- -- import_playbook: Unix.yaml -- import_playbook: Windows.yaml +- import_playbook: UnixCLI.yaml +- hosts: localhost + roles: + - role: gdb + - role: wsl diff --git a/playbooks/macOS.yaml b/playbooks/macOS.yaml index f9fe3e2..a255a0e 100644 --- a/playbooks/macOS.yaml +++ b/playbooks/macOS.yaml @@ -1,4 +1,8 @@ --- +- import_playbook: UnixCLI.yaml +- hosts: localhost + roles: + - role: system-info - import_playbook: UnixGUI.yaml - hosts: localhost roles: