summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xmake1
-rw-r--r--vim/vimrc23
2 files changed, 5 insertions, 19 deletions
diff --git a/make b/make
index 0e1cfb7..1e2a73b 100755
--- a/make
+++ b/make
@@ -44,4 +44,5 @@ mkdir temp
cd
rm -rf .tmux
git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
+
tmux source-file ~/.tmux.conf
diff --git a/vim/vimrc b/vim/vimrc
index d903e23..3edbdd1 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -110,7 +110,7 @@ set undodir=/home/urbain/.vim/vimundo/
set nonumber
set listchars=tab:▸\ ,eol:¬,trail:-
set fillchars=fold:\ ,vert:\ ,
-set showbreak=...
+set showbreak=\ \ \ \ \ \ ...
set colorcolumn=0
set scrolloff=0
if has('gui_running')
@@ -176,27 +176,12 @@ nnoremap <s-Return> O<Esc>
nnoremap J mzJ`z
nnoremap Y y$
-" nnoremap - za
nnoremap <c-y> 3<c-y>
nnoremap <c-e> 3<c-e>
-nnoremap j gj
-nnoremap k gk
-nnoremap $ g$
-nnoremap ^ g^
-nnoremap gj j
-nnoremap gk k
-nnoremap g$ $
-nnoremap g^ ^
-
-vnoremap j gj
-vnoremap k gk
-vnoremap $ g$
-vnoremap ^ g^
-vnoremap gj j
-vnoremap gk k
-vnoremap g$ $
-vnoremap g^ ^
+" Dvorak specific
+nnoremap : ,
+nnoremap , :
"" Latex
let g:tex_fast=""