diff options
| author | Charles Cabergs <charles.cabergs@colruytgroup.com> | 2023-11-03 17:01:56 +0100 |
|---|---|---|
| committer | Charles Cabergs <charles.cabergs@colruytgroup.com> | 2023-11-03 17:01:56 +0100 |
| commit | 1fb20dea7cb204046f247b6c82ab603a7cbbbfaf (patch) | |
| tree | 2c8b8cca13a3f74ca7eb9916c2d0a28776e010c9 /config | |
| parent | 663b1f5df68de0e9d23d1874ec7942df380ecab5 (diff) | |
| parent | 38487dfb1f7c245fbf82735a0ee17313258a8710 (diff) | |
| download | dotfiles-1fb20dea7cb204046f247b6c82ab603a7cbbbfaf.tar.gz dotfiles-1fb20dea7cb204046f247b6c82ab603a7cbbbfaf.tar.bz2 dotfiles-1fb20dea7cb204046f247b6c82ab603a7cbbbfaf.zip | |
Merge branch 'master' of https://github.com/cacharle/dotfiles
Diffstat (limited to 'config')
| -rw-r--r-- | config/fish/config.fish | 1 | ||||
| -rw-r--r-- | config/git/config.linux | 10 | ||||
| -rw-r--r-- | config/mimeapps.list | 1 | ||||
| -rw-r--r-- | config/tmux/tmux.conf | 7 |
4 files changed, 17 insertions, 2 deletions
diff --git a/config/fish/config.fish b/config/fish/config.fish index d2870a8..e3e9e5b 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -11,6 +11,7 @@ else if [ "$(uname)" = 'Darwin' ] end set -gx PATH "$PATH:$HOME/.local/share/go/bin" +set -gx PATH "$PATH:$HOME/.local/share/cargo/bin" set -gx PATH "$PATH:$HOME/.local/share/npm/bin" set -gx PATH "$PATH:$HOME/.local/bin" diff --git a/config/git/config.linux b/config/git/config.linux index a7b8baa..1e93196 100644 --- a/config/git/config.linux +++ b/config/git/config.linux @@ -26,9 +26,17 @@ [difftool] prompt = false [diff] - tool = bat + colorMoved = default [core] editor = "VIMINIT='' nvim" + pager = delta +[interactive] + diffFilter = delta --color-only --syntax-theme gruvbox-dark +[delta] + syntax-theme = gruvbox-dark + # side-by-side = true + navigate = true # use n and N to move between diff sections + line-numbers = true [safe] directory = * [push] diff --git a/config/mimeapps.list b/config/mimeapps.list index 2f7ada6..9198139 100644 --- a/config/mimeapps.list +++ b/config/mimeapps.list @@ -30,6 +30,7 @@ x-scheme-handler/https=qutebrowser.desktop text/html=qutebrowser.desktop application/xhtml_xml=qutebrowser.desktop image/webp=qutebrowser.desktop +x-scheme-handler/webcal=brave-browser.desktop [Added Associations] text/html=qutebrowser.desktop diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf index 5e72d64..8e10065 100644 --- a/config/tmux/tmux.conf +++ b/config/tmux/tmux.conf @@ -28,7 +28,12 @@ bind 'c' new-window -c "#{pane_current_path}" bind R source-file ~/.config/tmux/tmux.conf set -g status-right-length 100 -set -g default-shell /usr/local/bin/fish +if-shell -b '[ "$(uname)" = Darwin ]' { + set -g default-shell /usr/local/bin/fish +} +if-shell -b '[ "$(uname)" = Linux ]' { + set -g default-shell /usr/bin/fish +} set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'egel/tmux-gruvbox' |