From 6fbfb168f72d5878309e6bc746c61684e36efbbb Mon Sep 17 00:00:00 2001 From: Yan Pritzker Date: Thu, 3 Jul 2014 17:17:21 -0400 Subject: [PATCH] Explain how to deal with unsolarized terminals in docs --- README.md | 14 +++++++++++++- doc/vim/enhancements.md | 4 ---- vimrc | 1 - 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 5d1ed52..80bba62 100644 --- a/README.md +++ b/README.md @@ -48,12 +48,24 @@ sh -c "`curl -fsSL https://raw.github.com/skwp/dotfiles/master/install.sh`" -s a ## Wait, you're not done! Do this: -* Install iTerm Solarized Colors - YADR will install Solarized colorschemes into your iTerm. Go to Profiles => Colors => Load Presets to pick Solarized Dark. +* **Install iTerm Solarized Colors** - YADR will install Solarized colorschemes into your iTerm. Go to Profiles => Colors => Load Presets to pick Solarized Dark. * [Remap caps-lock to escape with PCKeyboardHack](http://pqrs.org/macosx/keyremap4macbook/pckeyboardhack.html) - The escape key is the single most used key in vim. Old keyboards used to have Escape where Tab is today. Apple keyboards are the worst with their tiny Esc keys. But all this is fixed by remapping Caps to Escape. If you're hitting a small target in the corner, you are slowing yourself down considerably, and probably damaging your hands with repetitive strain injuries. * Remap your Alfred or Spotlight to `Ctrl-Cmd-Space`, so that you can use `Cmd-Space` to autocomplete in vim. This is much more friendly for your fingers than `Ctrl-n`. * Set up a system wide hotkey for iTerm (Keys=>Hotkey). Recommended Cmd-Escape, which is really Cmd-Capslock. * In iTerm, uncheck "Use Lion-style full screen" on General; in MacVim, uncheck Prefer native fullscreen under Advanced settings. This will give you fast full screen windows that are switchable without switching to spaces. +## If you want to run vim in terminal + +* Make sure you install Solarized colorscheme in your terminal! +* If you don't want to use solarized terminal, then make sure you do this: + + let g:yadr_using_unsolarized_terminal = 1 + # in ~/.vimrc.before + +* If you want to use an alternate colorcheme like Gruvbox, then in your `~/.vimrc.after` do: + + let g:yadr_disable_solarized_enhancements = 1 + ### Upgrading Upgrading is easy. diff --git a/doc/vim/enhancements.md b/doc/vim/enhancements.md index 7f36bd5..078b059 100644 --- a/doc/vim/enhancements.md +++ b/doc/vim/enhancements.md @@ -9,7 +9,3 @@ * AnsiEsc - inteprets ansi color codes inside log files. great for looking at Rails logs * solarized - a color scheme scientifically calibrated for awesomeness (including skwp mods for ShowMarks) * Airline - Improved status bar. Requires patched fonts (installed from fonts/ directory) - -YADR provides solarized enhancements that make it even better. If you're using another theme, you can disable them with this line in `~/.vimrc.before`: - - let g:yadr_disable_solarized_enhancements=1 diff --git a/vimrc b/vimrc index 196cf7c..0fdc73a 100644 --- a/vimrc +++ b/vimrc @@ -96,7 +96,6 @@ set wildignore+=tmp/** set wildignore+=*.png,*.jpg,*.gif " - " ================ Scrolling ======================== set scrolloff=8 "Start scrolling when we're 8 lines away from margins