Merge branch 'master' of ssh://jonfu.com/home/jon/dots

Conflicts:
	bash/.bashrc
	vim/.vim/bundle/calendar.vim
	vim/.vim/bundle/jedi-vim
	vim/.vim/bundle/lightline.vim
	vim/.vim/bundle/nerdtree
	vim/.vim/bundle/syntastic
	vim/.vim/bundle/vim-fugitive
This commit is contained in:
jon
2018-06-24 15:15:36 -05:00
23 changed files with 322 additions and 36 deletions

View File

@@ -1,5 +1,7 @@
let g:netrw_dirhistmax =10
let g:netrw_dirhist_cnt =3
let g:netrw_dirhist_cnt =5
let g:netrw_dirhist_1='/home/jon'
let g:netrw_dirhist_2='/home/jon/.gnome'
let g:netrw_dirhist_3='/home/jon'
let g:netrw_dirhist_4='/home/jon/dwm-6.1/.git'
let g:netrw_dirhist_5='/etc/X11/xorg.conf.d'

View File

@@ -0,0 +1,41 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel=stylesheet type="text/css" href="../../../../style.css">
<title>Directory Index: dots/vim/.vim/bundle</title>
</head>
<body>
<table class="toptable dirtop"><tr><td>
<p class="toptitle"><a href="../../../../dirindex.html">(root)</a>
/
<a href="../../../dirindex.html">dots</a>
/
<a href="../../dirindex.html">vim</a>
/
<a href="../dirindex.html">.vim</a>
/
<a href="dirindex.html">bundle</a></p>
<p class="topsubtitle">Directory Index</p>
</td></tr></table>
<div class="mininav">
<a href="../../../../dirindex.html">Root</a> |
<a href="../../../../allindex.html">Global</a> |
<a href="../../../../sortindex.html">Sorted</a>
</div>
<h3>Sub-directories:</h3>
<ul>
<li><a href="jedi-vim/dirindex.html">jedi-vim</a></li>
<li><a href="nerdtree/dirindex.html">nerdtree</a></li>
<li><a href="syntastic/dirindex.html">syntastic</a></li>
</ul><p>
</body>
</html>

Submodule vim/.vim/bundle/goyo.vim added at 5b8bd03787

1
vim/.vim/bundle/index.html Symbolic link
View File

@@ -0,0 +1 @@
dirindex.html

Submodule vim/.vim/bundle/lightline-buffer added at 128ddaad4a

Submodule vim/.vim/bundle/minibufexpl.vim added at ad72976ca3

Submodule vim/.vim/bundle/targets.vim added at c3042dc18a

Submodule vim/.vim/bundle/vim-airline updated: e9a7a12d9e...396cc92261

Submodule vim/.vim/bundle/vim-airline-themes updated: 08c76e4cd0...26f67b9265

Submodule vim/.vim/bundle/vim-buftabline added at 14d208b1fa

Submodule vim/.vim/bundle/vim-easyescape added at 710f59bc13

37
vim/.vim/dirindex.html Normal file
View File

@@ -0,0 +1,37 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<link rel=stylesheet type="text/css" href="../../../style.css">
<title>Directory Index: dots/vim/.vim</title>
</head>
<body>
<table class="toptable dirtop"><tr><td>
<p class="toptitle"><a href="../../../dirindex.html">(root)</a>
/
<a href="../../dirindex.html">dots</a>
/
<a href="../dirindex.html">vim</a>
/
<a href="dirindex.html">.vim</a></p>
<p class="topsubtitle">Directory Index</p>
</td></tr></table>
<div class="mininav">
<a href="../../../dirindex.html">Root</a> |
<a href="../../../allindex.html">Global</a> |
<a href="../../../sortindex.html">Sorted</a>
</div>
<h3>Sub-directories:</h3>
<ul>
<li><a href="bundle/dirindex.html">bundle</a></li>
</ul><p>
</body>
</html>

1
vim/.vim/index.html Symbolic link
View File

@@ -0,0 +1 @@
dirindex.html