run as user fixes

playbooks/roles/base_terminal/tasks/setup-context.yml

@@ -1,6 +1,14 @@
+- name: Ensure dir
+  tags:
+    - config
+  ansible.builtin.file:
+    path: "{{ context.path }}"
+    state: directory
+    owner: "{{ username }}"
+    mode: "700"
+
 - name: Setup context env
   tags:
-    - git
     - config
   ansible.builtin.template:
     src: "../templates/envrc.context.j2"

playbooks/roles/env_develop/defaults/main.yml

@@ -0,0 +1 @@
+install_with_root: true

playbooks/roles/env_develop/tasks/install.yml

@@ -1,33 +0,0 @@
----
-- 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/env_develop/tasks/main.yml

@@ -15,6 +15,7 @@
 - name: "Install dependencies"
   tags:
     - install
+  become: "{{ install_with_root }}"
   when: env_develop_pkgs
   ansible.builtin.package:
     name: "{{ env_develop_pkgs }}"

playbooks/roles/env_terminal/defaults/main.yml

@@ -0,0 +1 @@
+install_with_root: true

playbooks/roles/env_terminal/tasks/main.yml

@@ -13,6 +13,7 @@
       skip: true
 
 - name: "Install dependencies"
+  become: "{{ install_with_root }}"
   tags:
     - install
   when: terminal_pkgs

playbooks/roles/software_git/templates/gitconfig.context.j2

@@ -11,7 +11,12 @@
   format = ssh
 
 [gpg "ssh"]
+{% if mac_os %}
   program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
+{% else %}
+  program = "/opt/1Password/op-ssh-sign"
+{% endif %}
+
 {% endif %}
 
 {% if 'replacements' in git %}

playbooks/roles/software_nvim/defaults/main.yml

@@ -0,0 +1 @@
+install_with_root: true

playbooks/roles/software_nvim/tasks/main.yml

@@ -2,6 +2,7 @@
 - name: Install dependencies
   tags:
     - install
+  become: "{{ install_with_root }}"
   ansible.builtin.package:
     name:
       - neovim

playbooks/roles/software_nvm/defaults/main.yml

@@ -0,0 +1 @@
+install_with_root: true

playbooks/roles/software_nvm/tasks/main.yml

@@ -1,5 +1,6 @@
 ---
 - name: Install dependencies
+  become: "{{ install_with_root }}"
   ansible.builtin.package:
     name:
       - git

playbooks/roles/software_ssh/tasks/main.yml

@@ -1,29 +1,18 @@
-- name: Copy config
+---
+- name: Ensure dir
   tags:
-    - git
     - config
   ansible.builtin.file:
-    mode: "{{ item.mode }}"
+    path: "{{ home }}/.ssh"
-    path: "{{ home }}/{{ item.path }}"
+    mode: "0700"
     owner: "{{ username }}"
     state: directory
-  with_community.general.filetree:
-    - ../files
-  loop_control:
-    label: "{{ item.path }}"
-  when: item.state == 'directory'
 
-- name: "Copy configs"
+- name: Setup config
   tags:
-    - git
     - config
-  ansible.builtin.copy:
+  ansible.builtin.template:
-    src: "{{ item.src }}"
+    src: "../templates/config.j2"
-    dest: "{{ home }}/{{ item.path }}"
+    dest: "{{ home }}/.ssh/config"
-    mode: "{{ item.mode }}"
     owner: "{{ username }}"
-  with_community.general.filetree:
+    mode: "644"
-    - ../files
-  loop_control:
-    label: "{{ item.path }}"
-  when: item.state == 'file'

playbooks/roles/software_ssh/templates/config.j2

@@ -5,6 +5,10 @@ Include ~/.ssh/config.d/*
 Host *
   Controlmaster auto
   Controlpath /tmp/ssh-%r@%h:%p
+  {% if mac_os %}
   IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
+  {% else %}
+  IdentityAgent ~/.1password/agent.sock
+  {% endif %}
   ForwardAgent yes
 

playbooks/roles/software_tmux/files/.tmux.conf

@@ -1,5 +1,5 @@
 set -g mouse on
-set -g default-terminal "screen-256color-bce"
+#set -g default-terminal "screen-256color-bce"
 #set -g status-justify centre
 
 #set -ga terminal-overrides ',xterm-256color:Tc'

playbooks/roles/software_zsh/defaults/main.yml

@@ -0,0 +1 @@
+install_with_root: true

playbooks/roles/software_zsh/tasks/main.yml

@@ -2,6 +2,7 @@
 - name: Install core dependencies
   tags:
     - install
+  become: "{{ install_with_root }}"
   ansible.builtin.package:
     name:
       - zsh