refactor

Author: fspv

.bashrc

@@ -1,3 +1,6 @@
+# vim: ft=bash
+# shellcheck shell=bash
+
 source "${HOME}/.shrc"
 
 case "$-" in

.shrc

@@ -1,4 +1,5 @@
-# vim: ft=sh
+# vim: ft=bash
+# shellcheck shell=bash
 
 export LANGUAGE=en_US.UTF-8
 export LANG=en_US.UTF-8
@@ -258,6 +259,9 @@ then
     export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
 fi
 
+FZF_BASE="$(which fzf)"
+export FZF_BASE
+
 funsay() {
     if command -v ponysay >/dev/null 2>&1 && \
        command -v fortune >/dev/null 2>&1 && \

.zshrc

@@ -1,20 +1,17 @@
 # vim: ft=sh
-# Idempotent configs
-
-NIXPKGS_ALLOW_UNFREE=1
-export NIXPKGS_ALLOW_UNFREE
-
-# Everything else
 
 autoload -Uz compinit
 compinit
 
+# shellcheck source=/dev/null
 [ -f ~/.zshrc.local ] && source "${HOME}/.zshrc.local"
 
-
 if [[ -n "$FPATH_CUSTOM" ]]
 then
-    export FPATH="$FPATH:$FPATH_CUSTOM"
+    FPATH_CUSTOM_ARRAY=("${(@s/:/)FPATH_CUSTOM}")
+    for f in "${FPATH_CUSTOM_ARRAY[@]}"/*; do
+        fpath+=($f)
+    done
 fi
 
 # shellcheck source=/dev/null
@@ -81,9 +78,6 @@ zstyle ':fzf-tab:complete:cd:*' fzf-preview 'exa -1 --color=always $realpath'
 # switch group using `,` and `.`
 zstyle ':fzf-tab:*' switch-group ',' '.'
 
-FZF_BASE="$(which fzf)"
-export FZF_BASE
-
 function zvm_config() {
     ZVM_CURSOR_STYLE_ENABLE=false
 }