yep

11 files changed, 63 insertions, 54 deletions

diff --git a/.bash_profile b/.bash_profile
index e14bd96..663182a 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -1,12 +1,12 @@
+#!/usr/bin/env bash
 #
 # getchoo's bash_profile
 #
 
+source "${HOME}/.config/shell/profile"
 
 # add user's bin directory to path
-if [ -d "$HOME/.local/bin" ]
+if [ -d "${HOME}/.local/bin" ]
 then
-  export PATH="$HOME/.local/bin:$PATH"
+  export PATH="${HOME}/.local/bin:${PATH}"
 fi
-
-source "$HOME/.config/shell/profile"
diff --git a/.bashrc b/.bashrc
index 9df68f7..ee4a2bb 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,10 +1,16 @@
+#!/usr/bin/env bash
 #
 # getchoo's bashrc
 #
 
-
 # always source profile
-source "$HOME/.bash_profile"
+source "${HOME}/.bash_profile"
+
+# drop into fish
+## if [[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z ${BASH_EXECUTION_STRING} ]]
+## then
+##   exec fish
+## fi
 
 # options
 shopt -s cdspell
@@ -14,17 +20,12 @@ shopt -s globstar
 shopt -s nocaseglob
 shopt -s no_empty_cmd_completion
 
-export HISTFILE="$XDG_STATE_HOME/bash/history"
+export HISTFILE="${XDG_STATE_HOME}/bash/history"
 export HISTSIZE=100
 export HISTFILESIZE=1000
 
 # source aliases
-source "$XDG_CONFIG_HOME/shell/aliases"
+source "${XDG_CONFIG_HOME}/shell/aliases"
 
 # prompt
 PS1='[\u@\h \W]\$ '
-
-#if [[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z ${BASH_EXECUTION_STRING} ]]
-#then
-#  exec fish
-#fi
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 83a174e..f443c23 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -2,7 +2,6 @@
 # getchoo's config.fish
 #
 
-
 function set_envvars
   # add user bin directory to path
   if test -d "$HOME/.local/bin"
diff --git a/.config/fish/functions/ls.fish b/.config/fish/functions/ls.fish
index 17d7861..988d2dc 100644
--- a/.config/fish/functions/ls.fish
+++ b/.config/fish/functions/ls.fish
@@ -1,3 +1,3 @@
 function ls
-  exa $argv
+  exa --icons $argv
 end
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 9d1b943..16d20d5 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -20,4 +20,3 @@ opt.wrap = false
 opt.syntax = "on"
 cmd("colorscheme nord")
 opt.termguicolors = true
-opt.relativenumber = true
diff --git a/.config/nvim/lua/getchoo/plugins.lua b/.config/nvim/lua/getchoo/plugins.lua
index ba6e060..457b20f 100644
--- a/.config/nvim/lua/getchoo/plugins.lua
+++ b/.config/nvim/lua/getchoo/plugins.lua
@@ -76,7 +76,7 @@ require("packer").startup(function(use)
   })
 
   use("lewis6991/gitsigns.nvim")
-  use("rcarriga/nvim-notify")
+  use("ggandor/lightspeed.nvim")
 
   if Packer_bootstrap then
     require("packer").sync()
diff --git a/.config/shell/aliases b/.config/shell/aliases
index 1242b83..3bca572 100644
--- a/.config/shell/aliases
+++ b/.config/shell/aliases
@@ -1,2 +1,2 @@
-alias ls='ls --color=auto'
+alias ls='exa --icons'
 alias dotfiles='git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'
diff --git a/.config/shell/profile b/.config/shell/profile
index 9b380f4..aeecfde 100644
--- a/.config/shell/profile
+++ b/.config/shell/profile
@@ -1,8 +1,8 @@
 # xdg dirs
-export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_STATE_HOME="$HOME/.local/state"
-export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_DATA_HOME="${HOME}/.local/share"
+export XDG_CONFIG_HOME="${HOME}/.config"
+export XDG_STATE_HOME="${HOME}/.local/state"
+export XDG_CACHE_HOME="${HOME}/.cache"
 export XDG_DATA_DIRS="${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/}"
 export XDG_CONFIG_DIRS="/etc/xdg"
 
@@ -12,12 +12,12 @@ export VISUAL='nvim'
 export GPG_TTY=$(tty)
 
 # paths
-export CARGO_HOME="$XDG_DATA_HOME/cargo"
-export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
-export LESSHISTFILE="$XDG_STATE_HOME/less/history"
-export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
+export CARGO_HOME="${XDG_DATA_HOME}/cargo"
+export RUSTUP_HOME="${XDG_DATA_HOME}/rustup"
+export LESSHISTFILE="${XDG_STATE_HOME}/less/history"
+export NPM_CONFIG_USERCONFIG="${XDG_CONFIG_HOME}/npm/npmrc"
 export VIMINIT='let $MYVIMRC = !has("nvim") ? "$XDG_CONFIG_HOME/vim/vimrc" : "$XDG_CONFIG_HOME/nvim/init.lua" | so $MYVIMRC'
 
-dir_colors="$XDG_CONFIG_HOME/shell/dir_colors"
+dir_colors="${XDG_CONFIG_HOME}/shell/dir_colors"
 [[ -f "$dir_colors" ]] && eval $(dircolors "$dir_colors")
 unset dir_colors
