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

Merging

Browse Source
This commit is contained in:
jon
2019-03-17 12:43:16 -05:00
parent 4cd0866979 416cffd7d3
commit 38ad193ba7
29 changed files with 2538 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -1,2 +1,4 @@
*.swp *.swp
.netrwhist .netrwhist
plugged/*
vim/.vim/plugged/*

2
bash/.bashrc
View File

@@ -31,6 +31,7 @@ alias ip='ip -c'
#golang stuff #golang stuff
export GOPATH=$HOME/gopath export GOPATH=$HOME/gopath
export PATH=$GOPATH:$GOPATH/bin:$PATH export PATH=$GOPATH:$GOPATH/bin:$PATH
export NNN_SHOW_HIDDEN=1
export EDITOR=/usr/bin/vim export EDITOR=/usr/bin/vim
@@ -48,7 +49,6 @@ export HISTTIMEFORMAT="%F %T: "
export HISTSIZE=1000 export HISTSIZE=1000
export HISTFILESIZE=2000 export HISTFILESIZE=2000
# Prompt
if [ ! -z "$TERM" ]; then if [ ! -z "$TERM" ]; then
export PS1="\[$(tput bold)\]\[$(tput setaf 2)\][\u@\h \W]\\$ \[$(tput sgr0)\]" export PS1="\[$(tput bold)\]\[$(tput setaf 2)\][\u@\h \W]\\$ \[$(tput sgr0)\]"
fi fi

2526
vim/.vim/autoload/plug.vim Normal file
View File

File diff suppressed because it is too large Load Diff

1
vim/.vim/bundle/SimpylFold

Submodule vim/.vim/bundle/SimpylFold deleted from aa0371d9d7

1
vim/.vim/bundle/Vundle.vim

Submodule vim/.vim/bundle/Vundle.vim deleted from 9a38216a1c

1
vim/.vim/bundle/calendar.vim

Submodule vim/.vim/bundle/calendar.vim deleted from 1aee272cc3

1
vim/.vim/bundle/ctrlp.vim

Submodule vim/.vim/bundle/ctrlp.vim deleted from 564176f01d

41
vim/.vim/bundle/dirindex.html
View File

@@ -1,41 +0,0 @@
<!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 vim/.vim/bundle/goyo.vim deleted from 5b8bd03787

1
vim/.vim/bundle/indentpython.vim

Submodule vim/.vim/bundle/indentpython.vim deleted from 6aaddfde21

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

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

1
vim/.vim/bundle/jedi-vim

Submodule vim/.vim/bundle/jedi-vim deleted from 2f65c636f8

1
vim/.vim/bundle/lightline.vim

Submodule vim/.vim/bundle/lightline.vim deleted from 688240e0ef

1
vim/.vim/bundle/minibufexpl.vim

Submodule vim/.vim/bundle/minibufexpl.vim deleted from ad72976ca3

1
vim/.vim/bundle/nerdtree

Submodule vim/.vim/bundle/nerdtree deleted from 370eb5bcb4

1
vim/.vim/bundle/python-mode

Submodule vim/.vim/bundle/python-mode deleted from 2859abb88e

1
vim/.vim/bundle/supertab

Submodule vim/.vim/bundle/supertab deleted from 40fe711e08

1
vim/.vim/bundle/syntastic

Submodule vim/.vim/bundle/syntastic deleted from 0d25f4fb42

1
vim/.vim/bundle/targets.vim

Submodule vim/.vim/bundle/targets.vim deleted from 4a5e9c09ec

1
vim/.vim/bundle/vim-airline

Submodule vim/.vim/bundle/vim-airline deleted from 3e13bab201

1
vim/.vim/bundle/vim-airline-themes

Submodule vim/.vim/bundle/vim-airline-themes deleted from 52dfa2b6c0

1
vim/.vim/bundle/vim-buftabline

Submodule vim/.vim/bundle/vim-buftabline deleted from 14d208b1fa

1
vim/.vim/bundle/vim-easyescape

Submodule vim/.vim/bundle/vim-easyescape deleted from 7054da8cae

1
vim/.vim/bundle/vim-flake8

Submodule vim/.vim/bundle/vim-flake8 deleted from d50b3715ef

1
vim/.vim/bundle/vim-fugitive

Submodule vim/.vim/bundle/vim-fugitive deleted from 2564c37d0a

1
vim/.vim/bundle/vim-surround

Submodule vim/.vim/bundle/vim-surround deleted from 597068870b

37
vim/.vim/dirindex.html
View File

@@ -1,37 +0,0 @@
<!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
View File

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

9
vim/.vimrc
View File

@@ -59,6 +59,7 @@ nnoremap <C-k> <C-W><C-K>
nnoremap <C-l> <C-W><C-L> nnoremap <C-l> <C-W><C-L>
nnoremap <C-h> <C-W><C-H> nnoremap <C-h> <C-W><C-H>
<<<<<<< HEAD
" provide movements in Insert mode via the <Alt> modifier key " provide movements in Insert mode via the <Alt> modifier key
inoremap <Esc>h <C-o>h inoremap <Esc>h <C-o>h
inoremap <Esc>j <C-o>j inoremap <Esc>j <C-o>j
@@ -70,6 +71,14 @@ inoremap <Esc>x <C-o>x
" fix alt meta mappings in rxvt " fix alt meta mappings in rxvt
"inoremap <A-h> <ESC>a "inoremap <A-h> <ESC>a
=======
" H/L for beginning/end
noremap H ^
noremap L $
noremap ^ H
noremap $ L
>>>>>>> 416cffd7d3c524d9cd24b9ec0186fa0e169d700a
" map ctrl-p to fzf " map ctrl-p to fzf
nnoremap <C-p> :Files<CR> nnoremap <C-p> :Files<CR>