update

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