Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dotfiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
hosts: local
tasks:
- debug:
var: ansible_os_family
var: ansible_facts.os_family
verbosity: 1
tags:
- "git"
Expand Down
2 changes: 1 addition & 1 deletion roles/firefox/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
profiles_dir: >-
{{
(found_profiles_ini | dirname ~ '/Profiles')
if (ansible_os_family == 'Darwin')
if (ansible_facts.os_family == 'Darwin')
else (found_profiles_ini | dirname)
}}
when: found_profiles_ini != ""
Expand Down
2 changes: 1 addition & 1 deletion roles/fzf/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- include_tasks: debian.yml
when: ansible_os_family == "Debian"
when: ansible_facts.os_family == "Debian"

- name: Update fzf
git:
Expand Down
2 changes: 1 addition & 1 deletion roles/git/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- include_tasks: debian.yml
when: ansible_os_family == "Debian"
when: ansible_facts.os_family == "Debian"

- name: Check if gitconfig exists
stat: path="{{dotfiles_user_home}}/.gitconfig"
Expand Down
2 changes: 1 addition & 1 deletion roles/haskell/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- include_tasks: debian.yml
when: ansible_os_family == "Debian"
when: ansible_facts.os_family == "Debian"

- name: create stack directory
file:
Expand Down
1 change: 1 addition & 0 deletions roles/nvim/files/.luarc.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@
"tests/types"
],
"workspace.checkThirdParty": "Disable",
"workspace.ignoreDir": ["plugin/packer_compiled.lua"],
"diagnostics.disable": ["different-requires"]
}
2 changes: 1 addition & 1 deletion roles/nvim/files/selene.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
std = "neovim"

# lazy.nvim's generated lockfile is not hand-written Lua.
exclude = ["lazy-lock.json"]
exclude = ["lazy-lock.json", "plugin/packer_compiled.lua"]

[lints]
# Neovim/plugin APIs are loosely typed; mixed-table literals (list + map) are
Expand Down
2 changes: 1 addition & 1 deletion roles/nvim/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- include_tasks: debian.yml
when: ansible_os_family == "Debian"
when: ansible_facts.os_family == "Debian"

- name: Install bob-nvim with cargo-binstall
command: "{{ dotfiles_user_home }}/.cargo/bin/cargo-binstall -y bob-nvim"
Expand Down
6 changes: 3 additions & 3 deletions roles/packages/tasks/debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
dest: "/etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list"
become: true
become_method: sudo
when: ansible_distribution_version == "20.04"
when: ansible_facts.distribution_version == "20.04"

- name: Install podman apt-key
apt_key:
url: "https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_{{ ansible_distribution_version }}/Release.key"
url: "https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_{{ ansible_facts.distribution_version }}/Release.key"
state: present
become: true
become_method: sudo
when: ansible_distribution_version == "20.04"
when: ansible_facts.distribution_version == "20.04"

- name: Download 1Password GPG key
get_url:
Expand Down
8 changes: 4 additions & 4 deletions roles/packages/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
- include_tasks: debian.yml
when: ansible_os_family == "Debian"
when: ansible_facts.os_family == "Debian"
- include_tasks: arch.yml
when: ansible_os_family == "Archlinux"
when: ansible_facts.os_family == "Archlinux"

- name: Install global npm packages to user local bin
block:
- name: install bash-language-server
community.general.npm:
name: "bash-language-server"
global: true
when: ansible_os_family != "Archlinux"
when: ansible_facts.os_family != "Archlinux"

- name: install prettier
community.general.npm:
Expand All @@ -21,7 +21,7 @@
community.general.npm:
name: "@mermaid-js/mermaid-cli"
global: true
when: ansible_os_family != "Archlinux"
when: ansible_facts.os_family != "Archlinux"
environment:
NPM_CONFIG_PREFIX: "{{ dotfiles_user_home }}/.local"
when: not ansible_check_mode
2 changes: 1 addition & 1 deletion roles/penrose/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- include_tasks: debian.yml
when: ansible_os_family == "Debian"
when: ansible_facts.os_family == "Debian"

- name: Fetch penrose (favilrose) git repo
git:
Expand Down
4 changes: 2 additions & 2 deletions roles/programming/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- include_tasks: debian.yml
when: ansible_os_family == "Debian"
when: ansible_facts.os_family == "Debian"
- include_tasks: arch.yml
when: ansible_os_family == "Archlinux"
when: ansible_facts.os_family == "Archlinux"

- name: download rustup
get_url:
Expand Down
4 changes: 2 additions & 2 deletions roles/zsh/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- include_tasks: debian.yml
when: ansible_os_family == "Debian"
when: ansible_facts.os_family == "Debian"
- include_tasks: arch.yml
when: ansible_os_family == "Archlinux"
when: ansible_facts.os_family == "Archlinux"

- name: download oh-my-zsh installer
get_url:
Expand Down
Loading