aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
-rw-r--r--vim.symlink/after/ftplugin/clean.vim2
-rw-r--r--vim.symlink/after/ftplugin/jade.vim2
-rw-r--r--vim.symlink/after/ftplugin/php.vim3
-rw-r--r--vim.symlink/after/ftplugin/python.vim3
-rw-r--r--vim.symlink/after/ftplugin/tex.vim3
l---------vim.symlink/ftdetect/clean.vim1
l---------vim.symlink/ftplugin/clean.vim1
l---------vim.symlink/syntax/clean.vim1
m---------vim.symlink/vim-clean0
-rw-r--r--vim/vimrc.symlink75
11 files changed, 91 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..860ecc9
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "vim.symlink/vim-clean"]
+ path = vim.symlink/vim-clean
+ url = git@github.com:norm2782/vim-clean
diff --git a/vim.symlink/after/ftplugin/clean.vim b/vim.symlink/after/ftplugin/clean.vim
new file mode 100644
index 0000000..8b46046
--- /dev/null
+++ b/vim.symlink/after/ftplugin/clean.vim
@@ -0,0 +1,2 @@
+setlocal autoindent
+
diff --git a/vim.symlink/after/ftplugin/jade.vim b/vim.symlink/after/ftplugin/jade.vim
new file mode 100644
index 0000000..f6984cb
--- /dev/null
+++ b/vim.symlink/after/ftplugin/jade.vim
@@ -0,0 +1,2 @@
+set tabstop=2 shiftwidth=2 expandtab
+
diff --git a/vim.symlink/after/ftplugin/php.vim b/vim.symlink/after/ftplugin/php.vim
new file mode 100644
index 0000000..21c93a3
--- /dev/null
+++ b/vim.symlink/after/ftplugin/php.vim
@@ -0,0 +1,3 @@
+let g:php_folding=2
+setlocal foldmethod=syntax
+
diff --git a/vim.symlink/after/ftplugin/python.vim b/vim.symlink/after/ftplugin/python.vim
new file mode 100644
index 0000000..79df5d2
--- /dev/null
+++ b/vim.symlink/after/ftplugin/python.vim
@@ -0,0 +1,3 @@
+setlocal cc=80
+setlocal foldmethod=indent
+
diff --git a/vim.symlink/after/ftplugin/tex.vim b/vim.symlink/after/ftplugin/tex.vim
new file mode 100644
index 0000000..6151522
--- /dev/null
+++ b/vim.symlink/after/ftplugin/tex.vim
@@ -0,0 +1,3 @@
+setlocal spell spelllang=en_gb
+autocmd CursorHold,CursorHoldI * update
+
diff --git a/vim.symlink/ftdetect/clean.vim b/vim.symlink/ftdetect/clean.vim
new file mode 120000
index 0000000..3d5fa15
--- /dev/null
+++ b/vim.symlink/ftdetect/clean.vim
@@ -0,0 +1 @@
+../vim-clean/ftdetect/clean.vim \ No newline at end of file
diff --git a/vim.symlink/ftplugin/clean.vim b/vim.symlink/ftplugin/clean.vim
new file mode 120000
index 0000000..d273482
--- /dev/null
+++ b/vim.symlink/ftplugin/clean.vim
@@ -0,0 +1 @@
+../vim-clean/ftplugin/clean.vim \ No newline at end of file
diff --git a/vim.symlink/syntax/clean.vim b/vim.symlink/syntax/clean.vim
new file mode 120000
index 0000000..722311b
--- /dev/null
+++ b/vim.symlink/syntax/clean.vim
@@ -0,0 +1 @@
+../vim-clean/syntax/clean.vim \ No newline at end of file
diff --git a/vim.symlink/vim-clean b/vim.symlink/vim-clean
new file mode 160000
+Subproject dcf856063232add004e77457b857b774313fa2f
diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink
index 0463e21..39e2999 100644
--- a/vim/vimrc.symlink
+++ b/vim/vimrc.symlink
@@ -1,4 +1,73 @@
-syntax on
+" Vundle
+set nocompatible " be iMproved, required
+filetype off " required
+
+" set the runtime path to include Vundle and initialize
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
+" alternatively, pass a path where Vundle should install plugins
+"call vundle#begin('~/some/path/here')
+"
+" let Vundle manage Vundle, required
+Plugin 'gmarik/Vundle.vim'
+
+" Multiple cursors
+Plugin 'terryma/vim-multiple-cursors'
+
+" Special syntaxes
+Plugin 'groenewege/vim-less' " Less
+Plugin 'digitaltoad/vim-jade' " Jade
+Plugin 'lervag/vimtex' "TeX
+
+" Colour scheme
+Plugin 'altercation/vim-colors-solarized'
+
+" All of your Plugins must be added before the following line
+call vundle#end() " required
+filetype plugin indent on " required
+" To ignore plugin indent changes, instead use:
+"filetype plugin on
+"
+" Brief help
+" :PluginList - lists configured plugins
+" :PluginInstall - installs plugins; append `!` to update or just
+" :PluginUpdate
+" :PluginSearch foo - searches for foo; append `!` to refresh local cache
+" :PluginClean - confirms removal of unused plugins; append `!` to auto-approve removal
+"
+" see :h vundle for more details or wiki for FAQ
+" Put your non-Plugin stuff after this line
+
+set tabstop=4 shiftwidth=4 expandtab
+set linebreak
+set nu
+
+let g:vimtex_latexmk_options = '-pdf -shell-escape'
+
+filetype plugin indent on
+syntax enable
+
+" X clipboard manipulation using xsel
+" See: http://vim.wikia.com/wiki/Accessing_the_system_clipboard
+" Use :cz in visual mode to copy to clipboard, :pz for pasting
+" x instead of z for primary selection, v for secondary selection
+:command -range Cz :silent :<line1>,<line2>w !xsel -i -b
+:command -range Cx :silent :<line1>,<line2>w !xsel -i -p
+:command -range Cv :silent :<line1>,<line2>w !xsel -i -s
+:cabbrev cv Cv
+:cabbrev cz Cz
+:cabbrev cx Cx
+
+:command -range Pz :silent :r !xsel -o -b
+:command -range Px :silent :r !xsel -o -p
+:command -range Pv :silent :r !xsel -o -s
+
+:cabbrev pz Pz
+:cabbrev px Px
+:cabbrev pv Pv
+
+set background=light
+colorscheme morning
+
+:let g:vimtex_latexmk_file_line_error = 0
-" Wrap gitcommit file types at the appropriate length
-filetype indent plugin on