Refactor

8 files changed, 27 insertions, 34 deletions

diff --git a/.bashrc b/.bashrc
index a37d60f..b92a0f3 100644
--- a/.bashrc
+++ b/.bashrc
@@ -2,7 +2,7 @@
 # ~/.bashrc
 #
 
-[ "$(uname)" = Darwin ] && source "$HOME/.macos"
+source "$HOME/.macos"
 source "$HOME/.env"
 source "$HOME/.path"
 
@@ -17,11 +17,11 @@ source "$HOME/.fzfrc"
 [ -r "$HOME/.bash_local" ] && source "$HOME/.bash_local"
 
 if command -v fish > /dev/null; then
-    __FISH_IS_ACTIVE=${__FISH_IS_ACTIVE:-0}
-    if [[ -z ${BASH_EXECUTION_STRING} && $__FISH_IS_ACTIVE -eq 0 ]]
+    __FISH_IS_ACTIVE="$__FISH_IS_ACTIVE"
+    if [[ -z "$BASH_EXECUTION_STRING" && -z "$__FISH_IS_ACTIVE" ]]
     then
         shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=''
-        exec env __FISH_IS_ACTIVE=1 fish $LOGIN_OPTION
+        exec env __FISH_IS_ACTIVE=1 SHELL="$(which fish)" fish $LOGIN_OPTION
     fi
-    export __FISH_IS_ACTIVE=0
+    unset __FISH_IS_ACTIVE
 fi
diff --git a/.config/fish/conf.d/init-fzf.fish b/.config/fish/conf.d/init-fzf.fish
deleted file mode 100644
index d1c2d33..0000000
--- a/.config/fish/conf.d/init-fzf.fish
+++ /dev/null
@@ -1,9 +0,0 @@
-command -v fzf > /dev/null || exit 0
-
-if is_mac;
-    source $(brew --prefix fzf)/shell/key-bindings.fish
-end
-
-function fish_user_key_bindings
-    fzf_key_bindings
-end
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 6a16e19..72524a6 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -1,8 +1,14 @@
 if status is-interactive
     set -g fish_greeting
+
     set -g __fish_git_prompt_showdirtystate 1
     set -g __fish_git_prompt_showuntrackedfiles 1
     set -g __fish_git_prompt_showcolorhints 1
+
+    bind \cx\ce edit_command_buffer
+
+    source "$HOME/.macos"
+
     command -v zoxide > /dev/null && zoxide init --cmd j fish | source
     command -v navi > /dev/null && eval "$(navi widget fish)"
 
@@ -14,8 +20,10 @@ if status is-interactive
         end
     end
 
-    command -v tig > /dev/null && function tigs; tig status; end
-    command -v git > /dev/null && function g; git $argv; end
+    if command -v fzf > /dev/null;
+        [ -n "$IS_MACOS" ] && source "$(brew --prefix fzf)/shell/key-bindings.fish"
+        function fish_user_key_bindings; fzf_key_bindings; end
+    end
 
     source "$HOME/.aliases"
 
diff --git a/.config/fish/functions/is_mac.fish b/.config/fish/functions/is_mac.fish
deleted file mode 100644
index 51c7cbd..0000000
--- a/.config/fish/functions/is_mac.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function is_mac
-    [ $(uname) = Darwin ] && return 0 || return 1
-end
-
diff --git a/.config/git/ignore b/.config/git/ignore
index f5a0259..92285c4 100644
--- a/.config/git/ignore
+++ b/.config/git/ignore
@@ -1,8 +1,11 @@
 .DS_Store
 compile_commands.json
 
+tags
 gtags.conf
 gtags.files
 GTAGS
 GRTAGS
 GPATH
+
+.rgignore
diff --git a/.macos b/.macos
index f154236..f28342f 100644
--- a/.macos
+++ b/.macos
@@ -1,23 +1,18 @@
 #!/usr/bin/env bash
 
-macos_update_path () {
-    new_path=$1
-    [ -d $new_path ] && export PATH=$new_path:$PATH
-}
+[ $(uname) = Darwin ] || return
 
-macos_update_path /usr/local/opt/openjdk/bin
-macos_update_path /usr/local/opt/ruby/bin
-macos_update_path /usr/local/opt/llvm/bin
+export IS_MACOS=1
 
 export BROWSER='open'
-
 alias bug='brew upgrade --greedy'
 
-if [[ $(spctl --status) == 'assessments enabled' ]]; then
-    echo 'Software installment is limited again. Password is required to remove the limit.'
+[ "$(spctl --status)" = 'assessments enabled' ] &&
+    echo 'Software installment is limited again. Password is required to remove the limit.' &&
     sudo spctl --master-disable
-fi
 
-[[ $(arch) = "arm64" ]] &&
+[ $(arch) = 'arm64' ] &&
+    [ -x /opt/homebrew/bin/brew ] &&
     eval "$(/opt/homebrew/bin/brew shellenv)" ||
+    [ -x /usr/local/Homebrew/bin/brew ] &&
     eval "$(/usr/local/Homebrew/bin/brew shellenv)"
diff --git a/.vim/after/ftplugin/ruby.vim b/.vim/after/ftplugin/ruby.vim
index e867f90..50c0c61 100644
--- a/.vim/after/ftplugin/ruby.vim
+++ b/.vim/after/ftplugin/ruby.vim
@@ -1,3 +1,4 @@
 setlocal shiftwidth=2
 setlocal softtabstop=2
 setlocal foldmethod=indent
+setlocal iskeyword+=!,?
diff --git a/.zshrc b/.zshrc
index c6182f4..3865f6c 100644
--- a/.zshrc
+++ b/.zshrc
@@ -11,8 +11,7 @@ HISTSIZE=1000
 SAVEHIST=1000
 HISTFILE=~/.zsh_history
 
-[[ $(uname) == Darwin ]] &&
-    source "$HOME/.macos"
+source "$HOME/.macos"
 
 source $HOME/.path
 source $HOME/.env