From 2a92f72fcbe5014d8f62d1d16f166c40c7ef964c Mon Sep 17 00:00:00 2001 From: Simon Olofsson Date: Fri, 9 Jan 2026 23:35:00 +0100 Subject: [PATCH 1/3] Remove fzf in preparation for television Co-Authored-By: Claude Opus 4.5 --- .gitmodules | 3 --- .ignore | 1 - Brewfile | 1 - README.md | 1 - dotbot-config.yaml | 3 --- fish/conf.d/fzf-fish.fish | 22 ---------------------- fish/conf.d/theme.fish | 12 ++---------- fish/fish_plugins | 1 - fish/functions/rfv.fish | 25 ------------------------- fzf/rose-pine | 1 - 10 files changed, 2 insertions(+), 68 deletions(-) delete mode 100644 fish/conf.d/fzf-fish.fish delete mode 100644 fish/functions/rfv.fish delete mode 160000 fzf/rose-pine diff --git a/.gitmodules b/.gitmodules index ee3a59c..dff1285 100644 --- a/.gitmodules +++ b/.gitmodules @@ -48,9 +48,6 @@ [submodule "vim/pack/my-plugins/start/vim-sneak"] path = vim/pack/my-plugins/start/vim-sneak url = git@github.com:justinmk/vim-sneak.git -[submodule "fzf/rose-pine"] - path = fzf/rose-pine - url = git@github.com:rose-pine/fzf.git [submodule "vim/pack/my-plugins/start/vim-numbertoggle"] path = vim/pack/my-plugins/start/vim-numbertoggle url = https://github.com/jeffkreeftmeijer/vim-numbertoggle.git diff --git a/.ignore b/.ignore index 65521a2..58c8d87 100644 --- a/.ignore +++ b/.ignore @@ -1,4 +1,3 @@ bat/rose-pine eza/themes -fzf/rose-pine vim/pack diff --git a/Brewfile b/Brewfile index d0d8b9e..e02caee 100644 --- a/Brewfile +++ b/Brewfile @@ -13,7 +13,6 @@ brew "eza" brew "fd" brew "fish" brew "fisher" -brew "fzf" brew "gh" brew "git-delta" brew "jaq" diff --git a/README.md b/README.md index a90c1c8..49bf56d 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,6 @@ Below is a list of the programs I have configuration files for, along with a sho - **[Zed](https://zed.dev/):** A next-generation code editor. - **[Ghostty](https://ghostty.org/):** A fast and feature-rich terminal emulator. - **[fish](https://fishshell.com):** A smart and user-friendly command line shell. -- **[fzf](https://github.com/junegunn/fzf):** A command-line fuzzy finder. - **[Hydro](https://github.com/jorgebucaran/hydro):** Ultra-pure, lag-free prompt plugin for fish. - **[zoxide](https://github.com/ajeetdsouza/zoxide):** A smarter `cd` command. - **[Vim](https://www.vim.org/):** A highly configurable text editor. diff --git a/dotbot-config.yaml b/dotbot-config.yaml index 2cb58c7..4e08546 100644 --- a/dotbot-config.yaml +++ b/dotbot-config.yaml @@ -32,9 +32,6 @@ glob: true path: fish/functions/* exclude: ["fish/functions/so-dotfiles-update.fish"] - ~/.config/fzf/: - glob: true - path: fzf/rose-pine/dist/rose-pine-*.fish ~/.config/ghostty/config: ghostty/config ~/.config/serie/config.toml: serie/config.toml ~/.config/zed/settings.json: zed/settings.json diff --git a/fish/conf.d/fzf-fish.fish b/fish/conf.d/fzf-fish.fish deleted file mode 100644 index b69781c..0000000 --- a/fish/conf.d/fzf-fish.fish +++ /dev/null @@ -1,22 +0,0 @@ -# Fish config for fzf.fish. -# -# Location: ~/.config/fish/conf.d/fzf-fish.fish -# -# Simon Olofsson -# - -# Use eza for directory preview. -set -g fzf_preview_dir_cmd l --all --color=always --oneline - -# Open files and directories in the editor. -set -g fzf_directory_opts --bind 'ctrl-o:execute($EDITOR {} &> /dev/tty)' - -# fzf.fish binds everything to normal and insert mode. -# That's not what I want. -bind / _fzf_search_history -bind gf _fzf_search_directory -bind -M insert ctrl-g,f _fzf_search_directory -bind gl _fzf_search_git_log -bind -M insert ctrl-g,l _fzf_search_git_log -bind gs _fzf_search_git_status -bind -M insert ctrl-g,s _fzf_search_git_status diff --git a/fish/conf.d/theme.fish b/fish/conf.d/theme.fish index f5b706e..1509d35 100644 --- a/fish/conf.d/theme.fish +++ b/fish/conf.d/theme.fish @@ -33,8 +33,8 @@ function __so_apply_theme --on-variable fish_terminal_color_theme # delta can detect the background color of the terminal automatically. # - # But this doesn't work when Delta is embedded in other tools like fzf - # or when its output is piped. + # But this doesn't work when Delta is embedded in other tools or when its + # output is piped. # See https://github.com/dandavison/delta/blob/d5e0565cbfa47acde98d41d8777ace5d1bc4d690/manual/src/full---help-output.md?plain=1#L133 set -gx GIT_CONFIG_PARAMETERS "'delta.$appearance=true'" @@ -48,14 +48,6 @@ function __so_apply_theme --on-variable fish_terminal_color_theme # For fd et al. set -gx LS_COLORS "$(vivid generate rose-pine-$theme_variant)" - # fzf - source "$HOME/.config/fzf/rose-pine-$theme_variant.fish" - # Set some defaults. - # See https://github.com/PatrickF1/fzf.fish/blob/main/functions/_fzf_wrapper.fish - set -a FZF_DEFAULT_OPTS '--cycle --layout=reverse --border --height=90% --preview-window=wrap --marker="*"' - # Set delta as diff highlighter for fzf. - set -g fzf_diff_highlighter delta --paging=never - # Appearance and Theme for Vim. set -gx SO_VIM_THEME "$appearance rosepine_$theme_variant" end diff --git a/fish/fish_plugins b/fish/fish_plugins index 75984c5..617bba8 100644 --- a/fish/fish_plugins +++ b/fish/fish_plugins @@ -1,5 +1,4 @@ jorgebucaran/autopair.fish jorgebucaran/hydro jorgebucaran/nvm.fish -patrickf1/fzf.fish rose-pine/fish diff --git a/fish/functions/rfv.fish b/fish/functions/rfv.fish deleted file mode 100644 index 76fce42..0000000 --- a/fish/functions/rfv.fish +++ /dev/null @@ -1,25 +0,0 @@ -# Fish function to combine rg, fzf and vim 🤯 -# See https://junegunn.github.io/fzf/tips/ripgrep-integration/ -# -# Location: ~/.config/fish/functions/rfv.fish -# -# Simon Olofsson -# - -function rfv - set -f reload 'reload:rg --column --color=always --smart-case {q} || :' - set -f opener 'if [[ $FZF_SELECT_COUNT -eq 0 ]]; then - vim {1} +{2} # No selection. Open the current line in Vim. - else - vim +cw -q {+f} # Build quickfix list for the selected items. - fi' - fzf --disabled --ansi --multi \ - --bind "start:$reload" --bind "change:$reload" \ - --bind "enter:become:$opener" \ - --bind "ctrl-o:execute:$opener" \ - --bind 'alt-a:select-all,alt-d:deselect-all,ctrl-/:toggle-preview' \ - --delimiter : \ - --preview 'bat --style=full --color=always --highlight-line {2} {1}' \ - --preview-window '~4,+{2}+4/3,<80(up)' \ - --query "$argv" -end diff --git a/fzf/rose-pine b/fzf/rose-pine deleted file mode 160000 index 9af300f..0000000 --- a/fzf/rose-pine +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9af300f871df52331c362ca58c73535f69b6fb03 From 7aa017608a890b79d30c8945824ed0a1efd7ba14 Mon Sep 17 00:00:00 2001 From: Simon Olofsson Date: Sat, 10 Jan 2026 14:14:28 +0100 Subject: [PATCH 2/3] Remove serie in favor of tv git-log Co-Authored-By: Claude Opus 4.5 --- Brewfile | 1 - README.md | 1 - dotbot-config.yaml | 1 - serie/config.toml | 12 ------------ 4 files changed, 15 deletions(-) delete mode 100644 serie/config.toml diff --git a/Brewfile b/Brewfile index e02caee..7214319 100644 --- a/Brewfile +++ b/Brewfile @@ -22,7 +22,6 @@ brew "ripgrep" brew "rnr" brew "rustup" brew "sd" -brew "serie" brew "vivid" brew "xh" brew "zoxide" diff --git a/README.md b/README.md index 49bf56d..f785f1a 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,6 @@ Below is a list of the programs I have configuration files for, along with a sho - **[eza](https://github.com/eza-community/eza):** A modern alternative to `ls`. - **[ripgrep (rg)](https://github.com/BurntSushi/ripgrep):** A line-oriented search tool. - **[Delta](https://github.com/dandavison/delta):** A syntax-highlighting pager for `git` output. -- **[serie](https://github.com/lusingander/serie):** A rich git commit graph in the terminal. --- diff --git a/dotbot-config.yaml b/dotbot-config.yaml index 4e08546..dcd8bac 100644 --- a/dotbot-config.yaml +++ b/dotbot-config.yaml @@ -33,7 +33,6 @@ path: fish/functions/* exclude: ["fish/functions/so-dotfiles-update.fish"] ~/.config/ghostty/config: ghostty/config - ~/.config/serie/config.toml: serie/config.toml ~/.config/zed/settings.json: zed/settings.json ~/.gitconfig: git/gitconfig ~/.gitconfig.themes: diff --git a/serie/config.toml b/serie/config.toml deleted file mode 100644 index 302214a..0000000 --- a/serie/config.toml +++ /dev/null @@ -1,12 +0,0 @@ -# Serie configuration file. -# -# Location: ~/.config/serie/config.toml -# -# Simon Olofsson -# - -[core.search] -ignore_case = true - -[core.user_command] -commands_1 = { name = "git diff (delta)", commands = ["sh", "-c", "git diff {{first_parent_hash}} {{target_hash}} | delta --width={{area_width}} --color-only"] } From 2072275f605c3fab1173270dd3cd03151822cf22 Mon Sep 17 00:00:00 2001 From: Simon Olofsson Date: Mon, 12 Jan 2026 23:57:11 +0100 Subject: [PATCH 3/3] Add television configuration - Shell integration with / bound to history search - ctrl-space for smart autocomplete - tv update-channels in dotbot update Co-Authored-By: Claude Opus 4.5 --- dotbot-config.yaml | 1 + dotbot-update.yaml | 1 + fish/conf.d/television.fish | 9 +++++++++ television/config.toml | 10 ++++++++++ 4 files changed, 21 insertions(+) create mode 100644 fish/conf.d/television.fish create mode 100644 television/config.toml diff --git a/dotbot-config.yaml b/dotbot-config.yaml index dcd8bac..092a051 100644 --- a/dotbot-config.yaml +++ b/dotbot-config.yaml @@ -33,6 +33,7 @@ path: fish/functions/* exclude: ["fish/functions/so-dotfiles-update.fish"] ~/.config/ghostty/config: ghostty/config + ~/.config/television/config.toml: television/config.toml ~/.config/zed/settings.json: zed/settings.json ~/.gitconfig: git/gitconfig ~/.gitconfig.themes: diff --git a/dotbot-update.yaml b/dotbot-update.yaml index 99601ff..6e21818 100644 --- a/dotbot-update.yaml +++ b/dotbot-update.yaml @@ -16,6 +16,7 @@ ~/.config/fish/functions/so-dotfiles-update.fish: fish/functions/so-dotfiles-update.fish - shell: + - tv update-channels - brew bundle install --global - test -r ~/.Brewfile.local && brew bundle install --file=~/.Brewfile.local - brew upgrade --greedy diff --git a/fish/conf.d/television.fish b/fish/conf.d/television.fish new file mode 100644 index 0000000..51e49fa --- /dev/null +++ b/fish/conf.d/television.fish @@ -0,0 +1,9 @@ +# Fish config for television. +# +# Location: ~/.config/fish/conf.d/television.fish +# +# Simon Olofsson +# + +# Shell integration +tv init fish | source diff --git a/television/config.toml b/television/config.toml new file mode 100644 index 0000000..c430841 --- /dev/null +++ b/television/config.toml @@ -0,0 +1,10 @@ +# Television configuration. +# +# Location: ~/.config/television/config.toml +# +# Simon Olofsson +# + +[shell_integration.keybindings] +smart_autocomplete = "ctrl-space" +command_history = "/"