add zsh stuff

3 files changed, 261 insertions, 2 deletions

diff --git a/vim-new/init.vim b/vim-new/init.vim
index a663f6c..7fca7b6 100644
--- a/vim-new/init.vim
+++ b/vim-new/init.vim
@@ -1,5 +1,10 @@
 " Miguel's Fresh Neovim Config
-" 29th Apr 2021 - 02nd June 2021
+" 29th Apr 2021 - 14th June 2021
+"
+" link from ~/.config/nvim/init.vim
+" 1. install vim-plug
+" 2. run :PlugUpdate
+" 3. run :checkhealth
 
 " {{{ vim-plug
 call plug#begin('~/.vim/plugged')
@@ -197,5 +202,5 @@ nmap <leader>a :Rg |           " fuzzy find text in the working directory
 nmap <leader>c :Commands<cr>|  " fuzzy find Vim commands (like Ctrl-Shift-P in Sublime/Atom/VSC)
 nmap <leader>t :Tags<cr>|      " fuzzy find tags
 " }}}
-"
+
 let g:fzf_layout = { 'down': '~40%' }
diff --git a/zsh/zimrc b/zsh/zimrc
new file mode 100644
index 0000000..2a2bb68
--- /dev/null
+++ b/zsh/zimrc
@@ -0,0 +1,43 @@
+# Start configuration added by Zim install {{{
+# -------
+# Modules
+# -------
+
+# Sets sane Zsh built-in environment options.
+zmodule environment
+# Provides handy git aliases and functions.
+zmodule git
+# Applies correct bindkeys for input events.
+zmodule input
+# Sets a custom terminal title.
+zmodule termtitle
+# Utility aliases and functions. Adds colour to ls, grep and less.
+zmodule utility
+
+#
+# Prompt
+#
+# Exposes to prompts how long the last command took to execute, used by asciiship.
+zmodule duration-info
+# Exposes git repository status information to prompts, used by asciiship.
+zmodule git-info
+# A heavily reduced, ASCII-only version of the Spaceship and Starship prompts.
+# zmodule asciiship
+
+# Additional completion definitions for Zsh.
+zmodule zsh-users/zsh-completions
+# Enables and configures smart and extensive tab completion.
+# completion must be sourced after zsh-users/zsh-completions
+zmodule completion
+# Fish-like autosuggestions for Zsh.
+zmodule zsh-users/zsh-autosuggestions
+# Fish-like syntax highlighting for Zsh.
+# zsh-users/zsh-syntax-highlighting must be sourced after completion
+zmodule zsh-users/zsh-syntax-highlighting
+# Fish-like history search (up arrow) for Zsh.
+# zsh-users/zsh-history-substring-search must be sourced after zsh-users/zsh-syntax-highlighting
+zmodule zsh-users/zsh-history-substring-search
+# }}} End configuration added by Zim install
+
+zmodule exa
+zmodule fzf
diff --git a/zsh/zshrc b/zsh/zshrc
new file mode 100644
index 0000000..9d69dda
--- /dev/null
+++ b/zsh/zshrc
@@ -0,0 +1,211 @@
+if [ -z "$TMUX" ]
+then
+    tmux attach -t TMUX || tmux new -s TMUX
+fi
+
+# Start configuration added by Zim install {{{
+#
+# User configuration sourced by interactive shells
+#
+
+# -----------------
+# Zsh configuration
+# -----------------
+
+#
+# History
+#
+
+# Remove older command from the history if a duplicate is to be added.
+setopt HIST_IGNORE_ALL_DUPS
+
+#
+# Input/output
+#
+
+# Set editor default keymap to emacs (`-e`) or vi (`-v`)
+bindkey -v
+
+# Prompt for spelling correction of commands.
+#setopt CORRECT
+
+# Customize spelling correction prompt.
+#SPROMPT='zsh: correct %F{red}%R%f to %F{green}%r%f [nyae]? '
+
+# Remove path separator from WORDCHARS.
+WORDCHARS=${WORDCHARS//[\/]}
+
+
+# --------------------
+# Module configuration
+# --------------------
+
+#
+# completion
+#
+
+# Set a custom path for the completion dump file.
+# If none is provided, the default ${ZDOTDIR:-${HOME}}/.zcompdump is used.
+#zstyle ':zim:completion' dumpfile "${ZDOTDIR:-${HOME}}/.zcompdump-${ZSH_VERSION}"
+
+#
+# git
+#
+
+# Set a custom prefix for the generated aliases. The default prefix is 'G'.
+#zstyle ':zim:git' aliases-prefix 'g'
+
+#
+# input
+#
+
+# Append `../` to your input for each `.` you type after an initial `..`
+#zstyle ':zim:input' double-dot-expand yes
+
+#
+# termtitle
+#
+
+# Set a custom terminal title format using prompt expansion escape sequences.
+# See http://zsh.sourceforge.net/Doc/Release/Prompt-Expansion.html#Simple-Prompt-Escapes
+# If none is provided, the default '%n@%m: %~' is used.
+#zstyle ':zim:termtitle' format '%1~'
+
+#
+# zsh-autosuggestions
+#
+
+# Customize the style that the suggestions are shown with.
+# See https://github.com/zsh-users/zsh-autosuggestions/blob/master/README.md#suggestion-highlight-style
+#ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=242'
+
+#
+# zsh-syntax-highlighting
+#
+
+# Set what highlighters will be used.
+# See https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md
+ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
+
+# Customize the main highlighter styles.
+# See https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/main.md#how-to-tweak-it
+#typeset -A ZSH_HIGHLIGHT_STYLES
+#ZSH_HIGHLIGHT_STYLES[comment]='fg=242'
+
+# ------------------
+# Initialize modules
+# ------------------
+
+if [[ ! ${ZIM_HOME}/init.zsh -nt ${ZDOTDIR:-${HOME}}/.zimrc ]]; then
+  # Update static initialization script if it does not exist or it's outdated, before sourcing it
+  source ${ZIM_HOME}/zimfw.zsh init -q
+fi
+source ${ZIM_HOME}/init.zsh
+
+# ------------------------------
+# Post-init module configuration
+# ------------------------------
+
+#
+# zsh-history-substring-search
+#
+
+# Bind ^[[A/^[[B manually so up/down works both before and after zle-line-init
+bindkey '^[[A' history-substring-search-up
+bindkey '^[[B' history-substring-search-down
+
+# Bind up and down keys
+zmodload -F zsh/terminfo +p:terminfo
+if [[ -n ${terminfo[kcuu1]} && -n ${terminfo[kcud1]} ]]; then
+  bindkey ${terminfo[kcuu1]} history-substring-search-up
+  bindkey ${terminfo[kcud1]} history-substring-search-down
+fi
+
+bindkey '^P' history-substring-search-up
+bindkey '^N' history-substring-search-down
+bindkey -M vicmd 'k' history-substring-search-up
+bindkey -M vicmd 'j' history-substring-search-down
+# }}} End configuration added by Zim install
+
+ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#aaaaff,underline"
+
+alias vi=nvim
+EDITOR=nvim
+
+[ -f "/home/miguel/.ghcup/env" ] && source "/home/miguel/.ghcup/env" # ghcup-env
+
+bindkey -M viins 'jk' vi-cmd-mode
+
+autoload -U colors
+colors
+
+setopt nopromptbang prompt{cr,percent,sp,subst}
+
+zstyle ':zim:duration-info' threshold 0.1
+zstyle ':zim:duration-info' format '%d'
+
+autoload -Uz add-zsh-hook
+add-zsh-hook preexec duration-info-preexec
+add-zsh-hook precmd duration-info-precmd
+
+PRMPT_COL=#556677
+
+_prompt_miguel_vimode() {
+  case ${KEYMAP} in
+    vicmd) print -n "%F{red}%h%f%K{$PRMPT_COL}%F{black}%f%K{$PRMPT_COL}" ;;
+    *) print -n     "%F{$PRMPT_COL}%h%f%K{$PRMPT_COL}%F{black}%f%K{$PRMPT_COL}" ;;
+  esac
+}
+_prompt_miguel_keymap_select() {
+  zle reset-prompt
+  zle -R
+}
+
+autoload -Uz add-zle-hook-widget
+add-zle-hook-widget -Uz keymap-select _prompt_miguel_keymap_select
+
+typeset -gA git_info
+if (( ${+functions[git-info]} )); then
+  zstyle ':zim:git-info:branch' format '%b'
+  zstyle ':zim:git-info:commit' format 'HEAD %F{green}(%c)'
+  zstyle ':zim:git-info:action' format ' %F{yellow}(${(U):-%s})'
+  zstyle ':zim:git-info:stashed' format '\\\$'
+  zstyle ':zim:git-info:unindexed' format '!'
+  zstyle ':zim:git-info:indexed' format '+'
+  zstyle ':zim:git-info:ahead' format '>'
+  zstyle ':zim:git-info:behind' format '<'
+  zstyle ':zim:git-info:keys' format \
+      'status' '%S%I%i%A%B' \
+      'prompt' '%F{white}%b%c%s${(e)git_info[status]:+" %F{red}[${(e)git_info[status]}]"}%f
+'
+  add-zsh-hook precmd git-info
+fi
+
+function _miguel_check_last_exit_code() {
+  local LAST_EXIT_CODE=$?
+  if [[ $LAST_EXIT_CODE -ne 0 ]]; then
+    echo "%F{red}- $LAST_EXIT_CODE -%f"
+  else
+    echo "%F{$PRMPT_COL}%n@%m%f"
+  fi
+}
+
+function _miguel_shllvl() {
+    local LVL=''
+    if [[ $SHLVL -gt 2 ]]; then
+        for i in {3..$SHLVL}
+        do
+            if [ $(( $i % 2 )) -eq $(($SHLVL % 2)) ]; then
+                LVL+="%F{$PRMPT_COL}%K{black}%k%f"
+            else
+                LVL+="%F{black}%K{$PRMPT_COL}%k%f"
+            fi
+        done
+        echo $LVL
+    fi
+}
+
+add-zsh-hook precmd git-info
+
+PS1='${(e)git_info[prompt]}$(_miguel_shllvl)$(_prompt_miguel_vimode) %~%f%k%F{$PRMPT_COL}%f '
+RPS1='%(1j.%K{$PRMPT_COL}%B %j %b%k.) $duration_info $(_miguel_check_last_exit_code)'