From f0f6f560c6b9a3d85429b9499af05e5141356658 Mon Sep 17 00:00:00 2001 From: Petr Nyc Date: Mon, 25 Aug 2025 12:28:03 +0200 Subject: [PATCH] 25.8. --- .tridactylrc | 5 +++-- .zshenv | 2 +- .zshrc | 38 ++++++++++++++++++++++++++++++++++++-- 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/.tridactylrc b/.tridactylrc index 418f6b7..399c878 100644 --- a/.tridactylrc +++ b/.tridactylrc @@ -6,10 +6,11 @@ set update.lastnaggedversion 1.14.0 set update.checkintervalsecs 86400 set configversion 2.0 set editorcmd '/opt/homebrew/bin/emacsclient' +set smoothscroll true -" this doesn't work -" seturl ^https?://www.youtube.com disable true +blacklistadd https://www.youtube.com/ + " tip from https://github.com/tridactyl/tridactyl/issues/1559 seturl youtube.com modeindicator false diff --git a/.zshenv b/.zshenv index 6e02d29..e16af7e 100644 --- a/.zshenv +++ b/.zshenv @@ -2,7 +2,7 @@ set -o vi export LC_ALL=en_US.UTF-8 -export PATH=/Users/jetpac/.asdf/shims/:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/jetpac/work/flutter/bin:$HOME/.rd/bin:$HOME/bin:$PATH: +export PATH=/Users/jetpac/.asdf/shims/:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/jetpac/work/flutter/bin:$HOME/.rd/bin:$HOME/bin:$PATH:$HOME/.fzf/bin alias oe='open /Applications/Emacs.app' diff --git a/.zshrc b/.zshrc index 8bc086f..d792697 100644 --- a/.zshrc +++ b/.zshrc @@ -113,9 +113,41 @@ COMPLETION_WAITING_DOTS="true" # Custom plugins may be added to $ZSH_CUSTOM/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=(git rsync colorize colored-man-pages vi-mode common-aliases macos themes dircycle iterm2 docker docker-compose zsh-navigation-tools urltools history mercurial tmux zsh-syntax-highlighting zsh-autosuggestions kubectl helm terraform asdf brew web-search kubectl helm aliases emacs) +plugins=(colorize colored-man-pages vi-mode common-aliases themes dircycle iterm2 zsh-navigation-tools urltools history zsh-syntax-highlighting zsh-autosuggestions web-search aliases) + +cmd_plugins=(rsync tmux docker docker-compose tmux kubectl helm terraform asdf brew emacs fzf asdf brew emacs) + +# Add a plugin only if its command exists +add_plugin_if_command_exists() { + local cmd="$1" + if [[ -n ${commands[$cmd]} ]]; then + # Only append if not already in the plugins array + if (( ! ${plugins[(Ie)$cmd]} )); then + plugins+=("$cmd") + fi + fi +} + +for cmd in $cmd_plugins; do + add_plugin_if_command_exists "$cmd" +done + +# use mercurial plugin +if [[ -n ${commands[hg]} ]]; then + plugins+=("mercurial") +fi -# consider plugin fzf - only available for Mac/Linux +# use macos plugin +if [[ "$(uname -o)" == "Darwin" ]]; then + plugins+=("macos") +fi + +# use zoxide +if [[ -n ${commands[zoxide]} ]]; then + export FZF_DEFAULT_OPTS="--style full" + export _ZO_FZF_OPTS="--height ~90% --tmux bottom,70% --layout reverse" + eval "$(zoxide init --cmd cd zsh)" +fi # colorize - adds ccat and cless # common-aliases: https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/common-aliases @@ -245,3 +277,5 @@ export PATH=$GEM_HOME/bin:$HOME/.gem/ruby/3.3.0/bin:$PATH # alias scm-ssh='/Users/jetpac/.ssh/scm-script.sh' # scm-ssh start_agent + +# export FZF_DEFAULT_OPTS="--style full --preview '/opt/homebrew/bin/pygmentize -g {}' --bind 'focus:transform-header:file --brief {}'"