From fa733214fb11be2e32f2630411bc250bd9e2c972 Mon Sep 17 00:00:00 2001 From: Johannes Stolp Date: Thu, 26 May 2016 00:28:46 +0200 Subject: Changed order of sourcing external files in .vimrc Added new keymaps added two xterm color shemes --- .Xresources | 79 --------------------------------------- .Xresources_gray | 79 +++++++++++++++++++++++++++++++++++++++ .Xresources_solarized | 83 +++++++++++++++++++++++++++++++++++++++++ .vim/vimrc_files/highlight.vim | 10 ----- .vim/vimrc_files/highlights.vim | 14 +++++++ 5 files changed, 176 insertions(+), 89 deletions(-) delete mode 100644 .Xresources create mode 100644 .Xresources_gray create mode 100644 .Xresources_solarized delete mode 100644 .vim/vimrc_files/highlight.vim create mode 100644 .vim/vimrc_files/highlights.vim diff --git a/.Xresources b/.Xresources deleted file mode 100644 index bc04bd9..0000000 --- a/.Xresources +++ /dev/null @@ -1,79 +0,0 @@ -XTerm*renderFont: true -XTerm*faceName: Vera Serif Mono -!XTerm*faceName: Liberation Mono -!XTerm*faceName: Droid Sans Mono -XTerm*faceSize: 10 -xterm*saveLines: 16384 -xterm*loginShell: true -xterm*charClass: 33:48,35:48,37:48,43:48,45-47:48,64:48,95:48,126:48 -xterm*termName: xterm-256color -xterm*eightBitInput: false - -! blue - gray mix with different brightness -! S_base03 ^ -! S_base02 | brightness -! S_base01 | reduces -! S_base00 | - -#define S_base03 #002b36 -#define S_base02 #073642 -#define S_base01 #586e75 -#define S_base00 #657b83 - -! S_base0 light blue -! S_base1 light gray -! S_base2 light beige -! S_base3 super light yellow - -#define S_base0 #c8d9ea -#define S_base1 #93a1a1 -#define S_base2 #eee8d5 -#define S_base3 #fdf6e3 - -*background: S_base03 -*foreground: S_base0 -*fadeColor: S_base03 -*cursorColor: S_base1 -*pointerColorBackground:S_base01 -*pointerColorForeground:S_base1 - -#define S_yellow #b58900 -#define S_orange #cb4b16 -#define S_red #dc322f -#define S_magenta #d33682 -#define S_violet #6c71c4 -#define S_blue #268bd2 -#define S_cyan #2aa198 -#define S_green #859900 - -!! black dark/light -*color0: S_base02 -*color8: S_base03 - -!! red dark/light -*color1: S_red -*color9: S_orange - -!! green dark/light -*color2: S_green -*color10: S_base01 - -!! yellow dark/light -*color3: S_yellow -*color11: S_base00 - -!! blue dark/light -*color4: S_blue -*color12: S_base0 - -!! magenta dark/light -*color5: S_magenta -*color13: S_violet - -!! cyan dark/light -*color6: S_cyan -*color14: S_base1 - -!! white dark/light -*color7: S_base2 -*color15: S_base3 diff --git a/.Xresources_gray b/.Xresources_gray new file mode 100644 index 0000000..cd2c11f --- /dev/null +++ b/.Xresources_gray @@ -0,0 +1,79 @@ +xterm*font : 9x15 +XTerm*scaleHeight: 1.1 +xterm*metaSendsEscape: true +xterm*saveLines: 16384 +xterm*loginShell: true +xterm*charClass: 33:48,35:48,37:48,43:48,45-47:48,64:48,95:48,126:48 +xterm*termName: xterm-256color +xterm*eightBitInput: false +XTerm*selectToClipboard: true + +! --- ~/.Xresources ------------------------------------------------------------ +! ------------------------------------------------------------------------------ +! --- generated with 4bit Terminal Color Scheme Designer ----------------------- +! ------------------------------------------------------------------------------ +! --- http://ciembor.github.com/4bit ------------------------------------------- +! ------------------------------------------------------------------------------ + +! --- special colors --- + +*background: #262626 +*foreground: #d9d9d9 + +! --- standard colors --- + +! black +*color0: #000000 + +! bright_black +*color8: #262626 + +! red +*color1: #c05b69 + +! bright_red +*color9: #cda0ae + +! green +*color2: #50cd68 + +! bright_green +*color10: #95d9ad + +! yellow +*color3: #c0cb68 + +! bright_yellow +*color11: #cdd8ad + +! blue +*color4: #4e5dd9 + +! bright_blue +*color12: #93a1e6 + +! magenta +*color5: #be5bd9 + +! bright_magenta +*color13: #cba0e6 + +! cyan +*color6: #4ecdd8 + +! bright_cyan +*color14: #93d9e5 + +! white +*color7: #d9d9d9 + +! bright_white +*color15: #ffffff + + +! ------------------------------------------------------------------------------ +! --- end of terminal colors section ------------------------------------------- +! ------------------------------------------------------------------------------ + + + diff --git a/.Xresources_solarized b/.Xresources_solarized new file mode 100644 index 0000000..178cb65 --- /dev/null +++ b/.Xresources_solarized @@ -0,0 +1,83 @@ +!XTerm*renderFont: true +!XTerm*faceName: Vera Serif Mono +!XTerm*faceName: Liberation Mono +!XTerm*faceName: Droid Sans Mono +!XTerm*faceSize: 10 +xterm*font : 9x15 +XTerm*scaleHeight: 1.1 +xterm*metaSendsEscape: true +xterm*saveLines: 16384 +xterm*loginShell: true +xterm*charClass: 33:48,35:48,37:48,43:48,45-47:48,64:48,95:48,126:48 +xterm*termName: xterm-256color +xterm*eightBitInput: false +XTerm*selectToClipboard: true + +! blue - gray mix with different brightness +! S_base03 ^ +! S_base02 | brightness +! S_base01 | reduces +! S_base00 | + +#define S_base03 #002b36 +#define S_base02 #073642 +#define S_base01 #586e75 +#define S_base00 #657b83 + +! S_base0 light blue +! S_base1 light gray +! S_base2 light beige +! S_base3 super light yellow + +#define S_base0 #c8d9ea +#define S_base1 #93a1a1 +#define S_base2 #eee8d5 +#define S_base3 #fdf6e3 + +*background: S_base03 +*foreground: S_base0 +*fadeColor: S_base03 +*cursorColor: S_base1 +*pointerColorBackground:S_base01 +*pointerColorForeground:S_base1 + +#define S_yellow #b58900 +#define S_orange #cb4b16 +#define S_red #dc322f +#define S_magenta #d33682 +#define S_violet #6c71c4 +#define S_blue #268bd2 +#define S_cyan #2aa198 +#define S_green #859900 + +!! black dark/light +*color0: S_base02 +*color8: S_base03 + +!! red dark/light +*color1: S_red +*color9: S_orange + +!! green dark/light +*color2: S_green +*color10: S_base01 + +!! yellow dark/light +*color3: S_yellow +*color11: S_base00 + +!! blue dark/light +*color4: S_blue +*color12: S_base0 + +!! magenta dark/light +*color5: S_magenta +*color13: S_violet + +!! cyan dark/light +*color6: S_cyan +*color14: S_base1 + +!! white dark/light +*color7: S_base2 +*color15: S_base3 diff --git a/.vim/vimrc_files/highlight.vim b/.vim/vimrc_files/highlight.vim deleted file mode 100644 index 768708e..0000000 --- a/.vim/vimrc_files/highlight.vim +++ /dev/null @@ -1,10 +0,0 @@ -" hi clear CursorLine -" augroup CLClear -" autocmd! ColorScheme * hi clear CursorLine -" augroup END - -" Highlight color of current line -hi CursorLineNR cterm=bold ctermfg=226 -augroup CLNRSet - autocmd! ColorScheme * hi CursorLineNR cterm=bold ctermfg=226 -augroup END diff --git a/.vim/vimrc_files/highlights.vim b/.vim/vimrc_files/highlights.vim new file mode 100644 index 0000000..0d53434 --- /dev/null +++ b/.vim/vimrc_files/highlights.vim @@ -0,0 +1,14 @@ +" hi clear CursorLine +" augroup CLClear +" autocmd! ColorScheme * hi clear CursorLine +" augroup END + +" Highlight color of current line +hi CursorLineNR cterm=bold ctermfg=226 +augroup CLNRSet + autocmd! ColorScheme * hi CursorLineNR cterm=bold ctermfg=226 +augroup END + + +hi StatusLine ctermbg=38 ctermfg=0 cterm=NONE term=NONE gui=NONE +"hi StatusLineNC ctermbg=81 ctermfg=0 -- cgit v1.2.3