From 986de94ed7a0548b1c3853c64db767d5c363ce53 Mon Sep 17 00:00:00 2001
From: Yax <1949284+kianby@users.noreply.github.com>
Date: Tue, 20 Apr 2021 13:17:48 +0200
Subject: [PATCH] update

---
 README.md                        |  2 --
 dot_gitconfig.tmpl               |  1 +
 dot_tmux.conf                    |  9 +++------
 private_dot_config/starship.toml | 16 ++++++++++++----
 4 files changed, 16 insertions(+), 12 deletions(-)
 delete mode 100644 README.md

diff --git a/README.md b/README.md
deleted file mode 100644
index e26795b..0000000
--- a/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# dotfiles
-My dot files managed by ChezMoi (https://github.com/twpayne/chezmoi)
diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl
index 608765d..779f988 100644
--- a/dot_gitconfig.tmpl
+++ b/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
diff --git a/dot_tmux.conf b/dot_tmux.conf
index 5d0ee05..1231723 100644
--- a/dot_tmux.conf
+++ 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
-
-set -g @resurrect-capture-pane-contents 'off'
-set -g @resurrect-processes 'ssh'
-set -g @resurrect-never-overwrite 'off'
+# tmux color scheme
+set -g @plugin 'seebi/tmux-colors-solarized'
+set -g @colors-solarized '256'
 
 # run tpm
 run -b '~/.tmux/plugins/tpm/tpm'
diff --git a/private_dot_config/starship.toml b/private_dot_config/starship.toml
index ede7528..69fa7d1 100644
--- a/private_dot_config/starship.toml
+++ b/private_dot_config/starship.toml
@@ -2,10 +2,18 @@
 add_newline = false
 
 [git_status]
-ahead = "⇡${count}"
-diverged = "⇕⇡${ahead_count}⇣${behind_count}"
-behind = "⇣${count}"
-staged = '[+${count}](green)'
+conflicted = "⚔️ "
+ahead = "🏎️ 💨 ×${count}"
+behind = "🐢 ×${count}"
+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