jon/dots
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master'

Browse Source
This commit is contained in:
jon
2017-07-30 16:54:28 -05:00
parent 11329aa465 fc8ca199a9
commit a2992665a2
10 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
conky/.config/conky/conky.conf
View File

@@ -57,5 +57,5 @@ conky.config = {
} }
conky.text = [[ conky.text = [[
$loadavg | $mem | ${upspeedf enp4s0}/${downspeedf enp4s0} | ${time %H:%M} ${time %m.%d} L $loadavg | M $mem | $battery_short | N ${upspeedf enp4s0}/${downspeedf enp4s0} | ${time %m/%d} ${time %H:%M}
]] ]]

2
vim/.vim/bundle/SimpylFold

Submodule vim/.vim/bundle/SimpylFold updated: 9e7c1c9d9b...aa0371d9d7

2
vim/.vim/bundle/Vundle.vim

Submodule vim/.vim/bundle/Vundle.vim updated: 88688fe453...6437ad6df4

2
vim/.vim/bundle/nerdtree

Submodule vim/.vim/bundle/nerdtree updated: eee431dbd4...a3fdf1e3c1

2
vim/.vim/bundle/syntastic

Submodule vim/.vim/bundle/syntastic updated: 78c0d21a9b...e1161a723a

2
vim/.vim/bundle/vim-airline

Submodule vim/.vim/bundle/vim-airline updated: b56a064377...e03afa1733

2
vim/.vim/bundle/vim-airline-themes

Submodule vim/.vim/bundle/vim-airline-themes updated: 6026eb78bf...5d75d76ca2

2
vim/.vim/bundle/vim-fugitive

Submodule vim/.vim/bundle/vim-fugitive updated: b754bc2031...913fff1cea

16
vim/.vimrc
View File

@@ -85,11 +85,11 @@ filetype plugin indent on " required
" " Put your non-Plugin stuff after this line " " Put your non-Plugin stuff after this line
"python with virtualenv support "python with virtualenv support
py << EOF "py << EOF
import os "import os
import sys "import sys
if 'VIRTUAL_ENV' in os.environ: "if 'VIRTUAL_ENV' in os.environ:
project_base_dir = os.environ['VIRTUAL_ENV'] " project_base_dir = os.environ['VIRTUAL_ENV']
activate_this = os.path.join(project_base_dir, 'bin/activate_this.py') " activate_this = os.path.join(project_base_dir, 'bin/activate_this.py')
execfile(activate_this, dict(__file__=activate_this)) " execfile(activate_this, dict(__file__=activate_this))
EOF "EOF

7
x/.xinitrc Normal file
View File

@@ -0,0 +1,7 @@
#[[ -f ~/.Xresources ]] && xrdb -merge -I$HOME ~/.Xresources
if [ -f ~/.Xresources ]; then
xrdb -merge -I$HOME ~/.Xresources
fi
exec dwm