mirror of
https://github.com/aquatix/dotfiles.git
synced 2025-12-06 22:55:10 +01:00
Merge branch 'master' of github.com:aquatix/dotfiles
This commit is contained in:
@@ -76,6 +76,7 @@ alias gst "git status"
|
||||
alias ga "git add -A"
|
||||
alias gl "git log"
|
||||
alias gls "git shortlog --summary"
|
||||
alias gld "git log --follow -p -- " # Shows history with diffs for the filename provided
|
||||
alias gr "git reflog"
|
||||
alias gt 'git tag|less'
|
||||
#alias gad 'git log --pretty='"'"'%at'"'"' | while read d; do date -d "@$d"; done | awk '"'"'{print $1}'"'"' | sort | uniq -c'
|
||||
|
||||
10
.tmux.conf
10
.tmux.conf
@@ -54,22 +54,12 @@ set -g status-bg colour234
|
||||
set -g pane-border-style fg=colour245
|
||||
set -g pane-active-border-style fg=colour39
|
||||
set -g message-style fg=colour16,bg=colour221,bold
|
||||
#set -g status-left '#[fg=colour235,bg=colour252,bold] ❐ #S #[fg=colour252,bg=colour238,nobold]⮀#[fg=colour245,bg=colour238,bold] #(whoami) #[fg=colour238,bg=colour234,nobold]⮀'
|
||||
# Status line with username:
|
||||
#set -g status-left '#[fg=colour235,bg=colour252,bold] ❐ #S #[fg=colour252,bg=colour238,nobold]#[fg=colour245,bg=colour238,bold] #(whoami) #[fg=colour238,bg=colour234,nobold]'
|
||||
# Status line without username:
|
||||
set -g status-left '#[fg=colour235,bg=colour252,bold] ❐ #S #[fg=colour252,bg=colour234,nobold]'
|
||||
#set -g window-status-format "#[fg=colour235,bg=colour252,bold] #I #W "
|
||||
#set -g window-status-format "#[fg=colour235,bg=colour252]#I #W#[fg=colour235,bg=colour252,bold]"
|
||||
#set -g window-status-format "#[fg=colour234,bg=colour252,nobold]#I #W#[fg=colour252,bg=colour234,nobold]"
|
||||
set -g window-status-format "#[fg=colour252,bg=colour234,nobold] #I #W "
|
||||
#set -g window-status-current-format "#[fg=colour234,bg=colour39]⮀#[fg=black,bg=colour39,noreverse,bold] #I: #W #[fg=colour39,bg=colour234,nobold]⮀"
|
||||
#set -g window-status-current-format "#[fg=colour234,bg=colour39]#[fg=black,bg=colour39,noreverse,bold] #I: #W #[fg=colour39,bg=colour234,nobold]"
|
||||
#set -g window-status-current-format "#[fg=colour234,bg=colour39]#[fg=black,bg=colour39,noreverse,bold] #I: #W #[fg=colour39,bg=colour234,nobold]"
|
||||
set -g window-status-current-format "#[fg=colour234,bg=colour39]#[fg=black,bg=colour39,noreverse,bold] #I #W #[fg=colour39,bg=colour234,nobold]"
|
||||
set -g window-status-separator ""
|
||||
set -g status-right '#(hostname) #[bg=#bbbbbb]#[fg=#000000] #(cut -d " " -f -3 /proc/loadavg) #[bg=#4e4e4e]#[fg=#ffffff]#(date +" %H:%M ")'
|
||||
#
|
||||
|
||||
# Patch for OS X pbpaste and pbcopy under tmux.
|
||||
#set-option -g default-command "which reattach-to-user-namespace > /dev/null && reattach-to-user-namespace -l $SHELL || $SHELL"
|
||||
|
||||
Reference in New Issue
Block a user