main
Yax 4 years ago
parent 4d862429c5
commit 986de94ed7

@ -1,2 +0,0 @@
# dotfiles
My dot files managed by ChezMoi (https://github.com/twpayne/chezmoi)

@ -13,6 +13,7 @@
cm = checkout master cm = checkout master
co = checkout co = checkout
cp = cherry-pick cp = cherry-pick
f = fetch
fo = fetch origin fo = fetch origin
m = merge m = merge
nb = checkout -b nb = checkout -b

@ -143,14 +143,11 @@ bind r source-file ~/.tmux.conf \; display-message "config reloaded!"
# Plugins # Plugins
set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tpm'
set -g @plugin 'tmux-plugins/tmux-resurrect'
set -g @plugin 'laktak/extrakto' set -g @plugin 'laktak/extrakto'
# Resurrect plugin configuration # tmux color scheme
set -g @plugin 'seebi/tmux-colors-solarized'
set -g @resurrect-capture-pane-contents 'off' set -g @colors-solarized '256'
set -g @resurrect-processes 'ssh'
set -g @resurrect-never-overwrite 'off'
# run tpm # run tpm
run -b '~/.tmux/plugins/tpm/tpm' run -b '~/.tmux/plugins/tpm/tpm'

@ -2,10 +2,18 @@
add_newline = false add_newline = false
[git_status] [git_status]
ahead = "⇡${count}" conflicted = "⚔️ "
diverged = "⇕⇡${ahead_count}⇣${behind_count}" ahead = "🏎️ 💨 ×${count}"
behind = "⇣${count}" behind = "🐢 ×${count}"
staged = '[+${count}](green)' diverged = "🔱 🏎️ 💨 ×${ahead_count} 🐢 ×${behind_count}"
untracked = "🛤️ ×${count}"
stashed = "📦 "
modified = "📝 ×${count}"
staged = "🗃️ ×${count}"
renamed = "📛 ×${count}"
deleted = "🗑️ ×${count}"
style = "bright-white"
format = "$all_status$ahead_behind"
[directory] [directory]
truncation_length = 5 truncation_length = 5

Loading…
Cancel
Save