diff --git a/.config/.brightness b/.config/.brightness deleted file mode 100644 index 8a6eaaf..0000000 --- a/.config/.brightness +++ /dev/null @@ -1 +0,0 @@ -9.395801 diff --git a/.gitignore b/.gitignore index d4a3f13..8d9bf64 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ .config/Code/User/Workspaces/* .config/Code/rapid_render.json .config/Code/Network* +**/.config/.brightness # Byte-compiled / optimized / DLL files *__pycache__/ diff --git a/.gitmodules b/.gitmodules index bed9ed6..affb656 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,6 +25,4 @@ [submodule ".tmux/plugins/tpm"] path = .tmux/plugins/tpm url = https://github.com/tmux-plugins/tpm -[submodule ".tmux-gitbar"] - path = .tmux-gitbar - url = https://github.com/arl/tmux-gitbar + diff --git a/.gitmux.conf b/.gitmux.conf new file mode 100644 index 0000000..b1ee31f --- /dev/null +++ b/.gitmux.conf @@ -0,0 +1,22 @@ +tmux: + symbols: + branch: '⎇ ' + hashprefix: ':' + ahead: ↑· + behind: ↓· + staged: ● + conflict: '✖ ' + modified: '✚ ' + untracked: … + stashed: '⚑ ' + clean: ✔ + styles: + state: '#[fg=red,bold]' + branch: '#[fg=white,bold]' + remote: '#[fg=cyan]' + staged: '#[fg=green,bold]' + conflict: '#[fg=red,bold]' + modified: '#[fg=red,bold]' + untracked: '#[fg=magenta,bold]' + stashed: '#[fg=cyan,bold]' + clean: '#[fg=green,bold]' diff --git a/.tmux-gitbar b/.tmux-gitbar deleted file mode 160000 index 6266946..0000000 --- a/.tmux-gitbar +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6266946f530a0873919c6b6f56f60712e612f11f diff --git a/.tmux.conf b/.tmux.conf index fb63a34..b8a7639 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -53,7 +53,8 @@ set -g status-right-length 150 # Note: Powerline font requires alternate of bold on right side # Corrects gap on right of character that reveals BG color #+ Font: Powerline Consolas -set -g status-right "#[fg=colour235,bg=colour233,bold]#[fg=colour240,bg=colour235,nobold] %H:%M:%S #[fg=colour240,bg=colour235,bold]#[fg=colour233,bg=colour240,nobold] %d-%b-%y #[fg=colour100,bg=colour240,bold]#[fg=colour233,bg=colour100,bold] #H " +#set -g status-right "#[fg=colour235,bg=colour233,bold]#[fg=colour240,bg=colour235,nobold] %H:%M:%S #[fg=colour240,bg=colour235,bold]#[fg=colour233,bg=colour240,nobold] %d-%b-%y #[fg=colour100,bg=colour240,bold]#[fg=colour233,bg=colour100,bold] #H " +set -g status-right "#[fg=colour235,bg=colour233,bold]#[fg=colour240,bg=colour235,nobold] %H:%M:%S #[fg=colour240,bg=colour235,bold]#[fg=colour233,bg=colour240,nobold] %d-%b-%y #[fg=colour100,bg=colour240,bold]#[fg=colour233,bg=colour100,bold] #(/home/kapper/go/bin/gitux #{pane_current_path}) " # Simple Git #set -g status-right "#[fg=colour235,bg=colour233] #{simple_git_status} #[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour100,bg=colour240]#[fg=colour233,bg=colour100,bold] #H " @@ -62,14 +63,14 @@ set -g status-right "#[fg=colour235,bg=colour233,bold]#[fg=colour240,bg=colo #set -g status-right "#[fg=colour208,bg=colour233]#[fg=colour235,bg=colour208] #{git_upstream} #{git_branch} #[fg=colour240,bg=colour235] %H:%M:%S #[fg=colour240,bg=colour235]#[fg=colour233,bg=colour240] %d-%b-%y #[fg=colour100,bg=colour240]#[fg=colour233,bg=colour100,bold] #H " # Window status -set -g window-status-format "" +set -g window-status-format '#(/home/kapper/go/bin/gitmux #{pane_current_path})' # set -g window-status-format " #I:#W#F (TMUX OTHER STATUS) #(pwd | sed -e "s|.*/\(.*/.*\)|\1|") " -set -g window-status-current-format "" +set -g window-status-current-format '#(/home/kapper/go/bin/gitmux #{pane_current_path})' #set -g window-status-current-format "#[fg=colour255,bg=colour233]#[fg=colour100,nobold] #(whoami)@#H #[fg=colour255,bg=colour233,nobold]" # #{pane_current_path} # Current window status -set -g window-status-current-style bg=colour100,fg=colour235 +set -g window-status-current-style bg=colour233,fg=colour100 # Window with activity status set -g window-status-activity-style bg=colour233,fg=colour245