Update dotfiles to work on osx and linux

.bashrc

@@ -1,9 +1,8 @@
 # Navigation
 #alias ls="ls --color=auto"
-alias ls="exa-0.8.0 --long --header --git --group"
-alias cat="bat-0.10.0 --theme=GitHub"
-alias tree="exa-0.8.0 --tree"
-alias c="clear"
+alias ls="exa --long --header --git --group"
+alias cat="bat --theme=GitHub"
+alias tree="exa --tree"
 alias ..="cd ..;"
 alias la="ls -lhA"
 alias rmr="rm -r"
@@ -15,7 +14,18 @@ alias rmr="rm -r"
 HISTSIZE=50000
 HISTFILESIZE=50000
 HISTCONTROL=ignoredups:ignorespace
-shopt -s histappend
+
+if [[ "${OSTYPE}" == "linux-gnu"* ]]; then
+    # History
+    shopt -s histappend
+
+    for filename in ${HOME}/.ssh/*.pub; do
+        keyname="$(basename ${filename} .pub)"
+        eval $(keychain --nogui --eval --quiet ${keyname})
+    done
+elif [[ "${OSTYPE}" == "darwin"* ]]; then
+
+fi
 
 # Applications
 alias tmux="tmux -2"
@@ -28,11 +38,6 @@ export GPG_TTY=$(tty)
 # Golang
 export PATH=$PATH:/usr/local/go/bin:${HOME}/go/bin
 
-# enable bash completion in interactive shells
-if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
-    . /etc/bash_completion
-fi
-
 export TERM="xterm-256color"
 export EDITOR=$(which vim)
 
@@ -88,6 +93,12 @@ function fn() {
 	fi
 }
 
+# (f)ind (i)n (f)ile
+# usage: fif "text to search"
+function fif() {
+	rga $1 2>/dev/null
+}
+
 # Add color shortcuts
 if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
   c_reset=`tput sgr0`
@@ -143,17 +154,16 @@ to_md() {
     pandoc ${1} -t gfm | xclip -selection clipboard
 }
 
-# Prompt
-PS1="\n╔ \w\$(git_prompt) \$(kubectl_context)\n╚ \h\$ "
+if [ "$BASH" != "" ]; then
+    # Prompt
+    PS1="\n╔ \w\$(git_prompt) \$(kubectl_context)\n╚ \h\$ "
 
-for filename in ${HOME}/.ssh/*.pub; do
-    keyname="$(basename ${filename} .pub)"
-    eval $(keychain --nogui --eval --quiet ${keyname})
-done
+    # enable bash completion in interactive shells
+    if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
+        . /etc/bash_completion
+    fi
+elif [ "$ZSH_NAME" != "" ]; then
 
-# Starship Prompt
-# NOTE: This negates the above lines for PS1, kubectl_context, and git_prompt
-eval "$(starship init bash)"
+fi
 
-source /home/tgrosinger/.config/broot/launcher/bash/br
 source <(navi widget bash)

broot.conf.toml

@@ -1,90 +0,0 @@
-
-# This configuration file lets you define new commands
-# or change the shortcut or triggering keys of built-in verbs.
-# You can change the colors of broot too.
-#
-# Configuration documentation is available at https://dystroy.org/broot
-#
-
-#####################
-# user defined verbs:
-
-# If $EDITOR isn't set on your computer, you should either set it using
-#  something similar to
-#   export EDITOR=/usr/bin/nvim
-#  or just replace it with your editor of choice in the 'execution'
-#  pattern.
-# Example:
-#  execution = "/usr/bin/nvim {file}"
-[[verbs]]
-invocation = "edit"
-key = "F2"
-shortcut = "e"
-execution = "/usr/bin/vim {file}"
-
-[[verbs]]
-key = "ctrl-c"
-execution = ":quit"
-
-[[verbs]]
-invocation = "create {subpath}"
-execution = "$EDITOR {directory}/{subpath}"
-
-# If $PAGER isn't set on your computer, you should either set it
-#  or just replace it with your viewer of choice in the 'execution'
-#  pattern.
-# Example:
-#  execution = "less {file}"
-[[verbs]]
-name = "view"
-invocation = "view"
-execution = "$PAGER {file}"
-
-#####################
-# Skin
-
-# If you want to change the colors of broot,
-# uncomment the following bloc and start messing
-# with the various values
-# Note that some of those colors might not correcly
-# render on terminals with low capabilities
-#
-# [skin]
-# default = "gray(20) gray(1)"
-# tree = "rgb(89, 73, 101) none"
-# file = "gray(21) none"
-# directory = "rgb(255, 152, 0) none bold"
-# exe = "rgb(17, 164, 181) none"
-# link = "Magenta none"
-# pruning = "rgb(89, 73, 101) none Italic"
-# perm__ = "gray(5) None"
-# perm_r = "ansi(94) None"
-# perm_w = "ansi(132) None"
-# perm_x = "ansi(65) None"
-# owner = "gray(12) none"
-# group = "gray(12) none"
-# selected_line = "none gray(3)"
-# char_match = "yellow none"
-# file_error = "Red none"
-# flag_label = "gray(16) none"
-# flag_value = "rgb(255, 152, 0) none bold"
-# input = "White none"
-# status_error = "Red gray(2)"
-# status_job = "ansi(220) gray(5)"
-# status_normal = "gray(20) gray(3)"
-# status_italic = "rgb(255, 152, 0) None"
-# status_bold = "rgb(255, 152, 0) None bold"
-# status_code = "ansi(229) gray(5)"
-# status_ellipsis = "gray(19) gray(1)"
-# scrollbar_track = "rgb(80, 50, 0) none"
-# scrollbar_thumb = "rgb(255, 187, 0) none"
-# help_paragraph = "gray(20) none"
-# help_bold = "rgb(255, 187, 0) none bold"
-# help_italic = "Magenta rgb(30, 30, 40) italic"
-# help_code = "gray(21) gray(3)"
-# help_headers = "rgb(255, 187, 0) none"
-
-# You may find other skins on
-#  https://dystroy.org/broot/documentation/configuration/#colors
-# for example a skin suitable for white backgrounds
-

install.sh

@@ -20,6 +20,16 @@ GIT_REPO_BASE="https://github.com/tgrosinger/dotfiles"
 GIT_REPO="${GIT_REPO_BASE}.git"
 REPO_TAR="${GIT_REPO_BASE}/archive/master.tar.gz"
 
+
+if [[ "${OSTYPE}" == "linux-gnu"* ]]; then
+	BIN_DIR="bin/linux"
+elif [[ "${OSTYPE}" == "darwin"* ]]; then
+	BIN_DIR="bin/osx"
+else
+	echo "Unknown OS type"
+	exit 1
+fi
+
 ################################################################################
 # Define functions
 ################################################################################
@@ -29,6 +39,11 @@ function linkFile() {
     ln -fns ${REPO_DIR}/$1 $1;
 }
 
+# Remove a file if it exists then create a symlink from the file in $HOME/bin to the one contained in ${REPO_DIR}
+function linkBin() {
+    ln -fns ${REPO_DIR}/$1 $HOME/bin/$2;
+}
+
 # Create a directory named by first parameter. Delete directory first if it already exists.
 function createDirectory() {
     if [ -d $1 ]; then rm -rf $1; fi
@@ -59,14 +74,15 @@ function performSetup() {
 
     echo "Linking shell configs..."
     linkFile ".bashrc"
+    ln -fns ${REPO_DIR}/.bashrc .zshrc
 
-    echo "Linking vim..."
-    linkFile ".vim"
-    linkFile ".vimrc"
-
-    echo "Linking Broot..."
-    mkdir -p .config/broot
-    ln -fns broot.conf.toml .config/broot/conf.toml
+    if [[ "${OSTYPE}" == "linux-gnu"* ]]; then
+        echo "Linking vim..."
+        linkFile ".vim"
+        linkFile ".vimrc"
+    else
+        echo "Skipping vim, non-linux OS"
+    fi
 
     echo "Linking spacemacs..."
     echo "(note: you must install spacemacs separately)"
@@ -89,17 +105,25 @@ function performSetup() {
     ln -fns ${REPO_DIR}/navi  .local/share/navi
 
     echo "Linking bin files"
-    linkFile "bin/git-safedel"
-    linkFile "bin/diff-highlight"
-    linkFile "bin/exa-0.8.0"
-    linkFile "bin/bat-0.10.0"
-    linkFile "bin/diff-so-fancy"
-    linkFile "bin/broot"
-    linkFile "bin/navi"
+    linkBin "${BIN_DIR}/exa-0.9.0" "exa"
+    linkBin "${BIN_DIR}/bat-0.13.0" "bat"
+    linkBin "${BIN_DIR}/navi-2.5.1" "navi"
+    linkBin "${BIN_DIR}/jq-1.6" "jq"
+
+    echo "Linking scripts"
+    linkBin "scripts/diff-highlight" "diff-highlight"
+    linkBin "scripts/diff-so-fancy" "diff-so-fancy"
+    linkBin "scripts/git-metalint" "git-metalint"
+    linkBin "scripts/git-safedel" "git-safedel"
+    linkBin "scripts/git-top" "git-top"
 
     echo "Installing tmux plugins"
     git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
 
+    if [[ "${OSTYPE}" == "darwin"* ]]; then
+        brew install rsync rga pandoc poppler tesseract tmux ledger 
+    fi
+
     popd > /dev/null
 }