update

playbooks/image.yml

@@ -0,0 +1,5 @@
+---
+- name: Setup host
+  hosts: localhost
+  roles:
+    - role: terminal

playbooks/roles/desktop/vars/default/default.yml

@@ -1,5 +1,5 @@
 ---
-_desktop_casks:
+desktop_casks:
   - 1password
   - 1password-cli
   - kitty

playbooks/roles/dev/tasks/config.yml

@@ -0,0 +1,26 @@
+---
+- name: "Copy templates : {{ context }}"
+  tags:
+    - config
+  ansible.builtin.template:
+    src: "{{ item.src }}"
+    dest: "{{ home }}/{{ item.path | regex_replace('\\.j2$', '') }}"
+    mode: "{{ item.mode }}"
+  with_community.general.filetree:
+    - ../templates/{{ context }}
+  loop_control:
+    label: "{{ item.path }}"
+  when: item.state == 'file'
+
+- name: "Copy config : {{ context }}"
+  tags:
+    - config
+  ansible.builtin.copy:
+    src: "{{ item.src }}"
+    dest: "{{ home }}/{{ item.path }}"
+    mode: "{{ item.mode }}"
+  with_community.general.filetree:
+    - ../files/{{ context }}
+  loop_control:
+    label: "{{ item.path }}"
+  when: item.state == 'file'

playbooks/roles/dev/tasks/install.yml

@@ -0,0 +1,33 @@
+---
+- name: "Unload vars : {{ context }}"
+  ansible.builtin.include_vars: ../vars/empty.yml
+  tags:
+    - install
+
+- name: "Load vars : {{ context }}"
+  ansible.builtin.include_vars: "{{ item }}"
+  tags:
+    - install
+  with_first_found:
+    - files:
+        - "{{ ansible_distribution }}-{{ ansible_distribution_release }}.yml"
+        - "{{ ansible_distribution }}.yml"
+        - "{{ ansible_os_family }}.yml"
+        - default.yml
+      paths: ../vars/{{ context }}
+      skip: true
+
+- name: "Install dependencies : {{ context }}"
+  tags:
+    - install
+  when: desktop_pkgs
+  ansible.builtin.package:
+    name: "{{ dev_pkgs }}"
+
+- name: "Install casks : {{ context }}"
+  tags:
+    - install
+  when: dev_casks
+  community.general.homebrew_cask:
+    name: "{{ dev_casks }}"
+    state: installed

playbooks/roles/dev/tasks/main.yml

@@ -0,0 +1,16 @@
+---
+- name: Install context dependencies
+  ansible.builtin.include_tasks: install.yml
+  loop: "{{ contexts }}"
+  loop_control:
+    loop_var: context
+  tags:
+    - config
+
+- name: Configure contexts
+  ansible.builtin.include_tasks: config.yml
+  loop: "{{ contexts }}"
+  loop_control:
+    loop_var: context
+  tags:
+    - config

playbooks/roles/dev/vars/default/default.yml

@@ -0,0 +1,4 @@
+---
+dev_pkgs:
+  - rustup
+  - python3

playbooks/roles/dev/vars/empty.yml

@@ -0,0 +1,4 @@
+---
+dev_pkgs: []
+dev_casks: []
+dev_flatpaks: []

playbooks/roles/info/tasks/main.yml

@@ -2,7 +2,7 @@
   tags: always
   ansible.builtin.set_fact:
     username: alice
-    home: /Users/alice
+    home: "{{ ansible_env.HOME }}"
     use_become: true
     mac_os: "{{ ansible_distribution == 'MacOSX' }}"
     contexts: "{{ ['default'] + (contexts | default([])) }}"

playbooks/roles/system/tasks/main.yml

@@ -1,11 +1,6 @@
-- name: Install core dependencies
-  tags: always
-  ansible.builtin.package:
-    name:
-      - zsh
-
 - name: Create group
   when: not mac_os
+  become: true
   tags: always
   ansible.builtin.group:
     name: "{{ username }}"
@@ -13,10 +8,10 @@
 
 - name: Create user
   when: not mac_os
+  become: true
   tags: always
   ansible.builtin.user:
     name: "{{ username }}"
     update_password: "on_create"
     create_home: yes
-    shell: /usr/bin/zsh
     group: "{{ username }}"

playbooks/roles/terminal/files/default/.config/atuin/config.toml

