Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion .ignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
bat/rose-pine
eza/themes
fzf/rose-pine
vim/pack
2 changes: 0 additions & 2 deletions Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ brew "eza"
brew "fd"
brew "fish"
brew "fisher"
brew "fzf"
brew "gh"
brew "git-delta"
brew "jaq"
Expand All @@ -23,7 +22,6 @@ brew "ripgrep"
brew "rnr"
brew "rustup"
brew "sd"
brew "serie"
brew "vivid"
brew "xh"
brew "zoxide"
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -32,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.

---

Expand Down
5 changes: 1 addition & 4 deletions dotbot-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,8 @@
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/television/config.toml: television/config.toml
~/.config/zed/settings.json: zed/settings.json
~/.gitconfig: git/gitconfig
~/.gitconfig.themes:
Expand Down
1 change: 1 addition & 0 deletions dotbot-update.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 0 additions & 22 deletions fish/conf.d/fzf-fish.fish

This file was deleted.

9 changes: 9 additions & 0 deletions fish/conf.d/television.fish
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Fish config for television.
#
# Location: ~/.config/fish/conf.d/television.fish
#
# Simon Olofsson <simon@olofsson.de>
#

# Shell integration
tv init fish | source
12 changes: 2 additions & 10 deletions fish/conf.d/theme.fish
Original file line number Diff line number Diff line change
Expand Up @@ -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'"

Expand All @@ -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
1 change: 0 additions & 1 deletion fish/fish_plugins
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
jorgebucaran/autopair.fish
jorgebucaran/hydro
jorgebucaran/nvm.fish
patrickf1/fzf.fish
rose-pine/fish
25 changes: 0 additions & 25 deletions fish/functions/rfv.fish

This file was deleted.

1 change: 0 additions & 1 deletion fzf/rose-pine
Submodule rose-pine deleted from 9af300
12 changes: 0 additions & 12 deletions serie/config.toml

This file was deleted.

10 changes: 10 additions & 0 deletions television/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Television configuration.
#
# Location: ~/.config/television/config.toml
#
# Simon Olofsson <simon@olofsson.de>
#

[shell_integration.keybindings]
smart_autocomplete = "ctrl-space"
command_history = "/"