update

README.md

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

dot_gitconfig.tmpl

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

dot_tmux.conf

@@ -143,14 +143,11 @@ bind r source-file ~/.tmux.conf \; display-message "config reloaded!"
 # Plugins
 
 set -g @plugin 'tmux-plugins/tpm'
-set -g @plugin 'tmux-plugins/tmux-resurrect'
 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 -b '~/.tmux/plugins/tpm/tpm'

private_dot_config/starship.toml

@@ -2,10 +2,18 @@
 add_newline = false
 
 [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]
 truncation_length = 5