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

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

Browse Source 
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
parent cb8d5ead68 8f3230921e
commit 4f3771f4ce
23 changed files with 322 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vim/.vim/.netrwhist
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'

41
vim/.vim/bundle/dirindex.html Normal file
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>

1
vim/.vim/bundle/goyo.vim Submodule

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

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

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

1
vim/.vim/bundle/lightline-buffer Submodule

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

1
vim/.vim/bundle/minibufexpl.vim Submodule

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

1
vim/.vim/bundle/targets.vim Submodule

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

2
vim/.vim/bundle/vim-airline

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

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

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

1
vim/.vim/bundle/vim-buftabline Submodule

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

1
vim/.vim/bundle/vim-easyescape Submodule

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

50
vim/.vimrc
View File

@@ -6,6 +6,7 @@ set encoding=utf-8
let mapleader=","
set nu
set laststatus=2
set showtabline=2
set hidden
set incsearch
@@ -26,7 +27,7 @@ hi cursorline cterm=none term=none ctermbg=236
set cursorline
"enable relative line numbers
set number relativenumber
"set number relativenumber
"set highlight cursorcolumn cterm=NONE ctermbg=darkred ctermfg=white guibg=darkred guifg=white
nnoremap <Leader>c :set cursorline! cursorcolumn!<CR>
@@ -50,10 +51,22 @@ nnoremap <C-j> <C-W><C-J>
nnoremap <C-k> <C-W><C-K>
nnoremap <C-l> <C-W><C-L>
nnoremap <C-h> <C-W><C-H>
" use jj to escape insert mode
inoremap jj <Esc>
inoremap jk <Esc>
inoremap kj <Esc>
nnoremap <CR> o<Esc>
" use jk to escape insert mode - using easyescape plugin
let g:easyescape_chars = { "j": 1, "k": 1 }
"let g:easyescape_timeout = 100
cnoremap jk <ESC>
cnoremap kj <ESC>
" blank lines
nnoremap <Enter> o<ESC>
nnoremap <S-Enter> O<ESC>
nnoremap <leader>l :ls<CR>:b<Space>
nnoremap <Tab> :bnext<CR>
@@ -66,7 +79,7 @@ nnoremap <space> za
map <C-n> :NERDTreeToggle<CR>
"lightline colorscheme
let g:lightline = {'colorscheme': 'powerline',}
let g:lightline = {'colorscheme': 'jellybeans',}
" set the runtime path to include Vundle and initialize
set rtp+=~/.vim/bundle/Vundle.vim
@@ -81,12 +94,43 @@ Plugin 'vim-scripts/indentpython.vim'
Plugin 'scrooloose/syntastic'
" PEP8 checking plugin
Plugin 'nvie/vim-flake8'
"Plugin 'Lokaltog/powerline', {'rtp': 'powerline/bindings/vim/'}
Plugin 'itchyny/lightline.vim'
Plugin 'taohex/lightline-buffer'
"Plugin 'klen/python-mode'
Plugin 'itchyny/calendar.vim'
Plugin 'davidhalter/jedi-vim'
Plugin 'tpope/vim-surround'
Plugin 'ap/vim-buftabline'
Plugin 'wellle/targets.vim'
Plugin 'junegunn/goyo.vim'
Plugin 'zhou13/vim-easyescape'
call vundle#end() " required
filetype plugin indent on " required
" use lightline-buffer in lightline
let g:lightline = {
\ 'tabline': {
\ 'left': [ [ 'bufferinfo' ],
\ [ 'separator' ],
\ [ 'bufferbefore', 'buffercurrent', 'bufferafter' ], ],
\ 'right': [ [ 'close' ], ],
\ },
\ 'component_expand': {
\ 'buffercurrent': 'lightline#buffer#buffercurrent',
\ 'bufferbefore': 'lightline#buffer#bufferbefore',
\ 'bufferafter': 'lightline#buffer#bufferafter',
\ },
\ 'component_type': {
\ 'buffercurrent': 'tabsel',
\ 'bufferbefore': 'raw',
\ 'bufferafter': 'raw',
\ },
\ 'component_function': {
\ 'bufferinfo': 'lightline#buffer#bufferinfo',
\ },
\ 'component': {
\ 'separator': '',
\ },
\ }

35
vim/dirindex.html Normal file
View File

@@ -0,0 +1,35 @@
<!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</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></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=".vim/dirindex.html">.vim</a></li>
</ul><p>
</body>
</html>

1
vim/index.html Symbolic link
View File

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