X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.vimrc;h=bc4a54ab55e9fae8ac9c1916511d3d184a35ed3e;hb=f3d5077ad1762c49948e73acf7eebb187dc9134f;hp=c7f48f7b9dcb5e0052ec731193f8acab8db87553;hpb=09beaf0a7be57a9c3efff9a28e609c08cf864edb;p=dotfiles.git

diff --git a/.vimrc b/.vimrc
index c7f48f7..bc4a54a 100644
--- a/.vimrc
+++ b/.vimrc
@@ -55,6 +55,7 @@ set sidescroll=1  " The minimal number of columns to scroll horizontally
 
 " 5 highlighting
 
+colorscheme phd
 set nohlsearch    " Stop the search highlighting
 
 " 6 multiple windows
@@ -71,6 +72,10 @@ set ttyfast       " terminal connection is fast
 
 set title         " Set title to the value of 'titlestring' or to 'filename - VIM'
 set titleold=     " string to restore the title to when exiting Vim
+" String to use for the Vim window title; with statusline printf items:
+" display filename, modification flag, full path, argument list status,
+" the current user, host and program name (to distinguish vim/view/etc).
+set titlestring=%t%(\ %M%)%(\ (%{expand(\"%:p:h\")})%)%(\ %a%)\ -\ [%{$USER}@%{hostname()}]\ %{v:progname}
 
 " 9 using the mouse
 
@@ -111,7 +116,7 @@ set noautoindent  " Do not automatically set the indent of a new line
 
 " 18 mapping
 
-set timeout timeoutlen=3000 " allow timing out up to 3 seconds halfway into a mapping
+set timeout timeoutlen=3000 ttimeoutlen=100 " allow timing out up to 3 seconds halfway into a mapping; 100 ms to wait for a key code or mapped key sequence to complete
 
 " 19 reading and writing files
 if v:version >= 703
@@ -187,25 +192,12 @@ if has("gui_running")
       set toolbar=icons,text " how to show the toolbar
    endif
 
-   " set guicursor+=a:blinkon0 " Stop cursor blinking
+   set guicursor+=a:blinkon0 " Stop cursor blinking
 
    " Make shift-insert work like in Xterm
    " map <S-Insert> <MiddleMouse>
    " map! <S-Insert> <MiddleMouse>
 
-
-   " Set nice colors
-   " Background for normal text is light grey
-   " Cursor is green
-   " Text below the last line is darker grey
-   " Status line is bright white on blue
-   highlight Normal guibg=grey90
-   highlight Cursor guibg=green guifg=NONE
-   highlight NonText guibg=grey80
-   highlight Constant guibg=grey90
-   highlight Special gui=NONE guibg=grey90
-   highlight StatusLine gui=bold guifg=white guibg=blue
-
    " ----------
    " From http://slobin.pp.ru/vim/_vimrc.html
 
@@ -216,19 +208,14 @@ if has("gui_running")
    " The <CR> key should select from completion menu without adding a newline
    imap <expr> <CR> pumvisible() ? "<C-Y>" : "<CR>"
    " ----------
-else
 
+else
    if (&term =~ "linux") || ($BACKGROUND == 'DARK') || ($BACKGROUND == 'dark')
          \ || has("win32")
       " Background of the terminal is black or dark grey
       set background=dark
-      highlight MoreMsg ctermfg=white
-      highlight ModeMsg ctermfg=white
-      highlight Question ctermfg=white
    else
       set background=light
-      highlight MoreMsg cterm=bold ctermfg=NONE
-      highlight Question cterm=bold ctermfg=NONE
    endif
 
    if (&term =~ "linux")
@@ -265,10 +252,6 @@ else
    endif
 endif
 
-highlight SpellBad term=underline cterm=NONE ctermfg=white ctermbg=red guifg=white guibg=red " gui=undercurl guisp=red
-highlight StatusLine cterm=bold ctermfg=white ctermbg=blue gui=NONE guifg=white guibg=blue
-highlight Visual cterm=NONE ctermfg=white ctermbg=blue gui=NONE guifg=white guibg=blue " Selection highlighting
-
 " Multiline comments often confuse vim syntax highlighting - these maps
 " allow to resynchronize; the first is faster, the second is more thorough
 nmap \sc :syntax sync clear<Enter>