summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--git/.gitconfig11
-rw-r--r--vim/.vim/ftplugin/c.vim2
-rw-r--r--vim/.vim/ftplugin/html.vim2
-rw-r--r--vim/.vim/ftplugin/javascript.vim4
-rw-r--r--vim/.vim/ftplugin/markdown.vim14
-rw-r--r--vim/.vim/ftplugin/python.vim2
-rw-r--r--vim/.vim/spell/en.utf-8.splbin0 -> 609337 bytes
-rw-r--r--vim/.vimrc22
8 files changed, 57 insertions, 0 deletions
diff --git a/git/.gitconfig b/git/.gitconfig
new file mode 100644
index 0000000..8868e0e
--- /dev/null
+++ b/git/.gitconfig
@@ -0,0 +1,11 @@
+[user]
+ email = ekaitz.zarraga@gmail.com
+ name = Ekaitz Zárraga
+[core]
+ editor = vim
+[color]
+ ui = auto
+[diff]
+ tool = vimdiff
+[merge]
+ tool = vimdiff
diff --git a/vim/.vim/ftplugin/c.vim b/vim/.vim/ftplugin/c.vim
new file mode 100644
index 0000000..5c2fba2
--- /dev/null
+++ b/vim/.vim/ftplugin/c.vim
@@ -0,0 +1,2 @@
+set tabstop=4 softtabstop=0 noexpandtab shiftwidth=4
+set autoindent
diff --git a/vim/.vim/ftplugin/html.vim b/vim/.vim/ftplugin/html.vim
new file mode 100644
index 0000000..12b33db
--- /dev/null
+++ b/vim/.vim/ftplugin/html.vim
@@ -0,0 +1,2 @@
+set tabstop=2 softtabstop=0 noexpandtab shiftwidth=2
+set autoindent
diff --git a/vim/.vim/ftplugin/javascript.vim b/vim/.vim/ftplugin/javascript.vim
new file mode 100644
index 0000000..6abfcce
--- /dev/null
+++ b/vim/.vim/ftplugin/javascript.vim
@@ -0,0 +1,4 @@
+set tabstop=2 softtabstop=0 noexpandtab shiftwidth=2
+set autoindent
+
+let javaScript_fold=1
diff --git a/vim/.vim/ftplugin/markdown.vim b/vim/.vim/ftplugin/markdown.vim
new file mode 100644
index 0000000..8abe28a
--- /dev/null
+++ b/vim/.vim/ftplugin/markdown.vim
@@ -0,0 +1,14 @@
+setlocal syntax=markdown
+
+" Spellcheck in markdown (automatic to english)
+setlocal spelllang=en
+setlocal spell
+
+" Textwidth for automatic wrap `gq` is formatting operation
+setlocal textwidth=79
+setlocal formatoptions+=t
+
+
+" Highlight where the lines are more than 80 characters wide
+setlocal colorcolumn=80
+highlight ColorColumn ctermbg=LightGreen
diff --git a/vim/.vim/ftplugin/python.vim b/vim/.vim/ftplugin/python.vim
new file mode 100644
index 0000000..5c2fba2
--- /dev/null
+++ b/vim/.vim/ftplugin/python.vim
@@ -0,0 +1,2 @@
+set tabstop=4 softtabstop=0 noexpandtab shiftwidth=4
+set autoindent
diff --git a/vim/.vim/spell/en.utf-8.spl b/vim/.vim/spell/en.utf-8.spl
new file mode 100644
index 0000000..83b9b8f
--- /dev/null
+++ b/vim/.vim/spell/en.utf-8.spl
Binary files differ
diff --git a/vim/.vimrc b/vim/.vimrc
new file mode 100644
index 0000000..7d2505c
--- /dev/null
+++ b/vim/.vimrc
@@ -0,0 +1,22 @@
+highlight ExtraWhitespace ctermbg=red guibg=red
+match ExtraWhitespace /\s\+$/
+autocmd BufWinEnter * match ExtraWhitespace /\s\+$/
+autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@<!$/
+autocmd InsertLeave * match ExtraWhitespace /\s\+$/
+autocmd BufWinLeave * call clearmatches()
+
+
+filetype plugin on
+
+" Fold
+set foldmethod=syntax
+set foldlevelstart=99
+
+
+
+" HighLight search and map CarrierReturn to remove highlight
+set hlsearch
+nnoremap <CR> :noh<CR><CR>
+
+" Understand .md as markdown
+autocmd BufNewFile,BufRead *.md set ft=markdown