playbooks/Windows.yaml

@@ -1,9 +1,29 @@
 ---
-- import_playbook: WindowsCLI.yaml
 - hosts: windows
   vars_files:
     - vars/environment.yaml
   roles:
+    - role: python
+    - role: git
+    - role: powershell
+    - role: neovim
+    - role: system-info
+
+    - role: ag
+    - role: bat
+    - role: curl
+    - role: fd
+    - role: fzf
+    - role: gh
+    - role: glab
+    - role: jq
+    - role: ripgrep
+    - role: tree
+    - role: yq
+
+    - role: llvm
+    - role: nodejs
+
     - role: 1password
     - role: autohotkey
     - role: cider
@@ -13,4 +33,3 @@
     - role: obsidian
     - role: powertoys
     - role: windows-terminal
-    # TODO: wezterm

playbooks/WindowsCLI.yaml

@@ -1,26 +0,0 @@
----
-- hosts: windows
-  vars_files:
-    - vars/environment.yaml
-  roles:
-    - role: scoop
-    - role: python
-    - role: git
-    - role: powershell
-    - role: neovim
-    - role: system-info
-
-    - role: ag
-    - role: bat
-    - role: curl
-    - role: fd
-    - role: fzf
-    - role: gh
-    - role: glab
-    - role: jq
-    - role: ripgrep
-    - role: tree
-    - role: yq
-
-    - role: llvm
-    - role: nodejs

roles/ag/tasks/Windows.yaml

@@ -1,10 +1,5 @@
 ---
-- name: remote chocolatey package
+- name: install chocolatey package
   win_chocolatey:
     name: ag
-    state: absent
-
-- name: install scoop package
-  community.windows.win_scoop:
-    name: ag
-    state: present
+    state: latest

roles/bat/tasks/Windows.yaml

@@ -1,10 +1,5 @@
 ---
-- name: remote chocolatey package
+- name: install chocolatey package
   win_chocolatey:
     name: Bat
-    state: absent
-
-- name: install scoop package
-  community.windows.win_scoop:
-    name: bat
-    state: present
+    state: latest

roles/curl/tasks/Windows.yaml

@@ -1,10 +1,5 @@
 ---
-- name: remove chocolatey package
+- name: install chocolatey package
   win_chocolatey:
     name: curl
-    state: absent
-
-- name: install scoop package
-  community.windows.win_scoop:
-    name: curl
-    state: present
+    state: latest

roles/fd/tasks/main.yaml

@@ -19,14 +19,8 @@
     name: fd
     state: latest
 
-- name: remove chocolatey package
+- name: install Chocolatey package
   when: ansible_os_family == 'Windows'
   win_chocolatey:
     name: fd
-    state: absent
-
-- name: install scoop package
-  when: ansible_os_family == 'Windows'
-  community.windows.win_scoop:
-    name: fd
-    state: present
+    state: latest

roles/fzf/tasks/Windows.yaml

@@ -1,10 +1,5 @@
 ---
-- name: remove chocolatey package
+- name: install chocolatey package
   win_chocolatey:
     name: fzf
-    state: absent
-
-- name: install scoop package
-  community.windows.win_scoop:
-    name: fzf
-    state: present
+    state: latest

roles/gh/tasks/Windows.yaml

@@ -1,10 +1,5 @@
 ---
-- name: remove chocolatey package
+- name: install chocolatey package
   win_chocolatey:
     name: gh
-    state: absent
-
-- name: install scoop package
-  community.windows.win_scoop:
-    name: gh
-    state: present
+    state: latest

roles/glab/tasks/Windows.yaml

@@ -1,12 +1,5 @@
 ---
-- name: remove chocolatey package
+- name: install chocolatey package
   win_chocolatey:
-    name:
-      - glab
-      - glab.portable
-    state: absent
-
-- name: install scoop package
-  community.windows.win_scoop:
     name: glab
-    state: present
+    state: latest

roles/jq/tasks/Windows.yaml

@@ -1,10 +1,5 @@
 ---
-- name: remote chocolatey package
+- name: install chocolatey package
   win_chocolatey:
     name: jq
-    state: absent
-
-- name: install scoop package
-  community.windows.win_scoop:
-    name: jq
-    state: present
+    state: latest

roles/ripgrep/tasks/main.yaml

@@ -19,13 +19,8 @@
     name: ripgrep
     state: latest
 
-- name: remove chocolatey package
+- name: install Chocolatey package
   when: ansible_os_family == 'Windows'
   win_chocolatey:
     name: ripgrep
-    state: absent
-
-- name: install scoop package
-  community.windows.win_scoop:
-    name: ripgrep
-    state: present
+    state: latest

roles/scoop/tasks/main.yaml

@@ -1,25 +0,0 @@
----
-- name: detect if scoop is installed
-  win_command: where.exe scoop
-  changed_when: false
-  failed_when: false
-  register: scoop_result
-
-- assert:
-    that: scoop_result.rc == 0
-    fail_msg: Scoop is not installed
-
-- name: add extras bucket
-  community.windows.win_scoop_bucket:
-    name: extras
-    state: present
-
-- name: install completions
-  community.windows.win_scoop:
-    name: scoop-completion
-    state: present
-
-- win_owner:
-    path: '{{ansible_env.LOCALAPPDATA}}/Scoop/buckets/extras'
-    user: '{{ansible_env.USERNAME}}'
-    recurse: true

roles/yq/tasks/Windows.yaml

@@ -1,10 +1,5 @@
 ---
-- name: remove chocolatey package
+- name: install chocolatey package
   win_chocolatey:
     name: yq
-    state: absent
-
-- name: install scoop package
-  community.windows.win_scoop:
-    name: yq
-    state: present
+    state: latest