From c596fcb87a0a3404fee08ffef6a467a289ae5ac6 Mon Sep 17 00:00:00 2001 From: "Kenneth Benzie (Benie)" Date: Sat, 18 Jun 2022 21:15:40 +0100 Subject: [PATCH] Split out fzf from zsh into its own role --- Unix.yaml | 1 + Windows.yaml | 1 + roles/{zsh => fzf}/handlers/main.yaml | 2 +- roles/fzf/tasks/Darwin.yaml | 5 +++++ roles/fzf/tasks/Debian-old.yaml | 13 +++++++++++++ roles/fzf/tasks/Debian.yaml | 12 ++++++++++++ roles/fzf/tasks/Windows.yaml | 5 +++++ roles/fzf/tasks/main.yaml | 2 ++ roles/zsh/tasks/main.yaml | 11 ----------- 9 files changed, 40 insertions(+), 12 deletions(-) rename roles/{zsh => fzf}/handlers/main.yaml (51%) create mode 100644 roles/fzf/tasks/Darwin.yaml create mode 100644 roles/fzf/tasks/Debian-old.yaml create mode 100644 roles/fzf/tasks/Debian.yaml create mode 100644 roles/fzf/tasks/Windows.yaml create mode 100644 roles/fzf/tasks/main.yaml diff --git a/Unix.yaml b/Unix.yaml index 3bb0f63..f65ca1b 100644 --- a/Unix.yaml +++ b/Unix.yaml @@ -9,6 +9,7 @@ - role: ag - role: bat + - role: fzf - role: git - role: op - role: tree diff --git a/Windows.yaml b/Windows.yaml index 8c258f2..43eec63 100644 --- a/Windows.yaml +++ b/Windows.yaml @@ -7,6 +7,7 @@ - role: system-info - role: ag + - role: fzf - role: git - role: op - role: tree diff --git a/roles/zsh/handlers/main.yaml b/roles/fzf/handlers/main.yaml similarity index 51% rename from roles/zsh/handlers/main.yaml rename to roles/fzf/handlers/main.yaml index e1f75b7..04ac069 100644 --- a/roles/zsh/handlers/main.yaml +++ b/roles/fzf/handlers/main.yaml @@ -1,4 +1,4 @@ --- - name: install fzf binaries command: - cmd: ~/.config/zsh/fzf/install --bin + cmd: ~/.local/src/fzf/install --bin diff --git a/roles/fzf/tasks/Darwin.yaml b/roles/fzf/tasks/Darwin.yaml new file mode 100644 index 0000000..e9d1cb0 --- /dev/null +++ b/roles/fzf/tasks/Darwin.yaml @@ -0,0 +1,5 @@ +--- +- name: install homebrew package + homebrew: + name: fzf + state: latest diff --git a/roles/fzf/tasks/Debian-old.yaml b/roles/fzf/tasks/Debian-old.yaml new file mode 100644 index 0000000..accd93e --- /dev/null +++ b/roles/fzf/tasks/Debian-old.yaml @@ -0,0 +1,13 @@ +--- +- name: clone fzf repo + git: + repo: https://github.com/junegunn/fzf.git + dest: ~/.local/src/fzf + notify: install fzf binaries +- meta: flush_handlers + +- name: create symbolic links + file: + state: link + src: ~/.local/src/fzf/bin/fzf + dest: ~/.local/bin/fzf diff --git a/roles/fzf/tasks/Debian.yaml b/roles/fzf/tasks/Debian.yaml new file mode 100644 index 0000000..d92d1bc --- /dev/null +++ b/roles/fzf/tasks/Debian.yaml @@ -0,0 +1,12 @@ +--- +- name: install apt package + when: ansible_distribution == "Debian" and + ansible_distribution_version == "unstable" + become: true + apt: + name: fzf + state: latest + +- include_tasks: Debian-old.yaml + when: not (ansible_distribution == "Debian" and + ansible_distribution_version == "unstable") diff --git a/roles/fzf/tasks/Windows.yaml b/roles/fzf/tasks/Windows.yaml new file mode 100644 index 0000000..fc683ff --- /dev/null +++ b/roles/fzf/tasks/Windows.yaml @@ -0,0 +1,5 @@ +--- +- name: install chocolatey package + win_chocolatey: + name: fzf + state: latest diff --git a/roles/fzf/tasks/main.yaml b/roles/fzf/tasks/main.yaml new file mode 100644 index 0000000..6853678 --- /dev/null +++ b/roles/fzf/tasks/main.yaml @@ -0,0 +1,2 @@ +--- +- include_tasks: '{{ansible_os_family}}.yaml' diff --git a/roles/zsh/tasks/main.yaml b/roles/zsh/tasks/main.yaml index 28cc3b7..1495b3d 100644 --- a/roles/zsh/tasks/main.yaml +++ b/roles/zsh/tasks/main.yaml @@ -21,13 +21,6 @@ - repo: https://github.com/zsh-users/zsh-completions.git dest: ~/.config/zsh/zsh-completions -- name: clone fzf repo - git: - repo: https://github.com/junegunn/fzf.git - dest: ~/.config/zsh/fzf - notify: install fzf binaries -- meta: flush_handlers - - name: create directories file: state: directory @@ -62,10 +55,6 @@ dest: ~/.local/share/zsh/site-functions/_layout - src: ~/.config/zsh/notes/_note dest: ~/.local/share/zsh/site-functions/_note - - src: ~/.config/zsh/fzf/bin/fzf - dest: ~/.local/bin/fzf - - src: ~/.config/zsh/fzf/bin/fzf-tmux - dest: ~/.local/bin/fzf-tmux - src: ~/.config/zsh/cmake-uninstall dest: ~/.local/bin/cmake-uninstall - src: ~/.config/zsh/$