@@ -0,0 +1,2 @@
+style = "compact"
+keymap_mode = "vim-normal"

playbooks/roles/terminal/files/default/.ssh/config

@@ -4,7 +4,7 @@ Include ~/.ssh/config.d/*
 
 Host *
   Controlmaster auto
-  Controlpath ${TMPDIR}/ssh-%r@%h:%p
+  Controlpath /tmp/ssh-%r@%h:%p
   IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
   ForwardAgent yes
 

playbooks/roles/terminal/meta/main.yml

@@ -2,3 +2,4 @@
 dependencies:
   - role: info
   - role: system
+  # - elliotweiser.osx-command-line-tools

playbooks/roles/terminal/tasks/config.yml

@@ -1,4 +1,16 @@
 ---
+- name: Copy config {{ context }}
+  tags:
+    - config
+  ansible.builtin.file:
+    path: "{{ home }}/{{ item.path }}"
+    state: directory
+  with_community.general.filetree:
+    - ../files/{{ context }}
+  loop_control:
+    label: "{{ item.path }}"
+  when: item.state == 'directory'
+
 - name: "Copy templates : {{ context }}"
   tags:
     - config

playbooks/roles/terminal/tasks/main.yml

@@ -1,4 +1,19 @@
 ---
+- name: Install core dependencies
+  tags:
+    - install
+  ansible.builtin.package:
+    name:
+      - zsh
+
+- name: Set shell
+  become: true
+  tags:
+    - config
+  ansible.builtin.user:
+    name: "{{ username }}"
+    shell: /usr/bin/zsh
+
 - name: Install context dependencies
   ansible.builtin.include_tasks: install.yml
   loop: "{{ contexts }}"
@@ -7,13 +22,16 @@
   tags:
     - config
 
-- name: Configure contexts
-  ansible.builtin.include_tasks: config.yml
-  loop: "{{ contexts }}"
-  loop_control:
-    loop_var: context
+- name: Clone nvm
   tags:
-    - config
+    - install
+  ansible.builtin.git:
+    accept_newhostkey: true
+    clone: true
+    force: true
+    recursive: false
+    repo: https://github.com/nvm-sh/nvm
+    dest: "{{ home }}/.nvm"
 
 - name: Install node and set version
   tags:
@@ -24,12 +42,16 @@
   args:
     executable: /bin/bash
 
-- name: Configure neovim
+- name: Setup nvim
+  tags:
+    - config
+    - nvim
+  include_tasks: "nvim.yml"
+
+- name: Configure contexts
+  ansible.builtin.include_tasks: config.yml
+  loop: "{{ contexts }}"
+  loop_control:
+    loop_var: context
   tags:
     - config
-  ansible.builtin.git:
-    repo: https://github.com/morten-olsen/nvim
-    dest: "{{ home }}/.config/nvim"
-    accept_newhostkey: true
-    clone: true
-    update: true

playbooks/roles/terminal/tasks/nvim.yml

@@ -0,0 +1,22 @@
+---
+- name: Configure neovim
+  tags:
+    - config
+    - nvim
+  ansible.builtin.git:
+    repo: https://github.com/morten-olsen/nvim
+    dest: "{{ home }}/.config/nvim"
+    accept_newhostkey: true
+    clone: true
+    update: true
+    force: true
+
+- name: Prepare neovim
+  tags:
+    - config
+    - nvim
+  register: nviminstall
+  changed_when: "nviminstall.stdout != ''"
+  ansible.builtin.shell: nvim --headless +q
+  args:
+    executable: /bin/bash

playbooks/roles/terminal/vars/default/default.yml

@@ -1,6 +1,6 @@
 ---
 terminal_pkgs:
-  - atuin
+  #- atuin
   - bat
   - eza
   - direnv
@@ -10,7 +10,7 @@ terminal_pkgs:
   - ripgrep
   - neovim
   - gh
-  - starship
+  #- starship
   - tmux
   - zoxide
   - git

playbooks/roles/update/tasks/main.yml

@@ -0,0 +1,4 @@
+- name: Update neovim lazy
+  ansible.builtin.run: 'nvim --headless "+Lazy! sync" +qa'
+  args:
+    executable: /bin/bash

playbooks/setup.yml

@@ -1,6 +1,6 @@
 ---
 - name: Setup host
-  hosts: all
+  hosts: desktops
   roles:
     - role: terminal
     - role: desktop