aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-06-14 22:23:22 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-06-14 22:42:29 +1200
commit7bfc2ae02ce2049e464837881df1afc223f661ba (patch)
tree282c111f9263c447e571637242dfc7935a8385ca
parent939bdc40bddba39824c01a90aa96430ae3ad0fcb (diff)
downloaddotfiles-7bfc2ae02ce2049e464837881df1afc223f661ba.tar.gz
Use tabs for Git configuration files
The frontend tools use tabs, and it's probably best not to fight them on it.
-rw-r--r--.gitmodules116
-rw-r--r--git/gitconfig.mi532
-rw-r--r--vim/after/indent/gitconfig.vim6
3 files changed, 80 insertions, 74 deletions
diff --git a/.gitmodules b/.gitmodules
index 344c4b6e..5f049838 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,92 +1,92 @@
# Vim plugins
[submodule "vim/bundle/big_file_options"]
- path = vim/bundle/big_file_options
- url = https://sanctum.geek.nz/code/vim-big-file-options.git
+ path = vim/bundle/big_file_options
+ url = https://sanctum.geek.nz/code/vim-big-file-options.git
[submodule "vim/bundle/colon_operator"]
- path = vim/bundle/colon_operator
- url = https://sanctum.geek.nz/code/vim-colon-operator.git
+ path = vim/bundle/colon_operator
+ url = https://sanctum.geek.nz/code/vim-colon-operator.git
[submodule "vim/bundle/copy_linebreak"]
- path = vim/bundle/copy_linebreak
- url = https://sanctum.geek.nz/code/vim-copy-linebreak.git
+ path = vim/bundle/copy_linebreak
+ url = https://sanctum.geek.nz/code/vim-copy-linebreak.git
[submodule "vim/bundle/cursorline_current"]
- path = vim/bundle/cursorline_current
- url = https://sanctum.geek.nz/code/vim-cursorline-current.git
+ path = vim/bundle/cursorline_current
+ url = https://sanctum.geek.nz/code/vim-cursorline-current.git
[submodule "vim/bundle/digraph_search"]
- path = vim/bundle/digraph_search
- url = https://sanctum.geek.nz/code/vim-digraph-search.git
+ path = vim/bundle/digraph_search
+ url = https://sanctum.geek.nz/code/vim-digraph-search.git
[submodule "vim/bundle/equalalways_resized"]
- path = vim/bundle/equalalways_resized
- url = https://sanctum.geek.nz/code/vim-equalalways-resized.git
+ path = vim/bundle/equalalways_resized
+ url = https://sanctum.geek.nz/code/vim-equalalways-resized.git
[submodule "vim/bundle/foldlevelstart_stdin"]
- path = vim/bundle/foldlevelstart_stdin
- url = https://sanctum.geek.nz/code/vim-foldlevelstart-stdin.git
+ path = vim/bundle/foldlevelstart_stdin
+ url = https://sanctum.geek.nz/code/vim-foldlevelstart-stdin.git
[submodule "vim/bundle/insert_cancel"]
- path = vim/bundle/insert_cancel
- url = https://sanctum.geek.nz/code/vim-insert-cancel.git
+ path = vim/bundle/insert_cancel
+ url = https://sanctum.geek.nz/code/vim-insert-cancel.git
[submodule "vim/bundle/insert_suspend_hlsearch"]
- path = vim/bundle/insert_suspend_hlsearch
- url = https://sanctum.geek.nz/code/vim-insert-suspend-hlsearch.git
+ path = vim/bundle/insert_suspend_hlsearch
+ url = https://sanctum.geek.nz/code/vim-insert-suspend-hlsearch.git
[submodule "vim/bundle/insert_timeout"]
- path = vim/bundle/insert_timeout
- url = https://sanctum.geek.nz/code/vim-insert-timeout.git
+ path = vim/bundle/insert_timeout
+ url = https://sanctum.geek.nz/code/vim-insert-timeout.git
[submodule "vim/bundle/keep_position"]
- path = vim/bundle/keep_position
- url = https://sanctum.geek.nz/code/vim-keep-position.git
+ path = vim/bundle/keep_position
+ url = https://sanctum.geek.nz/code/vim-keep-position.git
[submodule "vim/bundle/put_blank_lines"]
- path = vim/bundle/put_blank_lines
- url = https://sanctum.geek.nz/code/vim-put-blank-lines.git
+ path = vim/bundle/put_blank_lines
+ url = https://sanctum.geek.nz/code/vim-put-blank-lines.git
[submodule "vim/bundle/quickfix_auto_open"]
- path = vim/bundle/quickfix_auto_open
- url = https://sanctum.geek.nz/code/vim-quickfix-auto-open.git
+ path = vim/bundle/quickfix_auto_open
+ url = https://sanctum.geek.nz/code/vim-quickfix-auto-open.git
[submodule "vim/bundle/redact_pass"]
- path = vim/bundle/redact_pass
- url = https://sanctum.geek.nz/code/vim-redact-pass.git
+ path = vim/bundle/redact_pass
+ url = https://sanctum.geek.nz/code/vim-redact-pass.git
[submodule "vim/bundle/regex_escape"]
- path = vim/bundle/regex_escape
- url = https://sanctum.geek.nz/code/vim-regex-escape.git
+ path = vim/bundle/regex_escape
+ url = https://sanctum.geek.nz/code/vim-regex-escape.git
[submodule "vim/bundle/replace_operator"]
- path = vim/bundle/replace_operator
- url = https://sanctum.geek.nz/code/vim-replace-operator.git
+ path = vim/bundle/replace_operator
+ url = https://sanctum.geek.nz/code/vim-replace-operator.git
[submodule "vim/bundle/shebang_change_filetype"]
- path = vim/bundle/shebang_change_filetype
- url = https://sanctum.geek.nz/code/vim-shebang-change-filetype.git
+ path = vim/bundle/shebang_change_filetype
+ url = https://sanctum.geek.nz/code/vim-shebang-change-filetype.git
[submodule "vim/bundle/shebang_create_exec"]
- path = vim/bundle/shebang_create_exec
- url = https://sanctum.geek.nz/code/vim-shebang-create-exec.git
+ path = vim/bundle/shebang_create_exec
+ url = https://sanctum.geek.nz/code/vim-shebang-create-exec.git
[submodule "vim/bundle/squeeze_repeat_blanks"]
- path = vim/bundle/squeeze_repeat_blanks
- url = https://sanctum.geek.nz/code/vim-squeeze-repeat-blanks.git
+ path = vim/bundle/squeeze_repeat_blanks
+ url = https://sanctum.geek.nz/code/vim-squeeze-repeat-blanks.git
[submodule "vim/bundle/strip_trailing_whitespace"]
- path = vim/bundle/strip_trailing_whitespace
- url = https://sanctum.geek.nz/code/vim-strip-trailing-whitespace.git
+ path = vim/bundle/strip_trailing_whitespace
+ url = https://sanctum.geek.nz/code/vim-strip-trailing-whitespace.git
[submodule "vim/bundle/toggle_flags"]
- path = vim/bundle/toggle_flags
- url = https://sanctum.geek.nz/code/vim-toggle-flags.git
+ path = vim/bundle/toggle_flags
+ url = https://sanctum.geek.nz/code/vim-toggle-flags.git
[submodule "vim/bundle/vertical_region"]
- path = vim/bundle/vertical_region
- url = https://sanctum.geek.nz/code/vim-vertical-region.git
+ path = vim/bundle/vertical_region
+ url = https://sanctum.geek.nz/code/vim-vertical-region.git
[submodule "vim/bundle/vimrc_reload_filetype"]
- path = vim/bundle/vimrc_reload_filetype
- url = https://sanctum.geek.nz/code/vim-vimrc-reload-filetype.git
+ path = vim/bundle/vimrc_reload_filetype
+ url = https://sanctum.geek.nz/code/vim-vimrc-reload-filetype.git
[submodule "vim/bundle/write_mkpath"]
- path = vim/bundle/write_mkpath
- url = https://sanctum.geek.nz/code/vim-write-mkpath.git
+ path = vim/bundle/write_mkpath
+ url = https://sanctum.geek.nz/code/vim-write-mkpath.git
# Vim filetype plugins
[submodule "vim/bundle/diff_prune"]
- path = vim/bundle/diff_prune
- url = https://sanctum.geek.nz/code/vim-diff-prune.git
+ path = vim/bundle/diff_prune
+ url = https://sanctum.geek.nz/code/vim-diff-prune.git
[submodule "vim/bundle/make_target"]
- path = vim/bundle/make_target
- url = https://sanctum.geek.nz/code/vim-make-target.git
+ path = vim/bundle/make_target
+ url = https://sanctum.geek.nz/code/vim-make-target.git
[submodule "vim/bundle/perl_version_bump"]
- path = vim/bundle/perl_version_bump
- url = https://sanctum.geek.nz/code/vim-perl-version-bump.git
+ path = vim/bundle/perl_version_bump
+ url = https://sanctum.geek.nz/code/vim-perl-version-bump.git
# Vim colorschemes
[submodule "vim/bundle/juvenile"]
- path = vim/bundle/juvenile
- url = https://sanctum.geek.nz/code/vim-juvenile.git
+ path = vim/bundle/juvenile
+ url = https://sanctum.geek.nz/code/vim-juvenile.git
[submodule "vim/bundle/sahara"]
- path = vim/bundle/sahara
- url = https://sanctum.geek.nz/code/vim-sahara.git
+ path = vim/bundle/sahara
+ url = https://sanctum.geek.nz/code/vim-sahara.git
diff --git a/git/gitconfig.mi5 b/git/gitconfig.mi5
index 15669129..11b815d1 100644
--- a/git/gitconfig.mi5
+++ b/git/gitconfig.mi5
@@ -1,37 +1,37 @@
[commit]
- status = false
+ status = false
[diff]
- algorithm = patience
+ algorithm = patience
[fetch]
- output = compact
+ output = compact
[init]
- templateDir = ~/.git-template
+ templateDir = ~/.git-template
[log]
- date = local
- decorate = short
+ date = local
+ decorate = short
[merge]
- ff = false
- log = 1024
+ ff = false
+ log = 1024
[pull]
- ff = only
+ ff = only
[push]
- default = current
+ default = current
[sendemail]
- confirm = compose
- smtpServer = <% SENDMAIL %>
+ confirm = compose
+ smtpServer = <% SENDMAIL %>
[status]
- short = true
+ short = true
[user]
- name = <% NAME %>
- email = <% EMAIL %>
- signingKey = <% KEY %>
+ name = <% NAME %>
+ email = <% EMAIL %>
+ signingKey = <% KEY %>
diff --git a/vim/after/indent/gitconfig.vim b/vim/after/indent/gitconfig.vim
new file mode 100644
index 00000000..16a948ab
--- /dev/null
+++ b/vim/after/indent/gitconfig.vim
@@ -0,0 +1,6 @@
+" Use tabs for indent in Git config files, rather than fighting with the
+" frontend tool
+setlocal noexpandtab
+setlocal softtabstop=0
+let &shiftwidth = &tabstop
+let b:undo_indent .= '|setlocal expandtab< softtabstop< shiftwidth<'