Skip to content

Commit 1e1f336

Browse files
committed
fix(dotfiles): repair macos config setup
1 parent ed1c800 commit 1e1f336

File tree

3 files changed

+35
-12
lines changed

3 files changed

+35
-12
lines changed

roles/k9s/tasks/MacOSX.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,18 @@
44
name: k9s
55
state: present
66

7+
- name: "K9s | MacOSX | Ensure k9s config directory exists"
8+
ansible.builtin.file:
9+
path: "{{ ansible_facts['user_dir'] }}/Library/Application Support/k9s"
10+
state: directory
11+
mode: "0755"
12+
13+
- name: "K9s | MacOSX | Ensure k9s skins directory exists"
14+
ansible.builtin.file:
15+
path: "{{ ansible_facts['user_dir'] }}/Library/Application Support/k9s/skins"
16+
state: directory
17+
mode: "0755"
18+
719
- name: "K9s | Copy config"
820
ansible.builtin.copy:
921
dest: "{{ ansible_facts['user_dir'] }}/Library/Application Support/k9s/{{ item }}"

roles/neovim/files/lua/plugins/treesitter.lua

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
return {
22
"nvim-treesitter/nvim-treesitter",
3+
branch = "master",
34
build = ":TSUpdate",
45
event = {"BufReadPre", "BufNewFile"},
5-
keymaps = {
6+
keys = {
67
{ "n", "<leader>it", ":InspectTree<CR>" },
78
},
89
dependencies = {
910
"nvim-treesitter/nvim-treesitter-textobjects",
1011
},
1112
config = function()
1213
require('nvim-treesitter.configs').setup({
13-
-- A list of parser names, or "all"
14-
ensure_installed = "all",
14+
-- Install parsers on demand instead of trying to compile every parser at startup.
15+
ensure_installed = {},
1516
-- Ignore parsers that are known to have issues
1617
ignore_install = { "ipkg" },
1718
-- Install parsers synchronously (only applied to `ensure_installed`)
18-
sync_install = true,
19+
sync_install = false,
1920
-- Automatically install missing parsers when entering buffer
2021
-- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
2122
auto_install = true,

roles/taskfile/tasks/main.yml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,28 @@
3434

3535
- name: "TASKFILE | Calculate os config src"
3636
ansible.builtin.set_fact:
37-
taskfile_os_config: "{{ taskfile_os_distribution_config if taskfile_os_distribution_config.stat.exists else taskfile_os_family_config }}"
37+
taskfile_os_src: >-
38+
{{
39+
role_path ~ '/files/os/Taskfile_' ~ ansible_facts['distribution'] ~ '.yml'
40+
if taskfile_os_distribution_config.stat.exists else
41+
(
42+
role_path ~ '/files/os/Taskfile_' ~ ansible_facts['os_family'] ~ '.yml'
43+
if (
44+
taskfile_os_family_config is defined and
45+
taskfile_os_family_config.stat is defined and
46+
taskfile_os_family_config.stat.exists
47+
) else ''
48+
)
49+
}}
3850
39-
- name: "TASKFILE | Copy custom bash config for os: {{ taskfile_os_config.stat.path | basename }}"
51+
- name: "TASKFILE | Copy OS-specific Taskfile: {{ (taskfile_os_src | default('none', true)) | basename }}"
4052
ansible.builtin.copy:
4153
dest: "{{ ansible_facts['user_dir'] }}/Taskfile.yml"
42-
src: "{{ taskfile_os_config.stat.path }}"
54+
src: "{{ taskfile_os_src }}"
4355
mode: "0644"
4456
force: true
4557
when:
46-
- taskfile_os_config is defined
47-
- taskfile_os_config.stat.exists
58+
- taskfile_os_src | length > 0
4859

4960
- name: "TASKFILE | Mark Ansible-managed file."
5061
ansible.builtin.blockinfile:
@@ -54,7 +65,6 @@
5465
append_newline: true
5566
block: |
5667
# Ansible Managed File
57-
# Original file: {{ taskfile_os_config.stat.path | basename }}
68+
# Original file: {{ taskfile_os_src | basename }}
5869
when:
59-
- taskfile_os_config is defined
60-
- taskfile_os_config.stat.exists
70+
- taskfile_os_src | length > 0

0 commit comments

Comments
 (0)