From c49f51c3252f16723a5b04c90454ef4d105ff4b4 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Tue, 18 Feb 2014 08:59:46 +0100 Subject: Split .Xresources into definition and file to parse This way it properly works with Ubuntu (see Bug #1163129), but the file needs to be preprocessed with 'cpp -P .Xresources.def .Xresources' every time it is changed. --- .Xresources | 148 +++++++++++++++++++++++++------------------------------- .Xresources.def | 104 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 169 insertions(+), 83 deletions(-) create mode 100644 .Xresources.def diff --git a/.Xresources b/.Xresources index 68eaf62..3caa942 100644 --- a/.Xresources +++ b/.Xresources @@ -1,104 +1,86 @@ ! use xft for drawing fonts -URxvt.font: xft:Inconsolata-9 +URxvt.font: xft:Inconsolata-9 ! matcher.button # 3 is a right-click -URxvt*matcher.button: 3 -URxvt*saveLines: 16384 -URxvt.perl-ext-common: default,matcher,tabbed -URxvt*geometry: 110x38 -URxvt*scrollBar: true +URxvt*matcher.button: 3 +URxvt*saveLines: 16384 +URxvt.perl-ext-common: default,matcher,tabbed +URxvt*geometry: 110x38 +URxvt*scrollBar: true URxvt*scrollBar_floating:true -URxvt*scrollBar_right: true +URxvt*scrollBar_right: true -aterm*background: black -aterm*foreground: grey -aterm*borderColor: white -aterm*geometry: 110x38 -aterm*saveLines: 1024 -aterm*scrollBar: false -aterm*font: -misc-fixed-medium-r-normal-*-12-*-*-*-*-*-*-* -aterm*boldFont: -misc-fixed-bold-r-normal-*-12-*-*-*-*-*-*-* +aterm*background: black +aterm*foreground: grey +aterm*borderColor: white +aterm*geometry: 110x38 +aterm*saveLines: 1024 +aterm*scrollBar: false +aterm*font: -misc-fixed-medium-r-normal-*-12-*-*-*-*-*-*-* +aterm*boldFont: -misc-fixed-bold-r-normal-*-12-*-*-*-*-*-*-* -XTerm*background: black -XTerm*foreground: grey -XTerm*borderColor: white -XTerm*geometry: 110x36 -XTerm*font: -misc-fixed-medium-r-normal-*-12-*-*-*-*-*-*-* +XTerm*background: black +XTerm*foreground: grey +XTerm*borderColor: white +XTerm*geometry: 110x36 +XTerm*font: -misc-fixed-medium-r-normal-*-12-*-*-*-*-*-*-* -XLock.mode: blank -XLock.font: -misc-fixed-medium-r-normal-*-12-*-*-*-*-*-*-* +XLock.mode: blank +XLock.font: -misc-fixed-medium-r-normal-*-12-*-*-*-*-*-*-* !! drop in Solarized colorscheme for Xresources !! !! ## Installation !! 1) Write to $HOME/.Xresources !! 2) If not using Xsession, you must add the line `xrdb -merge ~/.Xresources` -!! to `.xinitrc`. See http://manpages.ubuntu.com/Xsession for more details. +!! to `.xinitrc`. See http: !! -!!SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B RGB HSB -!!--------- ------- ---- ------- ----------- ---------- ----------- ----------- -!!base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21 -!!base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26 -!!base01 #586e75 10/7 brgreen 240 #585858 45 -07 -07 88 110 117 194 25 46 -!!base00 #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195 23 51 -!!base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59 -!!base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63 -!!base2 #eee8d5 7/7 white 254 #e4e4e4 92 -00 10 238 232 213 44 11 93 -!!base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99 -!!yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71 -!!orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80 -!!red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86 -!!magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83 -!!violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77 -!!blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82 -!!cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63 -!!green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60 - -#define S_base03 #002b36 -#define S_base02 #073642 -#define S_base01 #586e75 -#define S_base00 #657b83 -#define S_base0 #839496 -#define S_base1 #93a1a1 -#define S_base2 #eee8d5 -#define S_base3 #fdf6e3 -#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 - -URxvt*background: S_base03 -URxvt*foreground: S_base0 -URXvt*fading: 30 -URxvt*fadeColor: S_base03 -URxvt*cursorColor: S_base1 -URxvt*pointerColorBackground: S_base01 -URxvt*pointerColorForeground: S_base1 -URxvt*scrollColor: S_base03 +!!SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B RGB HSB +!!--------- ------- ---- ------- ----------- ---------- ----------- ----------- +!!base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21 +!!base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26 +!!base01 #586e75 10/7 brgreen 240 #585858 45 -07 -07 88 110 117 194 25 46 +!!base00 #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195 23 51 +!!base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59 +!!base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63 +!!base2 #eee8d5 7/7 white 254 #e4e4e4 92 -00 10 238 232 213 44 11 93 +!!base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99 +!!yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71 +!!orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80 +!!red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86 +!!magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83 +!!violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77 +!!blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82 +!!cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63 +!!green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60 +URxvt*background: #002b36 +URxvt*foreground: #839496 +URXvt*fading: 30 +URxvt*fadeColor: #002b36 +URxvt*cursorColor: #93a1a1 +URxvt*pointerColorBackground: #586e75 +URxvt*pointerColorForeground: #93a1a1 +URxvt*scrollColor: #002b36 !! black dark/light -URxvt*color0: S_base02 -URxvt*color8: S_base03 +URxvt*color0: #073642 +URxvt*color8: #002b36 !! red dark/light -URxvt*color1: S_red -URxvt*color9: S_orange +URxvt*color1: #dc322f +URxvt*color9: #cb4b16 !! green dark/light -URxvt*color2: S_green -URxvt*color10: S_base01 +URxvt*color2: #859900 +URxvt*color10: #586e75 !! yellow dark/light -URxvt*color3: S_yellow -URxvt*color11: S_base00 +URxvt*color3: #b58900 +URxvt*color11: #657b83 !! blue dark/light -URxvt*color4: S_blue -URxvt*color12: S_base0 +URxvt*color4: #268bd2 +URxvt*color12: #839496 !! magenta dark/light -URxvt*color5: S_magenta -URxvt*color13: S_violet +URxvt*color5: #d33682 +URxvt*color13: #6c71c4 !! cyan dark/light -URxvt*color6: S_cyan -URxvt*color14: S_base1 +URxvt*color6: #2aa198 +URxvt*color14: #93a1a1 !! white dark/light -URxvt*color7: S_base2 -URxvt*color15: S_base3 +URxvt*color7: #eee8d5 +URxvt*color15: #fdf6e3 diff --git a/.Xresources.def b/.Xresources.def new file mode 100644 index 0000000..68eaf62 --- /dev/null +++ b/.Xresources.def @@ -0,0 +1,104 @@ +! use xft for drawing fonts +URxvt.font: xft:Inconsolata-9 +! matcher.button # 3 is a right-click +URxvt*matcher.button: 3 +URxvt*saveLines: 16384 +URxvt.perl-ext-common: default,matcher,tabbed +URxvt*geometry: 110x38 +URxvt*scrollBar: true +URxvt*scrollBar_floating:true +URxvt*scrollBar_right: true + +aterm*background: black +aterm*foreground: grey +aterm*borderColor: white +aterm*geometry: 110x38 +aterm*saveLines: 1024 +aterm*scrollBar: false +aterm*font: -misc-fixed-medium-r-normal-*-12-*-*-*-*-*-*-* +aterm*boldFont: -misc-fixed-bold-r-normal-*-12-*-*-*-*-*-*-* + +XTerm*background: black +XTerm*foreground: grey +XTerm*borderColor: white +XTerm*geometry: 110x36 +XTerm*font: -misc-fixed-medium-r-normal-*-12-*-*-*-*-*-*-* + +XLock.mode: blank +XLock.font: -misc-fixed-medium-r-normal-*-12-*-*-*-*-*-*-* + +!! drop in Solarized colorscheme for Xresources +!! +!! ## Installation +!! 1) Write to $HOME/.Xresources +!! 2) If not using Xsession, you must add the line `xrdb -merge ~/.Xresources` +!! to `.xinitrc`. See http://manpages.ubuntu.com/Xsession for more details. +!! +!!SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B RGB HSB +!!--------- ------- ---- ------- ----------- ---------- ----------- ----------- +!!base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21 +!!base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26 +!!base01 #586e75 10/7 brgreen 240 #585858 45 -07 -07 88 110 117 194 25 46 +!!base00 #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195 23 51 +!!base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59 +!!base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63 +!!base2 #eee8d5 7/7 white 254 #e4e4e4 92 -00 10 238 232 213 44 11 93 +!!base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99 +!!yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71 +!!orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80 +!!red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86 +!!magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83 +!!violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77 +!!blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82 +!!cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63 +!!green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60 + +#define S_base03 #002b36 +#define S_base02 #073642 +#define S_base01 #586e75 +#define S_base00 #657b83 +#define S_base0 #839496 +#define S_base1 #93a1a1 +#define S_base2 #eee8d5 +#define S_base3 #fdf6e3 +#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 + +URxvt*background: S_base03 +URxvt*foreground: S_base0 +URXvt*fading: 30 +URxvt*fadeColor: S_base03 +URxvt*cursorColor: S_base1 +URxvt*pointerColorBackground: S_base01 +URxvt*pointerColorForeground: S_base1 +URxvt*scrollColor: S_base03 +!! black dark/light +URxvt*color0: S_base02 +URxvt*color8: S_base03 +!! red dark/light +URxvt*color1: S_red +URxvt*color9: S_orange +!! green dark/light +URxvt*color2: S_green +URxvt*color10: S_base01 +!! yellow dark/light +URxvt*color3: S_yellow +URxvt*color11: S_base00 +!! blue dark/light +URxvt*color4: S_blue +URxvt*color12: S_base0 +!! magenta dark/light +URxvt*color5: S_magenta +URxvt*color13: S_violet +!! cyan dark/light +URxvt*color6: S_cyan +URxvt*color14: S_base1 +!! white dark/light +URxvt*color7: S_base2 +URxvt*color15: S_base3 -- cgit v1.2.3-54-g00ecf