Enhance Linux and macOS development station configurations:

- Add user management and Oh My Zsh settings
- Update service scripts to use Zsh
- Include new packages and environment variables
- Modify Terraform configuration for upstream services

ansible/roles/macos_dev_station/defaults/main.yml

@@ -39,6 +39,25 @@ macos_dev_station_copilot_fail_on_error: false
 
 macos_dev_station_oh_my_zsh_enabled: true
 macos_dev_station_oh_my_zsh_install_url: "https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh"
+macos_dev_station_oh_my_zsh_theme: "agnoster"
+macos_dev_station_oh_my_zsh_plugins:
+  - git
+  - fzf
+  - common-aliases
+  - sudo
+  - tmux
+  - extract
+  - colored-man-pages
+  - history-substring-search
+  - kubectl
+  - docker
+  - docker-compose
+  - ansible
+  - aws
+  - golang
+  - brew
+  - bgnotify
+macos_dev_station_zshrc_extra_env: {}
 
 macos_dev_station_colima_enabled: true
 macos_dev_station_colima_cpu: 4

ansible/roles/macos_dev_station/tasks/main.yml

@@ -165,6 +165,43 @@
     - macos_dev_station_service_user_enabled | bool
     - macos_dev_station_oh_my_zsh_enabled | bool
 
+- name: Ensure .zshrc sources Oh My Zsh
+  become: true
+  ansible.builtin.blockinfile:
+    path: "{{ macos_dev_station_service_home }}/.zshrc"
+    block: |
+      # ansible: macos_dev_station oh-my-zsh
+      export ZSH="$HOME/.oh-my-zsh"
+      ZSH_THEME="{{ macos_dev_station_oh_my_zsh_theme }}"
+      plugins=({{ macos_dev_station_oh_my_zsh_plugins | join(' ') }})
+      source "$ZSH/oh-my-zsh.sh"
+    marker: "# {mark} ansible: macos_dev_station oh-my-zsh"
+    create: true
+    mode: "0644"
+    owner: "{{ macos_dev_station_service_user }}"
+    group: "{{ macos_dev_station_service_group }}"
+  when:
+    - macos_dev_station_service_user_enabled | bool
+    - macos_dev_station_oh_my_zsh_enabled | bool
+
+- name: Ensure .zshrc has extra environment variables
+  become: true
+  ansible.builtin.blockinfile:
+    path: "{{ macos_dev_station_service_home }}/.zshrc"
+    block: |
+      # ansible: macos_dev_station extra env vars
+      {% for env_key, env_value in macos_dev_station_zshrc_extra_env.items() %}
+      export {{ env_key }}="{{ env_value }}"
+      {% endfor %}
+    marker: "# {mark} ansible: macos_dev_station extra env vars"
+    create: true
+    mode: "0644"
+    owner: "{{ macos_dev_station_service_user }}"
+    group: "{{ macos_dev_station_service_group }}"
+  when:
+    - macos_dev_station_service_user_enabled | bool
+    - macos_dev_station_zshrc_extra_env | length > 0
+
 - name: Ensure .zshrc has ssh-agent startup for devstation
   become: true
   ansible.builtin.blockinfile: