feat: drop oh-my-posh

Co-authored-by: ivuorinen <11024+ivuorinen@users.noreply.github.com>

.pre-commit-config.yaml

@@ -19,7 +19,7 @@ repos:
         args: [--autofix, --no-sort-keys]
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.42.0
+    rev: v0.43.0
     hooks:
       - id: markdownlint
         args: [-c, .markdownlint.yaml, --fix]

base/bashrc

@@ -18,12 +18,6 @@ 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)
@@ -52,7 +46,3 @@ xterm* | rxvt*)
   ;;
 *) ;;
 esac
-
-x-have oh-my-posh && {
-  eval "$(oh-my-posh init bash --config "$DOTFILES/config/omp/own.toml")"
-}

base/zshrc

@@ -14,8 +14,40 @@ source "$DOTFILES/config/shared.sh"
 source "${XDG_CONFIG_HOME:-$HOME/.config}/asdf-direnv/zshrc"
 
 ZSH_COMPDUMP="$XDG_CACHE_HOME/zsh/zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
-eval "$(oh-my-posh init zsh --config "$DOTFILES/config/omp/own.toml")"
 
+# Setup prompt
+autoload -Uz vcs_info
+zstyle ':vcs_info:*' check-for-changes true
+zstyle ':vcs_info:*' unstagedstr '%F{red}*'   # display this when there are unstaged changes
+zstyle ':vcs_info:*' stagedstr '%F{yellow}+'  # display this when there are staged changes
+zstyle ':vcs_info:*' actionformats '%F{5}%F{2}%b%F{3}|%F{1}%a%c%u%F{5}%f '
+zstyle ':vcs_info:*' formats '%F{5}%F{2}%b%c%u%F{5}%f '
+zstyle ':vcs_info:*' enable git cvs svn
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY=""
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%}✚"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%}✹"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}✖"
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%}➜"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%}═"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%}✭"
+
+theme_precmd () {
+  vcs_info
+}
+
+setopt PROMPT_SUBST
+NEWLINE=$'\n'
+PROMPT='%F{green}%m%f %F{blue}%~%f %{$reset_color%}${vcs_info_msg_0_}$(git_prompt_status)%{$reset_color%}${NEWLINE}➜ '
+
+autoload -U add-zsh-hook
+add-zsh-hook precmd theme_precmd
+
+# Setup antidote
 load_antidote()
 {
   [[ ! -d "$ANTIDOTE_DIR" ]] && {
@@ -25,7 +57,19 @@ load_antidote()
       -f https://github.com/mattmc3/antidote.git "${ANTIDOTE_DIR}"
     git config -f .gitmodules submodule.antidote.shallow true
   }
+
+  # Plugin configurations
   zstyle ':antidote:bundle' use-friendly-names 'yes'
+  zstyle ':omz:update' mode reminder
+  zstyle ':omz:plugins:nvm' autoload yes
+
+  # Disable ls colors to avoid issues with eza
+  export DISABLE_LS_COLORS=true
+  zstyle ':omz:plugins:eza' 'dirs-first' yes
+  zstyle ':omz:plugins:eza' 'git-status' yes
+  zstyle ':omz:plugins:eza' 'icons' yes
+  zstyle ':omz:plugins:eza' 'ls' yes
+  zstyle ':omz:plugins:eza' 'prompt' yes
 
   zsh_plugins=${ANTIDOTE_PLUGINS}
   [[ -f ${zsh_plugins}.txt ]] || touch ${zsh_plugins}.txt
@@ -41,60 +85,6 @@ load_antidote()
   source ${zsh_plugins}.zsh
 }
 
-# Function to load antigen if available
-load_antigen()
-{
-  local antigen_zsh_path="$XDG_BIN_HOME/antigen.zsh"
-  # shellcheck source=../../.local/bin/antigen.zsh
-  if [[ -f "$antigen_zsh_path" ]]; then
-    source "$antigen_zsh_path"
-
-    antigen use oh-my-zsh
-
-    # Disable ls colors to avoid issues with eza
-    export DISABLE_LS_COLORS=true
-
-    export ZSH_TMUX_AUTOSTART=false
-    export ZSH_TMUX_CONFIG="$DOTFILES/config/tmux/tmux.conf"
-    export ZSH_TMUX_UNICODE=true
-    export ZSH_TMUX_AUTOQUIT=false
-    export ZSH_TMUX_DEFAULT_SESSION_NAME=main
-
-    zstyle ':omz:plugins:eza' 'dirs-first' yes
-    zstyle ':omz:plugins:eza' 'git-status' yes
-    zstyle ':omz:plugins:eza' 'icons' yes
-    zstyle ':omz:plugins:eza' 'ls' yes
-    zstyle ':omz:plugins:eza' 'prompt' yes
-
-    if [[ "$OSTYPE" == darwin* ]]; then
-      zstyle :omz:plugins:ssh-agent keychain yes
-    fi
-    zstyle :omz:plugins:ssh-agent lazy yes
-    zstyle :omz:plugins:ssh-agent quiet yes
-
-    # nvm
-    zstyle ':omz:plugins:nvm' autoload yes
-
-    # z, the zsh version
-    export ZSHZ_DATA="$XDG_STATE_HOME/z"
-    antigen bundle z
-
-    antigen bundle nvm
-
-    # these should be always available
-    antigen bundle jreese/zsh-titles
-    antigen bundle brew
-    antigen bundle colored-man-pages
-    antigen bundle zsh-users/zsh-completions
-    x-have eza && antigen bundle eza
-    x-have tms && antigen bundle yuki-ycino/tms
-
-    # this needs to be the last bundle
-    antigen bundle zsh-users/zsh-syntax-highlighting
-    antigen apply
-  fi
-}
-
 # Function to source FZF configuration
 source_fzf_config()
 {
@@ -109,7 +99,7 @@ source_fzf_config()
 setup_tmux_window_name_plugin()
 {
   if [[ -n "$TMUX" ]]; then
-    local tmux_window_name_plugin="$DOTFILES/config/tmux/plugins/tmux-window-name/scripts/rename_session_windows.py"
+    local tmux_window_name_plugin="$TMUX_PLUGINS/tmux-window-name/scripts/rename_session_windows.py"
     if [[ -f "$tmux_window_name_plugin" ]]; then
       tmux_window_name()
       {
@@ -121,7 +111,6 @@ setup_tmux_window_name_plugin()
   fi
 }
 
-# load_antigen
 load_antidote
 source_fzf_config
 setup_tmux_window_name_plugin

config/exports

@@ -405,6 +405,7 @@ x-dc "$DOCKER_CONFIG"
 export DOCKER_SCAN_SUGGEST=false
 
 # fzf
+export FZF_BASE="${XDG_CONFIG_HOME}/fzf"
 export FZF_DEFAULT_OPTS='--height 40% --tmux bottom,40% --layout reverse --border top'
 
 # GnuPG
@@ -474,6 +475,12 @@ export TF_PLUGIN_CACHE_DIR="$XDG_CACHE_HOME/terraform/plugin-cache"
 # https://tmux.github.io/
 msg "Setting up tmux configuration"
 export TMUX_CONF="$XDG_CONFIG_HOME/tmux/tmux.conf"
+## These settings are for zsh-tmux
+export ZSH_TMUX_AUTOSTART=false
+export ZSH_TMUX_CONFIG="$DOTFILES/config/tmux/tmux.conf"
+export ZSH_TMUX_UNICODE=true
+export ZSH_TMUX_AUTOQUIT=false
+export ZSH_TMUX_DEFAULT_SESSION_NAME=main
 
 # tms, https://github.com/jrmoulton/tmux-sessionizer
 export TMS_CONFIG_FILE="${XDG_CONFIG_HOME}/tms/config.toml"
@@ -485,6 +492,7 @@ x-dc "$WAKATIME_HOME"
 
 # Misc
 msg "Setting up miscellaneous configuration"
+export ZSHZ_DATA="$XDG_STATE_HOME/z"
 export CHEAT_USE_FZF=true
 export SQLITE_HISTORY="${XDG_CACHE_HOME}/sqlite_history"
 

config/nvim/lua/plugins/which-key.lua

@@ -196,6 +196,11 @@ return {
         '<cmd>Telescope diagnostics<cr>',
         desc = 'Search Diagnostics',
       },
+      {
+        '<leader>sf',
+        '<cmd>Telescope find_files<cr>',
+        desc = 'Find files',
+      },
       {
         '<leader>sg',
         '<cmd>Telescope live_grep<cr>',

config/nvm/default-packages

@@ -0,0 +1,5 @@
+# $NVM_DIR/default-packages
+
+yarn
+neovim
+corepack

config/omp/own.toml

@@ -1,7 +1,7 @@
 "$schema" = "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json"
 console_title_template = '{{.UserName}}@{{.HostName}} {{.Shell}} in {{.PWD}}'
 version = 3
-auto_upgrade = true
+auto_upgrade = false
 final_space = true
 
 [transient_prompt]

config/tmux/tmux.conf

@@ -147,7 +147,7 @@ set -g @tmux_window_name_max_name_len "20"
 set -g @tmux_window_name_use_tilde "True"
 set -g @tmux_window_name_shells "['bash', 'fish', 'sh', 'zsh', 'oh-my-posh']"
 set -g @tmux_window_dir_programs "['nvim', 'vim', 'vi', 'git']"
-set -g @tmux_window_name_ignored_programs "['sqlite3', 'oh-my-posh', 'antidot', 'direnv']" # Default is []
+set -g @tmux_window_name_ignored_programs "['sqlite3', 'oh-my-posh', 'antidot', 'antidote', 'direnv']" # Default is []
 set -g @tmux_window_name_substitute_sets "[('.+ipython2', 'ipython2'), ('.+ipython3', 'ipython3'), ('.+\.local', '.local'), ('.+asdf', 'asdf')]"
 
 ## https://github.com/tmux-plugins/tmux-continuum

config/zsh/antidote_plugins.txt

@@ -9,23 +9,30 @@ zsh-users/zsh-completions kind:fpath path:src
 # frameworks like oh-my-zsh are supported
 getantidote/use-omz        # handle OMZ dependencies
 ohmyzsh/ohmyzsh path:lib   # load OMZ's library
-ohmyzsh/ohmyzsh path:plugins/colored-man-pages  # load OMZ plugins
 
 ohmyzsh/ohmyzsh path:plugins/colored-man-pages
+ohmyzsh/ohmyzsh path:plugins/brew
 ohmyzsh/ohmyzsh path:plugins/extract
-ohmyzsh/ohmyzsh path:plugins/z
 ohmyzsh/ohmyzsh path:plugins/eza
-
+ohmyzsh/ohmyzsh path:plugins/fzf
-# Add some programmer plugins
 ohmyzsh/ohmyzsh path:plugins/git
 ohmyzsh/ohmyzsh path:plugins/golang
-ohmyzsh/ohmyzsh path:plugins/python
+ohmyzsh/ohmyzsh path:plugins/gpg-agent
 ohmyzsh/ohmyzsh path:plugins/nvm
+ohmyzsh/ohmyzsh path:plugins/python
+# ohmyzsh/ohmyzsh path:plugins/ssh-agent
+ohmyzsh/ohmyzsh path:plugins/tmux
+ohmyzsh/ohmyzsh path:plugins/z
+
+# Automatically activate nvm if .nvmrc file is present
+ivuorinen/nvm-auto-use
 
 # Add core plugins that make Zsh a bit more like Fish
-zsh-users/zsh-completions path:src kind:fpath
 zdharma-continuum/fast-syntax-highlighting
 
 # Add some plugins that are not in OMZ
 jreese/zsh-titles
 yuki-ycino/tms
+
+# This needs to be last bundle
+zsh-users/zsh-syntax-highlighting

local/bin/dfm

@@ -122,7 +122,6 @@ section_install()
 
   MENU=(
     "all:Installs everything in the correct order"
-    "antigen:Updates the antigen.zsh file"
     "cargo:Install rust/cargo packages"
     "cheat-databases:Install cheat external cheatsheet databases"
     "composer:Install composer"
@@ -148,34 +147,22 @@ section_install()
       msgr msg "Starting to install all and reloading configurations..."
       $0 install macos
       $0 install fonts
-      $0 install antigen
       $0 brew install
       $0 install ohmyposh
       $0 install asdf
-      # $0 install ohmybash
-      # $0 install pip
-      # $0 install cargo
       $0 install composer
-      # $0 install dotenv
       $0 install fzf
-      # $0 install gh
+      $0 install go
-      # $0 install go
       $0 install cheat-databases
       $0 install imagick
-      # $0 install neofetch
+      $0 install nvm
-      # $0 install nvm
+      $0 install npm
-      # $0 install npm
+      # $0 install ntfy
-      $0 install ntfy
       $0 install z
       msgr msg "Reloading configurations again..."
       source "$DOTFILES/config/shared.sh"
       msgr yay "All done!"
       ;;
-    antigen)
-      msg "Installing antigen..."
-      curl -sSfL git.io/antigen -o "$DOTFILES/local/bin/antigen.zsh" \
-        && msg_yay "New antigen installed!"
-      ;;
     asdf)
       msg "Installing asdf..."
       bash "$DOTFILES/scripts/install-asdf.sh both" \
@@ -198,13 +185,6 @@ section_install()
       bash "$DOTFILES/scripts/install-composer.sh" \
         && msg_yay "composer installed!"
       ;;
-    dotenv)
-      msg "Installing dotenv-linter..."
-      curl -sSfL \
-        https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh \
-        | sh -s -- -b "$XDG_BIN_HOME" \
-        && msg_yay "dotenv-linter installed!"
-      ;;
     fonts)
       msg "Installing fonts..."
       bash "$DOTFILES/scripts/install-fonts.sh" \
@@ -231,13 +211,6 @@ section_install()
         && chmod +x "$XDG_BIN_HOME/magick" \
         && msg_yay "imagick installed!"
       ;;
-    starship)
-      msg "Installing starship.rs..."
-      curl -sS https://starship.rs/install.sh | sh -s -- \
-        --bin-dir ~/.local/bin \
-        --yes \
-        && msg_yay "starship installed!"
-      ;;
     macos)
       msg "Setting up macOS defaults..."
       bash "$DOTFILES/scripts/set-macos-defaults.sh" \
@@ -250,9 +223,11 @@ section_install()
       ;;
     nvm)
       msg "Installing nvm..."
-      curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION_NVM/install.sh" | bash
+      NVM_VERSION=$(x-gh-get-latest-version nvm-sh/nvm)
-      git checkout "$DOTFILES/base/zshrc"
+      msg "Latest nvm version: $NVM_VERSION"
-      git checkout "$DOTFILES/base/bashrc"
+      NVM_INSTALL="https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh"
+      NVM_CURL="curl -o- \"$NVM_INSTALL\" | bash"
+      PROFILE=/dev/null bash -c "$NVM_CURL"
       $0 install nvm-latest
       msg_yay "nvm installed!"
       ;;
@@ -276,11 +251,6 @@ section_install()
       bash "$DOTFILES/scripts/install-ntfy.sh" \
         && msg_yay "ntfy installed!"
       ;;
-    ohmybash)
-      msg "oh-my-bash install started..."
-      bash "$DOTFILES/scripts/install-ohmybash.sh" \
-        && msg_yay "oh-my-bash installed!"
-      ;;
     ohmyposh)
       msg "oh-my-posh install started..."
       bash "$DOTFILES/scripts/install-ohmyposh.sh" \