Merge branch 'master' of ssh://git.mvl.sh/vleeuwenmenno/dotfiles
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
[workstations]
|
||||
mennos-laptop-w ansible_connection=local
|
||||
mennos-cachyos-laptop ansible_connection=local
|
||||
mennos-desktop ansible_connection=local
|
||||
mennos-cachyos-desktop ansible_connection=local
|
||||
|
||||
|
@@ -12,7 +12,7 @@
|
||||
|
||||
- name: Include workstation tasks
|
||||
ansible.builtin.import_tasks: tasks/workstations/workstation.yml
|
||||
when: inventory_hostname in ['mennos-laptop-w', 'mennos-desktop', 'mennos-cachyos-desktop']
|
||||
when: inventory_hostname in ['mennos-laptop-w', 'mennos-cachyos-laptop', 'mennos-desktop', 'mennos-cachyos-desktop']
|
||||
|
||||
- name: Include server tasks
|
||||
ansible.builtin.import_tasks: tasks/servers/server.yml
|
||||
|
@@ -29,6 +29,7 @@
|
||||
gitconfig_mapping:
|
||||
mennos-desktop: "$DOTFILES_PATH/config/git/gitconfig.wsl"
|
||||
mennos-cachyos-desktop: "$DOTFILES_PATH/config/git/gitconfig.linux"
|
||||
mennos-cachyos-laptop: "$DOTFILES_PATH/config/git/gitconfig.linux"
|
||||
mennos-laptop-w: "$DOTFILES_PATH/config/git/gitconfig.wsl"
|
||||
mennos-server: "$DOTFILES_PATH/config/git/gitconfig.mennos-server"
|
||||
mennos-cloud-server: "$DOTFILES_PATH/config/git/gitconfig.mennos-server"
|
||||
|
@@ -24,12 +24,13 @@
|
||||
ansible.builtin.import_tasks: tasks/workstations/snaps.yml
|
||||
when: ansible_facts.packages.snapd is defined and 'microsoft-standard-WSL2' not in ansible_kernel
|
||||
|
||||
- name: Include Zen browser tasks
|
||||
ansible.builtin.import_tasks: tasks/workstations/zen-browser.yml
|
||||
vars:
|
||||
browser_name: "zen"
|
||||
browser_executable: "zen"
|
||||
when: "'microsoft-standard-WSL2' not in ansible_kernel"
|
||||
# Disabled for now since we are not using Zen browser anymore in favor of Brave
|
||||
# - name: Include Zen browser tasks
|
||||
# ansible.builtin.import_tasks: tasks/workstations/zen-browser.yml
|
||||
# vars:
|
||||
# browser_name: "zen"
|
||||
# browser_executable: "zen"
|
||||
# when: "'microsoft-standard-WSL2' not in ansible_kernel"
|
||||
|
||||
- name: Include 1Password Browsers tasks
|
||||
ansible.builtin.import_tasks: tasks/workstations/1password-browsers.yml
|
||||
|
Reference in New Issue
Block a user