summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dotfiles.sh2
-rw-r--r--git/dot-gitconfig (renamed from git/.gitconfig)8
-rw-r--r--tmux/dot-tmux.conf6
3 files changed, 12 insertions, 4 deletions
diff --git a/dotfiles.sh b/dotfiles.sh
index 72cf99c..8cc28d0 100644
--- a/dotfiles.sh
+++ b/dotfiles.sh
@@ -1 +1 @@
-stow --target=$HOME --dotfiles -vv tmux zsh nvim
+stow --target=$HOME --dotfiles -vv tmux zsh nvim git
diff --git a/git/.gitconfig b/git/dot-gitconfig
index ff10baa..e5c0949 100644
--- a/git/.gitconfig
+++ b/git/dot-gitconfig
@@ -19,3 +19,11 @@
cmd = "/root/nvim.appimage -d $LOCAL $REMOTE"
prompt = true
+[pager]
+ diff = delta
+ show = delta
+ log = delta
+ reflog = delta
+
+[interactive]
+ diffFilter = delta --color-only
diff --git a/tmux/dot-tmux.conf b/tmux/dot-tmux.conf
index c1954f1..35fbf7a 100644
--- a/tmux/dot-tmux.conf
+++ b/tmux/dot-tmux.conf
@@ -16,12 +16,12 @@ set-option -g status-right ' #h #[fg=black]#[bg=#556677]#[bg=black]#[fg=#5
set-option -g status-right-length 100
set-option -g status-style fg='#ffffff',bg='#556677'
-set-option -g window-status-style fg='#ffffff',bg='#333333'
-set-option -g window-status-current-style fg='#556677',bg='#ffffff'
+set-option -g window-status-style fg='#ffffff',bg='#000000'
+set-option -g window-status-current-style fg='#ffffff',bg='#444488'
set-option -g window-status-bell-style fg='#ffffff',bg='#ee2222'
set-option -g window-status-separator " "
set-option -g window-status-format " #I:#W #[reverse]#[fg=#556677]"
-set-option -g window-status-current-format " #W "
+set-option -g window-status-current-format " #I:#W #[reverse]#[fg=#556677]"
set-option -g pane-border-format " #P "
set-option -g pane-active-border-style fg='#ffffff'