fix(shell): fixes to zsh and bash configs

base/bashrc

@@ -14,10 +14,45 @@ source "$DOTFILES/config/shared.sh"
 # Import ssh keys in keychain
 ssh-add -A 2>/dev/null
 
-x-have oh-my-posh && {
-  eval "$(oh-my-posh init bash --config "$DOTFILES/config/omp/own.toml")"
-}
-
 x-have antidot && {
   eval "$(antidot init)"
 }
+
+# If not running interactively, don't do anything
+case $- in
+*i*) ;;
+*) return ;;
+esac
+
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
+  debian_chroot=$(cat /etc/debian_chroot)
+fi
+
+if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
+  # We have color support; assume it's compliant with Ecma-48
+  # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
+  # a case would tend to support setf rather than setaf.)
+  color_prompt=yes
+else
+  color_prompt=
+fi
+
+if [ "$color_prompt" = yes ]; then
+  PS1='${debian_chroot:+($debian_chroot)}\[\033[01;31m\]\u\[\033[01;33m\]@\[\033[01;36m\]\h \[\033[01;33m\]\w \[\033[01;35m\]\$ \[\033[00m\]'
+else
+  PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+fi
+unset color_prompt
+
+# If this is an xterm set the title to user@host:dir
+case "$TERM" in
+xterm* | rxvt*)
+  PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
+  ;;
+*) ;;
+esac
+
+x-have oh-my-posh && {
+  eval "$(oh-my-posh init bash --config "$DOTFILES/config/omp/own.toml")"
+}

base/zshenv

@@ -1,4 +1,5 @@
 # this is my zsh config. there are many like it, but this one is mine.
+# https://zsh.sourceforge.io/Intro/intro_3.html
 # shellcheck shell=bash
 
 # export VERBOSE=1
@@ -10,6 +11,16 @@ export PATH="$HOME/.local/bin:$DOTFILES/local/bin:$LOCAL_SHARE/nvim/mason/bin:$L
 export SHARED_SCRIPTS_SOURCED=0
 
 source "$DOTFILES/config/shared.sh"
+source "${XDG_CONFIG_HOME:-$HOME/.config}/asdf-direnv/zshrc"
+
+export ZDOTDIR="$DOTFILES/zsh"
+ZSH_COMPDUMP="$XDG_CACHE_HOME/zsh/zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
+
+# If not running interactively, don't do anything
+case $- in
+  *i*) ;;
+    *) return;;
+esac
 
 eval "$(oh-my-posh init zsh --config "$DOTFILES/config/omp/own.toml")"
 
@@ -88,19 +99,16 @@ setup_tmux_window_name_plugin()
   fi
 }
 
-main()
-{
-  load_antigen
-  source_fzf_config
-  setup_tmux_window_name_plugin
-  if x-have antidot; then
-    eval "$(antidot init)"
-  fi
-  source "${XDG_CONFIG_HOME:-$HOME/.config}/asdf-direnv/zshrc"
-}
-
-main "$@"
+load_antigen
+source_fzf_config
+setup_tmux_window_name_plugin
+if x-have antidot; then
+  eval "$(antidot init)"
+fi
 
 # Lando
 export PATH="$HOME/.lando/bin${PATH+:$PATH}"; #landopath
 
+autoload -Uz compinit bashcompinit
+compinit -d $ZSH_COMPDUMP
+bashcompinit

config/exports

@@ -14,22 +14,21 @@
 # if DOTFILES is not set, set it to the default location
 [ -z "$DOTFILES" ] && export DOTFILES="$HOME/.dotfiles"
 
+# zsh completions directory
+[ -z "$ZSH_COMPLETIONS" ] && export ZSH_COMPLETIONS="$XDG_CONFIG_HOME/zsh/completion"
+
 export PATH="$XDG_BIN_HOME:$DOTFILES/local/bin:$XDG_DATA_HOME/bob/nvim-bin:$XDG_DATA_HOME/cargo/bin:/opt/homebrew/bin:/usr/local/bin:$PATH"
 
