Merge branch 'master' of github.com:lytedev/dotfiles

This commit is contained in:
Daniel Flanagan 2017-05-20 13:57:00 -05:00
commit 596a82fa68
4 changed files with 6 additions and 8 deletions

View file

@ -121,12 +121,11 @@ let g:deoplete#enable_at_startup = 1
Plug 'scrooloose/syntastic' " syntax checker Plug 'scrooloose/syntastic' " syntax checker
Plug 'bkad/CamelCaseMotion' " camel case and underscore word movements Plug 'bkad/CamelCaseMotion' " camel case and underscore word movements
Plug 'LargeFile' " gracefully handle very large files Plug 'vim-scripts/LargeFile' " gracefully handle very large files
Plug 'tpope/vim-commentary' " toggle comments in code easily Plug 'tpope/vim-commentary' " toggle comments in code easily
Plug 'tpope/vim-repeat' " toggle comments in code easily Plug 'tpope/vim-repeat' " toggle comments in code easily
Plug 'tmux-plugins/vim-tmux-focus-events' " allow transitions within tmux Plug 'tmux-plugins/vim-tmux-focus-events' " allow transitions within tmux
Plug 'christoomey/vim-tmux-navigator' " allow transitions within tmux Plug 'christoomey/vim-tmux-navigator' " allow transitions within tmux
Plug 'tasklist.vim' " show tasks with leader,t
Plug 'godlygeek/tabular' " align text lines together Plug 'godlygeek/tabular' " align text lines together
Plug 'dhruvasagar/vim-table-mode' " for creating and editing character tables Plug 'dhruvasagar/vim-table-mode' " for creating and editing character tables
Plug 'lytedev/vim-superman' " view man pages with vim Plug 'lytedev/vim-superman' " view man pages with vim

View file

@ -14,12 +14,6 @@ if [ -f "$HOME/.env_bspwm" ]; then
source "$HOME/.env_bspwm" source "$HOME/.env_bspwm"
fi fi
# old colors
# bspc config normal_border_color "#$(get_color 05)"
# bspc config focused_border_color "#$(get_color 0D)"
# bspc config active_border_color "#$(get_color 0D)"
# bspc config presel_feedback_color "#$(get_color 0D)"
bspc config normal_border_color "$(xrdb -query | sed -ne 's/.*background:\s*//p')" bspc config normal_border_color "$(xrdb -query | sed -ne 's/.*background:\s*//p')"
bspc config focused_border_color "$(xrdb -query | sed -ne 's/.*color0\?4:\s*//p')" bspc config focused_border_color "$(xrdb -query | sed -ne 's/.*color0\?4:\s*//p')"
bspc config active_border_color "$(xrdb -query | sed -ne 's/.*color0\?4:\s*//p')" bspc config active_border_color "$(xrdb -query | sed -ne 's/.*color0\?4:\s*//p')"

View file

@ -83,3 +83,7 @@ Here are some bullet points on my workflow as a Web Developer:
* urxvt fontawesome * urxvt fontawesome
* Alacritty as terminal? * Alacritty as terminal?
* Cloud IRC * Cloud IRC
* XDG Directories (see [here][xdg-user-dirs])
[xdg-user-dirs]: https://wiki.archlinux.org/index.php/XDG_user_directories

View file

@ -46,6 +46,7 @@ alias tmls="tmux list-sessions"
alias tmatt="tmux attach -t" alias tmatt="tmux attach -t"
alias tu="tmux attach -t utils || tmux new -s utils" alias tu="tmux attach -t utils || tmux new -s utils"
alias tdf="tmux attach -t df || tmux new -s df -c \"$DOTFILES_PATH\"" alias tdf="tmux attach -t df || tmux new -s df -c \"$DOTFILES_PATH\""
alias tmon="tmux attach -t mon || tmux new -s mon"
# git aliases # git aliases
alias gs="git status" alias gs="git status"