aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Set whitespace options for VimL locallyTom Ryder2017-10-301-3/+3
| | | | | | Setting these options globally is probably what's been causing me to get so confused by my indentation level changing to zero when editing other files in the same Vim instance as a VimL file. This should correct it.
* Rename Makefile target for Vim plugin bundlesTom Ryder2017-10-301-9/+9
| | | | | | | | | It's misleading to label this target as installing plugins when what it actually does at a directory level is install the Vim plugin submodules into ~/.vim/bundle for loading by Pathogen. This also allows scope for an `install-vim-plugins` target to actually install into ~/.vim/bundle, if I do need that at some point.
* Move PHP indent nixing into ~/.vim/indentTom Ryder2017-10-303-4/+10
| | | | | | | | | This method short-circuits the unwanted PHP expression-based indenting configuration completely, rather than running it all and then undoing it after the fact. This involves creating a new direction ~/.vim/indent, and a Makefile target install-vim-indent to copy everything into it.
* Move vim/after/ftdetect to vim/ftdetectTom Ryder2017-10-304-0/+6
| | | | | | | | | There's no particular reason to run these file detection rules after the plugins have run, so we'll put them in a more expected directory. I've created a new Makefile target to install this, `install-vim-ftdetect`, which is included as a prerequisite of the `install-vim` target.
* Move netrw.vim "after" script to plain configTom Ryder2017-10-301-0/+0
| | | | | | | | | | There's no particular need to set these options after netrw has loaded; they can be set before it's loaded, and the plugin will still observe them. This empties the vim/after/plugin directory. It doesn't need to be removed from the Makefile as there are no references to it; it was installed by a glob cp(1).
* Rebuild dotfiles(7) man page, remove double-headerTom Ryder2017-10-301-3/+0
| | | | | | | Commit feba460 set up the dist script helper for generating this, but didn't actually run it, committing a version of the manual that included the manual page header twice (with leading percent characters). Re-running the dist script helper corrected this.
* Specify path to indent settings in TABS.mdTom Ryder2017-10-301-1/+2
| | | | | | See 2b13fc, where this document was first created to avoid an expensive branch, and 1279419, where the branch for a multiple-file Vim configuration (splitting my large .vimrc) was merged in.
* Require minimum Vim version for background detectTom Ryder2017-10-291-1/+4
| | | | | | | | | | | | | | | | | | | | | | | On an ancient Vim (6.1), the block of code checking the value of COLORFGBG does not work at all, raising the following error output: Error detected while processing function DetectBackground: line 3: E117: Unknown function: split E15: Invalid expression: split($COLORFGBG, ';') line 6: E121: Undefined variable: l:colorfgbg E15: Invalid expression: len(l:colorfgbg) ? l:colorfgbg[-1] : '' line 9: E121: Undefined variable: l:bg E15: Invalid expression: l:bg == 'default' || l:bg == '7' || l:bg == '15' line 11: :else without :if: else line 13: :endif without :if: endif I'm unlikely to need such an ancient Vim very often, so I've simply added an error guard around the block.
* Update submodulesTom Ryder2017-10-291-0/+0
|
* Merge branch 'vim/guess-background'Tom Ryder2017-10-293-7/+30
|\
| * Switch on COLORFGBG to get background lightnessTom Ryder2017-10-291-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that this environment variable is kept and updated in tmux after 54553ae, we should be able to either configure terminals or explicitly set it during startup if we want to use lighter terminals. I'm much more comfortable with this than simply hardcoding it in the configuration. This doesn't solve the problem of carrying the environment variable over an SSH session, however, but I'm not really sure there's a solution to that besides configuring sshd(8) itself to accept these variables in transit.
| * Allow and track COLORFGBG/TERM env vars in tmuxTom Ryder2017-10-291-3/+1
| | | | | | | | | | | | | | Stop stripping them from the session on startup, and update them in the environment when new windows are reattached. This will allow me to use light-background terminals in future if I need to and have Vim accommodate it for syntax highlighting, at least in new windows.
| * Test whether to load sahara colorschemeTom Ryder2017-10-291-1/+3
|/ | | | | | | | | | | | This is in preparation for config in vim/config/syntax.vim that will do a more comprehensive job of applying heuristics to figure out if the background is light or dark and hence what colours should be loaded for the appropriate scheme. The test for the GUI or 256 colours is repeated in the colorscheme code itself, but I think that's OK given that sahara.vim is distributed separately and others probably wouldn't use the kind of guards introduced in this commit.
* Add explanatory comment for Vim 'nocompatible'Tom Ryder2017-10-291-1/+3
|
* Merge `filetype indent` with `filetype plugin`Tom Ryder2017-10-292-6/+1
| | | | | | | While it would be ideal to keep the indentation-related configuration in the config/indent.vim file, that approach ends up double-loading filetype.vim from the core, so we'll merge them into a single call in config/file.vim instead.
* Load Vim Pathogen with :runtimeTom Ryder2017-10-292-7/+6
| | | | | | | | | | | | | | | | | | | | Per this suggestion from the `vim-pathogen` FAQ: <https://github.com/tpope/vim-pathogen#faq> >>Can I put pathogen.vim in a submodule like all my other plugins? > >Sure, stick it under `~/.vim/bundle`, and prepend the following to >your vimrc: > > runtime bundle/vim-pathogen/autoload/pathogen.vim This method avoids using symbolic links, which is desirable in general, and also removes the need for the `install-vim-pathogen` dependency of the `install-vim-plugin` target, since this is now done in Vim configuration. This also takes away another of the steps required for setting up the Vim configuration on Windows.
* Restore dotfiles(7) manual as pre-built dist fileTom Ryder2017-10-294-1/+18
| | | | | | | | | | | | | | | | Commit 70fcb35 incorrectly built the dotfiles(7) manual without the header required by the Pandoc converter. Rebuilt it properly by making a script in a new directory "dist" which is to be run by the maintainer whenever its source file README.md is updated. This should probably be automated on my end with Git hooks. The reason we don't include the Pandoc recipe for making this manual as a target in the Makefile is to do with the heavy dependency of Pandoc, for which packages are not available on some desirable operating systems, as arranged in a8ab2cf. Also added the new install-man target as one of the default subtargets of `install`.
* Rebuild dotfiles(7) manual from README.mdTom Ryder2017-10-291-19/+17
|
* Adjust description of Vim configurationTom Ryder2017-10-291-7/+12
| | | | Mostly to reflect its split into subfiles in ~/.vim/config.
* Merge branch 'vimrc-split'Tom Ryder2017-10-2837-557/+541
|\ | | | | | | | | This development branch split .vimrc into many logically-grouped subfiles in ~/.vim/config/*.vim.
| * Move 'nrformats' .vimrc config into subfileTom Ryder2017-10-282-4/+3
| | | | | | | | | | | | | | This is an awkward filename and very unlikely to ever have anything but this one setting in it, but I can't think of any logical other place to put it. number.vim applies to line numbering, which is a distinct concept.
| * Move line-joining .vimrc config into subfileTom Ryder2017-10-282-5/+4
| |
| * Move 'tildeop' .vimrc config into subfileTom Ryder2017-10-282-4/+3
| | | | | | | | | | | | This is an awkward filename and very unlikely to ever have anything but this one setting in it, but I can't think of any logical other place to put it.
| * Move backspace .vimrc config into subfileTom Ryder2017-10-282-4/+3
| |
| * Move yanking .vimrc config into subfileTom Ryder2017-10-282-5/+4
| |
| * Move buffers .vimrc config into subfileTom Ryder2017-10-282-8/+8
| |
| * Move substitution .vimrc config into subfileTom Ryder2017-10-282-5/+4
| |
| * Move Fedora workaround .vimrc config into subfileTom Ryder2017-10-282-9/+8
| |
| * Move 'modeline' .vimrc setting to file.vim subfileTom Ryder2017-10-282-4/+4
| |
| * Move startup .vimrc config into subfileTom Ryder2017-10-282-4/+3
| | | | | | | | Just the 'shortmess' setting for now.
| * Restore 'background' .vimrc settingTom Ryder2017-10-281-0/+4
| | | | | | | | | | | | Per 6ca11a5, I've confirmed I do still need this, otherwise the default colorschemes (not sahara.vim) assume a bright background and show very dark colours.
| * Move syntax .vimrc config into subfileTom Ryder2017-10-282-12/+12
| | | | | | | | | | | | | | | | | | Some refactoring is done here, because as noted in 5caa13c, my custom colorscheme is implemented as a plugin to be loaded by Pathogen, and hence isn't available into after it's done its work. I've removed the :set background line for now until I'm sure it's needed, because at the moment I'm not sure.
| * Move completion .vimrc config into subfileTom Ryder2017-10-282-4/+3
| | | | | | | | | | | | Only one setting at the moment, but there's enough completion stuff even just in core Vim that I'm barely using, so this could be expanded upon later on.
| * Move scrolling .vimrc config into subfileTom Ryder2017-10-282-6/+5
| |
| * Move visual-mode .vimrc config into subfileTom Ryder2017-10-282-6/+5
| |
| * Move 'shellslash' .vimrc conf into cmds subfileTom Ryder2017-10-282-4/+4
| |
| * Move file .vimrc config into subfileTom Ryder2017-10-282-28/+27
| | | | | | | | | | Not completely sure this grouping is meaningful; I may refactor it a bit more later on.
| * Add matching .vimrc config into subfilesTom Ryder2017-10-282-7/+6
| | | | | | | | | | | | "Matching" here refers to using % as a motion to the matching character or closing statement for a block, as enabled by Vim and enhanced by the optional matchit.vim included with the distribution.
| * Move paste .vimrc config into subfileTom Ryder2017-10-282-7/+6
| |
| * Move wrapping .vimrc config into subfileTom Ryder2017-10-282-16/+15
| |
| * Move command .vimrc config into subfileTom Ryder2017-10-282-33/+33
| | | | | | | | | | A little bit iffy on the grouping here, but it's still better than having it all lumped in the one file.
| * Move line number .vimrc config into subfileTom Ryder2017-10-282-4/+3
| | | | | | | | | | This file is rather short; it may turn out to make more sense to put these settings elsewhere a bit later.
| * Move terminal .vimrc config into subfileTom Ryder2017-10-282-28/+27
| |
| * Move whitespace .vimrc config into subfileTom Ryder2017-10-282-15/+14
| | | | | | | | The StripTrailingWhitespace() function should perhaps be its own plugin.
| * Move list .vimrc config into subfileTom Ryder2017-10-282-9/+9
| | | | | | | | | | By "list" here I am referring to options for Vim's 'list' display setting, showing control characters visually.
| * Move BigFileMeasures() .vimrc func into subfileTom Ryder2017-10-283-29/+30
| | | | | | | | | | | | Also add a note to IDEAS.md for later to consider packaging this as a proepr plugin, even if it doesn't actually leave the dotfiles repository just yet.
| * Move format .vimrc config into subfileTom Ryder2017-10-282-32/+31
| | | | | | | | | | The ToggleFormatFlag function might actually be better implemented as some sort of plugin.
| * Move linebreak .vimrc config into subfileTom Ryder2017-10-282-32/+31
| | | | | | | | | | | | I'm not quite so sure about this one. The ToggleBreak() function might actually be better in a plugin on its own. The rest of it makes sense though.
| * Move windows .vimrc config into subfileTom Ryder2017-10-282-28/+27
| | | | | | | | Not the operating system; Vim editor windows.
| * Move wildmenu .vimrc config into subfileTom Ryder2017-10-282-24/+23
| |