diff --git a/home/.tmux.conf b/home/.tmux.conf index 2ca410f..3420ef3 100644 --- a/home/.tmux.conf +++ b/home/.tmux.conf @@ -2,6 +2,7 @@ set -g default-terminal "screen-256color" setw -g mode-keys vi +set -g mouse on # Keybindings ########################################################################################################## @@ -22,3 +23,100 @@ bind-key -r -T prefix l select-pane -R # Bindings for history management bind-key C-l send-keys C-l \; clear-history + +# Bindings for splitting +bind | split-window-h +bind - split-window-v +unbind '"' +unbind % + +# Visual Styling ####################################################################################################### +###################### +### DESIGN CHANGES ### +###################### + +# panes +set -g pane-border-fg black +set -g pane-active-border-fg brightred + +## Status bar design +# status line +set -g status-justify left +set -g status-bg default +set -g status-fg colour12 +set -g status-interval 2 + +# messaging +set -g message-fg black +set -g message-bg yellow +set -g message-command-fg blue +set -g message-command-bg black + +#window mode +setw -g mode-bg colour6 +setw -g mode-fg colour0 + +# window status +setw -g window-status-format " #F#I:#W#F " +setw -g window-status-current-format " #F#I:#W#F " +setw -g window-status-format "#[fg=magenta]#[bg=black] #I #[bg=cyan]#[fg=colour8] #W " +setw -g window-status-current-format "#[bg=brightmagenta]#[fg=colour8] #I #[fg=colour8]#[bg=colour14] #W " +setw -g window-status-current-bg colour0 +setw -g window-status-current-fg colour11 +setw -g window-status-current-attr dim +setw -g window-status-bg green +setw -g window-status-fg black +setw -g window-status-attr reverse + +# Info on left (I don't have a session display for now) +set -g status-left '' + +# loud or quiet? +set-option -g visual-activity off +set-option -g visual-bell off +set-option -g visual-silence off +set-window-option -g monitor-activity off +set-option -g bell-action none + +set -g default-terminal "screen-256color" + +# The modes +setw -g clock-mode-colour colour135 +setw -g mode-attr bold +setw -g mode-fg colour196 +setw -g mode-bg colour238 + +# The panes +set -g pane-border-bg colour235 +set -g pane-border-fg colour238 +set -g pane-active-border-bg colour236 +set -g pane-active-border-fg colour51 + +# The statusbar +set -g status-position top +set -g status-bg colour234 +set -g status-fg colour137 +set -g status-attr dim +set -g status-left '' +set -g status-right '#[fg=colour233,bg=colour241,bold] %Y-%m-%d #[fg=colour233,bg=colour245,bold] %H:%M:%S ' +set -g status-right-length 50 +set -g status-left-length 20 + +setw -g window-status-current-fg colour81 +setw -g window-status-current-bg colour238 +setw -g window-status-current-attr bold +setw -g window-status-current-format ' #I#[fg=colour250]:#[fg=colour255]#W#[fg=colour50]#F ' + +setw -g window-status-fg colour138 +setw -g window-status-bg colour235 +setw -g window-status-attr none +setw -g window-status-format ' #I#[fg=colour237]:#[fg=colour250]#W#[fg=colour244]#F ' + +setw -g window-status-bell-attr bold +setw -g window-status-bell-fg colour255 +setw -g window-status-bell-bg colour1 + +# The messages +set -g message-attr bold +set -g message-fg colour232 +set -g message-bg colour166 diff --git a/home/.vimrc b/home/.vimrc index 235c9ea..9afcf84 100644 --- a/home/.vimrc +++ b/home/.vimrc @@ -128,10 +128,10 @@ let g:ale_set_loclist = 0 let g:ale_sign_column_always = 1 let g:ale_linters = { - \'html': [], - \'typescript': ['tslint', 'tsserver'], - \'python': ['pyls'] - \} + \'html': [], + \'typescript': ['tslint', 'tsserver'], + \'python': ['pyls'] + \} let g:ale_virtualenv_dir_names = ['usr'] " Key Mappings ######################################################################################################### diff --git a/home/bin/git-cleanup b/home/bin/git-cleanup index b07b971..9682b06 100755 --- a/home/bin/git-cleanup +++ b/home/bin/git-cleanup @@ -1,5 +1,6 @@ #!/usr/bin/env bash +git fetch -p git checkout master git pull