-# Load bash completions if available for zsh
-if [[ -n "$ZSH_VERSION" ]]; then
-  autoload bashcompinit
-  bashcompinit
-fi
+# Add zsh completions to FPATH, compinit will be called later
+FPATH="$ZSH_COMPLETIONS:$FPATH"
 
 # Load asdf
 export ASDF_DIR="$XDG_BIN_HOME/asdf"
 if [[ -d $ASDF_DIR ]]; then
-  [[ -d $ASDF_DIR/completions ]] && fpath=("$ASDF_DIR/completions" $fpath)
-  [[ -d $ASDF_DIR/plugins ]] && fpath=("$ASDF_DIR/plugins" $fpath)
+  [[ -d $ASDF_DIR/completions ]] && FPATH="$ASDF_DIR/completions:$FPATH"
+  [[ -d $ASDF_DIR/plugins ]] && FPATH="$ASDF_DIR/plugins:$FPATH"
   source "$ASDF_DIR/asdf.sh"
 fi
-export PATH="$ASDF_DIR/bin:$ASDF_DIR/shims:$PATH"
 
 if ! command -v msg &> /dev/null; then
   # Function to print messages if VERBOSE is enabled
@@ -124,7 +123,7 @@ preexec()
 dfu()
 {
   (
-    cd "$DOTFILES" && git pull --ff-only && ./install
+    cd "$DOTFILES" && git rebase --ff --autostash && ./install
   )
 }
 

config/nvim/.editorconfig

@@ -15,3 +15,6 @@ trim_trailing_whitespace = true
 [*.md]
 max_line_length = off
 trim_trailing_whitespace = false
+
+[*.json]
+max_line_length = off

config/nvim/lua/options.lua

@@ -19,6 +19,9 @@ vim.g.colors_variant_dark = 'tokyonight-storm'
 -- Make sure editorconfig support is enabled
 vim.g.editorconfig = true
 
+-- Enable the colorcolumn
+vim.api.nvim_set_option_value('colorcolumn', '+1', { scope = 'global' })
+
 -- Enable line numbers and relative line numbers
 vim.opt.number = true
 vim.opt.relativenumber = true

config/nvim/lua/plugins/goto-preview.lua

@@ -19,7 +19,8 @@ return {
         hide_preview = false,
       },
     },
-    -- These two configs can also be passed down to the goto-preview definition and implementation calls for one off "peak" functionality.
+    -- These two configs can also be passed down to the goto-preview definition
+    -- and implementation calls for one off "peak" functionality.
     focus_on_open = true, -- Focus the floating window when opening it.
     dismiss_on_move = false, -- Dismiss the floating window when moving the cursor.
     force_close = true, -- passed into vim.api.nvim_win_close's second argument. See :h nvim_win_close

config/nvim/lua/plugins/ufo.lua

@@ -16,6 +16,28 @@ return {
         local builtin = require 'statuscol.builtin'
         require('statuscol').setup {
           relculright = true,
+          ft_ignore = {
+            'dashboard',
+            'NvimTree',
+            'help',
+            'vim',
+            'alpha',
+            'dashboard',
+            'neo-tree',
+            'Trouble',
+            'lazy',
+            'toggleterm',
+          },
+          bt_ignore = {
+            'help',
+            'vim',
+            'alpha',
+            'dashboard',
+            'neo-tree',
+            'Trouble',
+            'lazy',
+            'toggleterm',
+          },
           segments = {
             {
               text = { builtin.foldfunc },

config/nvim/lua/plugins/ui.lua

@@ -136,6 +136,10 @@ return {
     },
   },
 
+  -- Display a character as the colorcolumn
+  -- https://github.com/lukas-reineke/virt-column.nvim
+  { 'lukas-reineke/virt-column.nvim', opts = {} },
+
   -- icons
   {
     'echasnovski/mini.icons',