aboutsummaryrefslogtreecommitdiff
path: root/vim/indent
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-10-30 15:03:46 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-10-30 15:03:46 +1300
commit9858af6f41ff7d9f295384c45ef21d2f3892fbd3 (patch)
tree7ef47f447c49526d1a0885885b9d740250df2907 /vim/indent
parentAdd some more file-specific indent preferences (diff)
downloaddotfiles-9858af6f41ff7d9f295384c45ef21d2f3892fbd3.tar.gz
dotfiles-9858af6f41ff7d9f295384c45ef21d2f3892fbd3.zip
Move filetype-specific indent options into indent/
I'm still getting used to the structure of the configuration here, and had mistakenly put these indent-related settings into files in the ftplugin directory.
Diffstat (limited to 'vim/indent')
-rw-r--r--vim/indent/c.vim6
-rw-r--r--vim/indent/csv.vim3
-rw-r--r--vim/indent/html.vim18
-rw-r--r--vim/indent/perl.vim6
-rw-r--r--vim/indent/php.vim7
-rw-r--r--vim/indent/sh.vim6
-rw-r--r--vim/indent/tsv.vim3
-rw-r--r--vim/indent/vim.vim4
8 files changed, 53 insertions, 0 deletions
diff --git a/vim/indent/c.vim b/vim/indent/c.vim
new file mode 100644
index 00000000..1be25bf5
--- /dev/null
+++ b/vim/indent/c.vim
@@ -0,0 +1,6 @@
+" Explicitly set indent level; this matches the global default, but it's tidy
+" to enforce it in case we changed from a filetype with different value (e.g.
+" VimL)
+setlocal shiftwidth=4
+setlocal softtabstop=4
+setlocal tabstop=4
diff --git a/vim/indent/csv.vim b/vim/indent/csv.vim
new file mode 100644
index 00000000..3d78df97
--- /dev/null
+++ b/vim/indent/csv.vim
@@ -0,0 +1,3 @@
+" Manual indenting and literal tabs for CSVs
+setlocal noautoindent
+setlocal noexpandtab
diff --git a/vim/indent/html.vim b/vim/indent/html.vim
new file mode 100644
index 00000000..654aa407
--- /dev/null
+++ b/vim/indent/html.vim
@@ -0,0 +1,18 @@
+" Explicitly set indent level; this matches the global default, but it's tidy
+" to enforce it in case we changed from a filetype with different value (e.g.
+" VimL)
+setlocal shiftwidth=4
+setlocal softtabstop=4
+setlocal tabstop=4
+
+" Run tidy -eq -utf8 on file for the current buffer
+nnoremap <leader>v :exe "!tidy -eq -utf8 " . shellescape(expand("%"))<CR>
+
+" Make a bare URL into a link to itself
+function! UrlLink()
+ normal yiW
+ execute "normal i<a href=\"\<C-R>0\">\<Esc>"
+ normal E
+ execute "normal a</a>\<Esc>"
+endfunction
+nnoremap <silent> <leader>r :<C-U>call UrlLink()<CR>
diff --git a/vim/indent/perl.vim b/vim/indent/perl.vim
new file mode 100644
index 00000000..1be25bf5
--- /dev/null
+++ b/vim/indent/perl.vim
@@ -0,0 +1,6 @@
+" Explicitly set indent level; this matches the global default, but it's tidy
+" to enforce it in case we changed from a filetype with different value (e.g.
+" VimL)
+setlocal shiftwidth=4
+setlocal softtabstop=4
+setlocal tabstop=4
diff --git a/vim/indent/php.vim b/vim/indent/php.vim
index d0fb1f8f..9e084f24 100644
--- a/vim/indent/php.vim
+++ b/vim/indent/php.vim
@@ -2,3 +2,10 @@
" to stop it processing its ridiculous expression-based indenting that never
" seems to do what I want. Just plain autoindent is fine.
let b:did_indent = 1
+
+" Explicitly set indent level; this matches the global default, but it's tidy
+" to enforce it in case we changed from a filetype with different value (e.g.
+" VimL)
+setlocal shiftwidth=4
+setlocal softtabstop=4
+setlocal tabstop=4
diff --git a/vim/indent/sh.vim b/vim/indent/sh.vim
new file mode 100644
index 00000000..1be25bf5
--- /dev/null
+++ b/vim/indent/sh.vim
@@ -0,0 +1,6 @@
+" Explicitly set indent level; this matches the global default, but it's tidy
+" to enforce it in case we changed from a filetype with different value (e.g.
+" VimL)
+setlocal shiftwidth=4
+setlocal softtabstop=4
+setlocal tabstop=4
diff --git a/vim/indent/tsv.vim b/vim/indent/tsv.vim
new file mode 100644
index 00000000..53841357
--- /dev/null
+++ b/vim/indent/tsv.vim
@@ -0,0 +1,3 @@
+" Manual indenting and literal tabs for TSVs
+setlocal noautoindent
+setlocal noexpandtab
diff --git a/vim/indent/vim.vim b/vim/indent/vim.vim
new file mode 100644
index 00000000..b958fe54
--- /dev/null
+++ b/vim/indent/vim.vim
@@ -0,0 +1,4 @@
+" Observe VimL conventions for two-space indents
+setlocal shiftwidth=2
+setlocal softtabstop=2
+setlocal tabstop=2