mcfly

playbooks/launch

@@ -3,20 +3,26 @@ set -ex
 
 PATH="$PATH:$HOME/.local/bin"
 
+if [[ $(whoami) == "root" ]]; then
+    SUDO=""
+else
+    SUDO="sudo"
+fi
+
 if [[ $(command -v ansible) ]]; then 
     printf "ansible already installed\n"
 elif [[ $(uname) == "Linux" ]]; then
     if [[ $(command -v pacman) ]]; then
-        sudo pacman -Sy --noconfirm ansible
+        $SUDO pacman -Sy --noconfirm ansible
     elif [[ $(command -v zypper) ]]; then
-        sudo zypper install -y ansible
+        $SUDO zypper install -y ansible
-        sudo ln -sf /usr/bin/python3 /usr/bin/python
+        $SUDO ln -sf /usr/bin/python3 /usr/bin/python
     elif [[ $(command -v apt) ]]; then
-        sudo apt install -y ansible python3-apt python-is-python3
+        $SUDO apt install -y ansible python3-apt python-is-python3
     elif [[ $(command -v dnf) ]]; then
-        sudo dnf install ansible -y
+        $SUDO dnf install ansible -y
     elif [[ $(command -v emerge) ]]; then
-        sudo emerge ansible
+        $SUDO emerge ansible
     fi
 elif [[ $(uname) == "Darwin"  ]]; then
     if [[ ! $(command -v brew) ]]; then
@@ -26,7 +32,7 @@ elif [[ $(uname) == "Darwin"  ]]; then
     /usr/local/bin/brew install ansible
 fi
 
-ANSIBLE_PYTHON_INTERPRETER="$(which python)"
+ANSIBLE_PYTHON_INTERPRETER="$(command -v python)"
 ansible-galaxy install kewlfft.aur
 ansible-galaxy collection install community.general
 ansible-playbook --ask-become-pass -i inventory main.yml

playbooks/roles/arch/tasks/aur.yml

@@ -1,15 +1,18 @@
 ---
-- aur: name=paru
+- name: Install paru
+  aur: name=paru
   become: yes
   become_user: aur_builder
 
-- aur: name=neovim-nightly
+- name: Install neovim-nightly
+  aur: name=neovim-nightly
   become: yes
   become_user: aur_builder
   when: 
     - nightly_neovim == true
 
-- aur: name=mcfly
+- name: Install mcfly
+  aur: name=mcfly
   become: yes
   become_user: aur_builder
   when: 

zsh/funcs/sk_bindings

@@ -1,4 +1,5 @@
 #!/usr/bin/env zsh
+if [[ ${MCFLY_USED} != 1 ]]; then
     if zmodload zsh/parameter 2>/dev/null && (( ${+options} )); then
     __skim_key_bindings_options="options=(${(j: :)${(kv)options[@]}})"
     else
@@ -116,3 +117,4 @@ bindkey '^R' skim-history-widget
     eval $__skim_key_bindings_options
     'unset' '__skim_key_bindings_options'
     }
+fi

zsh/zshrc

@@ -135,6 +135,14 @@ if [[ -d $HOME/.anyenv ]]; then
     fi
 fi
 
+if [[ $(whence -p mcfly 2> /dev/null) ]]; then
+    znap eval mcfly 'mcfly init zsh'
+    export MCFLY_KEY_SCHEME=vim
+    export MCFLY_FUZZY=true
+    export MCFLY_RESULTS=50
+    export MCFLY_USED=1
+fi
+
 path+=($(yarn global bin))
 export PATH