From d21c9060b1bd60514039e6330caec700e3f76138 Mon Sep 17 00:00:00 2001 From: GasparVardanyan Date: Sun, 20 Mar 2022 15:47:57 +0400 Subject: [PATCH] update --- settheme | 4 +- solarized-dark.xdefaults | 111 ++++---------------------------------- solarized-light.xdefaults | 99 ++-------------------------------- solarized.palette | 95 ++++++++++++++++++++++++++++++++ 4 files changed, 112 insertions(+), 197 deletions(-) create mode 100644 solarized.palette diff --git a/settheme b/settheme index cc9562c..ac6f552 100755 --- a/settheme +++ b/settheme @@ -7,7 +7,7 @@ [ -f ~/.local/share/themes/"$1".xdefaults ] || exit -1 -cp ~/.local/share/themes/"$1".xdefaults ~/.local/etc/theme +( cd ~/.local/share/themes; cpp "$1".xdefaults > ~/.local/etc/theme) if [ -f ~/.local/share/themes/"$1".dir_colors ] then @@ -31,7 +31,7 @@ mv ~/.local/bin/st-autocomplete $b1 echo -e "dwm\nst\ndmenu\ntabbed" | while read t do - (cd ~/.local/src/$t && make clean && ./xtheme && make PREFIX=$HOME/.local install ; make clean ; cd -) + (cd ~/.local/src/$t && (make clean ; ./xtheme ; make PREFIX=$HOME/.local install ; make clean) ; cd -) done mv $b1 ~/.local/bin/st-autocomplete diff --git a/solarized-dark.xdefaults b/solarized-dark.xdefaults index 2797b1d..35bbbed 100644 --- a/solarized-dark.xdefaults +++ b/solarized-dark.xdefaults @@ -1,96 +1,4 @@ -! Solarized color scheme for the X Window System -! -! http://ethanschoonover.com/solarized - - -! 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 - - -! Common - -#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 - - -! Dark - -#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 - - -! Light - -! #define S_base03 #fdf6e3 -! #define S_base02 #eee8d5 -! #define S_base01 #93a1a1 -! #define S_base00 #839496 -! #define S_base0 #657b83 -! #define S_base1 #586e75 -! #define S_base2 #073642 -! #define S_base3 #002b36 - - -! To only apply colors to your terminal, for example, prefix -! the color assignment statement with its name. Example: -! -! URxvt*background: S_base03 - -*background: S_base03 -*foreground: S_base0 -*fading: 40 -*fadeColor: S_base03 -*cursorColor: S_base1 -*pointerColorBackground: S_base01 -*pointerColorForeground: S_base1 - -*color0: S_base02 -*color1: S_red -*color2: S_green -*color3: S_yellow -*color4: S_blue -*color5: S_magenta -*color6: S_cyan -*color7: S_base2 -*color9: S_orange -*color8: S_base03 -*color10: S_base01 -*color11: S_base00 -*color12: S_base0 -*color13: S_violet -*color14: S_base1 -*color15: S_base3 - - -// gaspar's modifications +#include "solarized.palette" wallpaper: cubes vim*theme: solarized @@ -99,18 +7,21 @@ dwm*barSingleBg: 1 dwm*borderpx: 6 dwm*foreground: S_base0 dwm*background: S_base03 -! dwm*border: #002733 # custom color -! dwm*border: #103c48 # selenized dark bg0 dwm*border: S_base02 dwm*selforeground: S_base1 -! dwm*selbackground: S_base02 -dwm*selbackground: #174956 # selenized dark bg1 -! dwm*selborder: S_base02 -! dwm*selborder: #0a4c5c # custom color -dwm*selborder: #174956 # selenized dark bg1 +//dwm*selbackground: #234D59 // LAB (30, -12, -12) +//dwm*selborder: #234D59 // LAB (30, -12, -12) +dwm*selbackground: #174956 // selenized dark bg1 +dwm*selborder: #174956 // selenized dark bg1 st*cursorColor: S_base0 st*revCurColor: S_base00 +// dwm*border: #002733 // custom color +// dwm*border: #103c48 // selenized dark bg0 +// dwm*selbackground: S_base02 +// dwm*selborder: S_base02 +// dwm*selborder: #0a4c5c // custom color + // https://ethanschoonover.com/solarized/ // https://observer.com/2015/02/meet-the-man-behind-solarized-the-most-important-color-scheme-in-computer-history/ // https://www.wired.com/story/very-mathematical-history-perfect-color-combination/ diff --git a/solarized-light.xdefaults b/solarized-light.xdefaults index c507fc2..7d7763e 100644 --- a/solarized-light.xdefaults +++ b/solarized-light.xdefaults @@ -1,96 +1,5 @@ -! Solarized color scheme for the X Window System -! -! http://ethanschoonover.com/solarized - - -! 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 - - -! Common - -#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 - - -! Dark -! -! #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 - - -! Light - -#define S_base03 #fdf6e3 -#define S_base02 #eee8d5 -#define S_base01 #93a1a1 -#define S_base00 #839496 -#define S_base0 #657b83 -#define S_base1 #586e75 -#define S_base2 #073642 -#define S_base3 #002b36 - - -! To only apply colors to your terminal, for example, prefix -! the color assignment statement with its name. Example: -! -! URxvt*background: S_base03 - -*background: S_base03 -*foreground: S_base0 -*fading: 40 -*fadeColor: S_base03 -*cursorColor: S_base1 -*pointerColorBackground: S_base01 -*pointerColorForeground: S_base1 - -*color0: S_base02 -*color1: S_red -*color2: S_green -*color3: S_yellow -*color4: S_blue -*color5: S_magenta -*color6: S_cyan -*color7: S_base2 -*color9: S_orange -*color8: S_base03 -*color10: S_base01 -*color11: S_base00 -*color12: S_base0 -*color13: S_violet -*color14: S_base1 -*color15: S_base3 - - -! gaspar's modifications +#define Light +#include "solarized.palette" vim*theme: solarized wallpaper: geom @@ -100,5 +9,5 @@ dwm*foreground: S_base3 dwm*background: S_base03 dwm*border: S_base02 dwm*selforeground: S_base3 -dwm*selbackground: #d6cca9 # custom color -dwm*selborder: #d6cca9 # custom color +dwm*selbackground: #d6cca9 // custom color +dwm*selborder: #d6cca9 // custom color diff --git a/solarized.palette b/solarized.palette new file mode 100644 index 0000000..3f67ea4 --- /dev/null +++ b/solarized.palette @@ -0,0 +1,95 @@ +! Solarized color scheme for the X Window System +! +! http://ethanschoonover.com/solarized + + +! 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 + + +! Common + +#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 + + +#ifndef Light + +! Dark + +#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 + +#else + +! Light + +#define S_base03 #fdf6e3 +#define S_base02 #eee8d5 +#define S_base01 #93a1a1 +#define S_base00 #839496 +#define S_base0 #657b83 +#define S_base1 #586e75 +#define S_base2 #073642 +#define S_base3 #002b36 + +#endif + + +! To only apply colors to your terminal, for example, prefix +! the color assignment statement with its name. Example: +! +! URxvt*background: S_base03 + +*background: S_base03 +*foreground: S_base0 +*fading: 40 +*fadeColor: S_base03 +*cursorColor: S_base1 +*pointerColorBackground: S_base01 +*pointerColorForeground: S_base1 + +*color0: S_base02 +*color1: S_red +*color2: S_green +*color3: S_yellow +*color4: S_blue +*color5: S_magenta +*color6: S_cyan +*color7: S_base2 +*color9: S_orange +*color8: S_base03 +*color10: S_base01 +*color11: S_base00 +*color12: S_base0 +*color13: S_violet +*color14: S_base1 +*color15: S_base3