diff --git a/.config/zsh/.zsh_plugins.txt b/.config/zsh/.zsh_plugins.txt
index 2c765d6..6d44543 100644
--- a/.config/zsh/.zsh_plugins.txt
+++ b/.config/zsh/.zsh_plugins.txt
@@ -1,5 +1,6 @@
-zsh-users/zsh-completions           kind:fpath path:src
-zsh-users/zsh-syntax-highlighting
-# ohmyzsh/ohmyzsh                     path:lib/git.zsh
-# halfo/lambda-mod-zsh-theme          kind:zsh
-romkatv/powerlevel10k
+# ohmyzsh/ohmyzsh path:lib/git.zsh kind:defer
+# halfo/lambda-mod-zsh-theme path:lambda-mod.zsh-theme
+romkatv/powerlevel10k path:powerlevel10k.zsh-theme
+
+zsh-users/zsh-completions kind:fpath path:src
+zsh-users/zsh-syntax-highlighting path:zsh-syntax-highlighting.plugin.zsh
diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv
index 0bab150..fefc8c3 100644
--- a/.config/zsh/.zshenv
+++ b/.config/zsh/.zshenv
@@ -2,13 +2,12 @@
 # getchoo's zshenv
 #
 
+source "${HOME}/.config/shell/profile"
 
 # add user's bin directory to path
 typeset -U path PATH
 
-if [[ -d "$HOME/.local/bin" ]]; then
-  path=("$HOME/.local/bin" "$path[@]")
+if [[ -d "${HOME}/.local/bin" ]]; then
+  path=("${HOME}/.local/bin" "$path[@]")
   export PATH
 fi
-
-source "$HOME/.config/shell/profile"
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index fb7a675..3857da9 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -2,18 +2,20 @@
 # getchoo's zshrc
 #
 
-# bootstrap antidote
-antidote_dir="$ZDOTDIR/.antidote"
-plugins_file="$ZDOTDIR/.zsh_plugins.txt"
-static_file="$ZDOTDIR/.zsh_plugins.zsh"
+local zdump="${XDG_CACHE_HOME}/zsh/zcompdump"
+local antidote_dir="${ZDOTDIR}/.antidote"
+local plugins_file="${ZDOTDIR}/.zsh_plugins.txt"
+local static_file="${ZDOTDIR}/.zsh_plugins.zsh"
 zstyle ':antidote:bundle' use-friendly-names 'yes' # don't use ugly dirs
 
+# recompile static file when needed
 if [[ ! "$static_file" -nt "$plugins_file" ]]
 then
-  [[ ! -e "$antidote_dir" ]] && \
+  # bootstrap antidote
+  [[ ! -e "$antidote_dir/antidote.zsh" ]] && \
     git clone --depth=1 https://github.com/mattmc3/antidote.git "$antidote_dir"
 
-  source "$antidote_dir/antidote.zsh"
+  source "${antidote_dir}/antidote.zsh"
   [[ ! -e "$plugins_file" ]] && touch "$plugins_file"
   antidote bundle < "$plugins_file" > "$static_file"
 fi
@@ -23,26 +25,34 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]
 fi
 
 # zmodules
-autoload -U compinit colors "$antidote_dir/antidote.zsh"
+autoload -Uz compinit colors "${antidote_dir}/antidote.zsh"
 colors
+zmodload zsh/zutil
 zmodload zsh/complist
-zstyle ':completion:*' menu select reshash true
-zstyle ':completion::complete:*' use-cache on
-
-# load plugins
-source "$static_file"
-unset antidote_dir
+zstyle ':completion::*' completer _extensions _complete _approximate
+zstyle ':completion::*' group-name ''
+zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
+zstyle ':completion:*' list-dirs-first true
+zstyle ':completion:*' menu select
+zstyle ':completion::*' use-cache on
+zstyle ':completion::*' cache-path "$zdump"
 
 # compile completion
-zdump="$ZDOTDIR/.zcompdump"
 compinit -d "$zdump"
-if [[ ! "$zdump.zwc" -nt "$zdump" ]]
+if [[ ! "${zdump}.zwc" -nt "$zdump" ]]
 then
   zcompile "$zdump"
 fi
 
+# load plugins
+source "$static_file"
+
 # options
-setopt append_history
+unsetopt hist_beep
+unsetopt list_beep
+setopt hist_expire_dups_first
+setopt hist_ignore_dups
+setopt hist_ignore_space
 setopt inc_append_history
 setopt prompt_subst
 setopt share_history
@@ -64,12 +74,12 @@ zle -N clear-screen-and-scrollback
 bindkey '^L' clear-screen-and-scrollback
 
 # enable history
-HISTFILE="$XDG_STATE_HOME/zsh/history"
+HISTFILE="${XDG_STATE_HOME}/zsh/history"
 HISTSIZE=100
 SAVEHIST=1000
 
 # source aliases
-source "$XDG_CONFIG_HOME/shell/aliases"
+source "${XDG_CONFIG_HOME}/shell/aliases"
 
 # To customize prompt, run `p10k configure` or edit ~/.config/zsh/.p10k.zsh.
 [[ ! -f ~/.config/zsh/.p10k.zsh ]] || source ~/.config/zsh/.p10k.zsh