summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiederick de Vries <diederick@diederickdevries.net>2020-05-05 20:28:14 +0200
committerDiederick de Vries <diederick@diederickdevries.net>2020-05-05 20:55:34 +0200
commitac7a3d2b8ffdd85e573a1a683b8aeec38cf0bcef (patch)
tree2be2dcc1ffe96b03d7020fde5b0e9347392cb658
parentcdaabeb5231b4e10d30de2b0b8adc502682c689d (diff)
downloadvimrc-ac7a3d2b8ffdd85e573a1a683b8aeec38cf0bcef.tar.gz
vimrc-ac7a3d2b8ffdd85e573a1a683b8aeec38cf0bcef.tar.bz2
vimrc-ac7a3d2b8ffdd85e573a1a683b8aeec38cf0bcef.zip
fix: indentation
-rw-r--r--skeletons/skeleton.html20
-rw-r--r--vimrc.d/basis.vim2
-rw-r--r--vimrc.d/indentatie.vim10
3 files changed, 18 insertions, 14 deletions
diff --git a/skeletons/skeleton.html b/skeletons/skeleton.html
index 510d749..0c15b18 100644
--- a/skeletons/skeleton.html
+++ b/skeletons/skeleton.html
@@ -1,13 +1,13 @@
1<html> 1<html>
2 <head> 2 <head>
3 <title></title> 3 <title></title>
4 <link rel="stylesheet" type="text/css" href="document.css" /> 4 <link rel="stylesheet" type="text/css" href="document.css" />
5 <meta name="viewport" content="width=device-width, initial-scale=0.8" /> 5 <meta name="viewport" content="width=device-width, initial-scale=0.8" />
6 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> 6 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
7 </head> 7 </head>
8 <body> 8 <body>
9 <h1></h1> 9 <h1></h1>
10 <p></p> 10 <p></p>
11 </body> 11 </body>
12</html> 12</html>
13 13
diff --git a/vimrc.d/basis.vim b/vimrc.d/basis.vim
index 39f1eb0..4ae09d3 100644
--- a/vimrc.d/basis.vim
+++ b/vimrc.d/basis.vim
@@ -5,6 +5,8 @@ set mouse=""
5syntax enable 5syntax enable
6filetype plugin on 6filetype plugin on
7cabbrev h vert bot h 7cabbrev h vert bot h
8set nojoinspaces
9set nowrapscan
8 10
9noremap <Up> "" 11noremap <Up> ""
10noremap! <Up> <Esc> 12noremap! <Up> <Esc>
diff --git a/vimrc.d/indentatie.vim b/vimrc.d/indentatie.vim
index 4bb30b2..f7ab934 100644
--- a/vimrc.d/indentatie.vim
+++ b/vimrc.d/indentatie.vim
@@ -10,10 +10,14 @@ set tabstop=4
10set softtabstop=4 10set softtabstop=4
11set shiftwidth=4 11set shiftwidth=4
12set foldcolumn=4 12set foldcolumn=4
13set breakindent
14set fo+=j
13 15
14autocmd BufRead,BufNewFile *.txt,*.ini,*.sh,*.yml,*.json,*.html set shiftwidth=2|set autoindent 16filetype indent on
15autocmd BufRead,BufNewFile *.js,*.java,*.groovy,*.c,*.h set shiftwidth=4|set cindent 17set smartindent
16 18
19autocmd BufRead,BufNewFile *.txt set wrap|set shiftwidth=2|set sts=2
20autocmd BufRead,BufNewFile *.txt,*.ini,*.sh,*.yml,*.json,*.html set shiftwidth=2|set sts=2
17autocmd BufRead,BufNewFile *java set makeprg=mvn\ clean\ install 21autocmd BufRead,BufNewFile *java set makeprg=mvn\ clean\ install
18 22
19" Syntastic 23" Syntastic
@@ -28,5 +32,3 @@ let g:syntastic_check_on_open = 1
28let g:syntastic_check_on_wq = 0 32let g:syntastic_check_on_wq = 0
29let g:syntastic_error_symbol = "✗" 33let g:syntastic_error_symbol = "✗"
30let g:syntastic_warning_symbol = "⚠" 34let g:syntastic_warning_symbol = "⚠"
31
32