Lots: Switch to Solarized Light colorscheme

This commit is contained in:
Salt 2018-01-31 13:49:32 -06:00
parent 4dddc799ca
commit 1003cdddc7
5 changed files with 71 additions and 64 deletions

View File

@ -1,5 +1,5 @@
!-----------------------------
! urxvt configuration
! URXVT
!-----------------------------
urxvt*scrollBar: false
urxvt*font: xft:xos4 Terminus:size=9,xft:Wuncon Siji:pixelsize=12
@ -8,8 +8,55 @@ urxvt*depth: 32
!urxvt*background: rgba:1d1d/2020/2121/5000
!-----------------------------
! ROFI Theme
!
! COLORS
!-----------------------------
! Solarized 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
! Light Definitions
#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
! Color declarations
*background: S_base03
*foreground: S_base3
*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
!-----------------------------
! ROFI THEME
!-----------------------------
rofi.matching: fuzzy
@ -18,50 +65,11 @@ rofi.show-icons: true
rofi.drun-icon-theme: Papirus-Color
rofi.font: xos4 Terminus 9
rofi.bw: 4
! BG FG BG-ALT HLBG HLFG
rofi.color-window: #282828, #32302f, #282828
rofi.color-normal: #282828, #ebdbb2, #32302f, #83a598, #282828
rofi.color-active: #282828, #458588, #32302f, #458588, #282828
rofi.color-urgent: #282828, #d79921, #32302f, #d79921, #282828
! BG FG BG-ALT HLBG HLFG
rofi.color-window: S_base03, S_base02, S_base03
rofi.color-normal: S_base03, S_base0, S_base02, S_base0, S_base03
rofi.color-active: S_base03, S_blue, S_base02, S_blue, S_base03
rofi.color-urgent: S_base03, S_yellow, S_base02, S_yellow, S_base03
rofi.width: 30
!-----------------------------
! Colors merged from Gruvbox-Dark
! Author: morhetz <morhetz@gmail.com>
! Source: https://github.com/morhetz/gruvbox-generalized
!-----------------------------
! hard contrast:
! *background: #1d2021
*background: #282828
*background-alt: #665c54
*foreground: #d5c4a1
! Black + DarkGrey
*color0: #282828
*color8: #928374
! DarkRed + Red
*color1: #cc241d
*color9: #fb4934
! DarkGreen + Green
*color2: #98971a
*color10: #b8bb26
! DarkYellow + Yellow
*color3: #d79921
*color11: #fabd2f
! DarkBlue + Blue
*color4: #458588
*color12: #83a598
! DarkMagenta + Magenta
*color5: #b16286
*color13: #d3869b
! DarkCyan + Cyan
*color6: #689d6a
*color14: #8ec07c
! LightGrey + White
*color7: #a89984
*color15: #d5c4a1
! Additional background colors

View File

@ -56,11 +56,11 @@ bspc pointer_modifier mod1
bspc pointer_action1 move
bspc pointer_action2 resize_corner
bspc config normal_border_color "#282828"
bspc config active_border_color "#458588"
bspc config focused_border_color "#84a598"
bspc config presel_border_color "#d3869b"
bspc config urgent_border_color "#fabd2f"
bspc config normal_border_color "#fdf6e3"
bspc config active_border_color "#268bd2"
bspc config focused_border_color "#657b83"
bspc config presel_border_color "#6c71c4"
bspc config urgent_border_color "#b58900"
## bspwm WINDOW RULES
bspc rule -a Waterfox desktop=1

View File

@ -5,7 +5,7 @@ conky.config = {
own_window_title = 'Conky',
own_window_class = 'Conky',
own_window_type = 'desktop',
own_window_colour = '282828',
own_window_colour = 'fdf6e3',
double_buffer = true,
cpu_avg_samples = 2,
@ -15,14 +15,14 @@ conky.config = {
use_xft = true,
font = 'xos4 Terminus:size=9',
default_color = '#d5c4a1',
color1 = '282828',
color2 = 'd5c4a1',
color3 = '665c54',
color6 = '689d6a',
color7 = '98971a',
color8 = '458588',
color9 = 'b16286',
default_color = '#002b36',
color1 = 'fdf6e3',
color2 = '002b36',
color3 = 'eee8d5',
color6 = '2aa198',
color7 = '859900',
color8 = '268bd2',
color9 = 'd33682',
alignment = 'bottom_right',
xinerama_head = 2,

View File

@ -19,7 +19,7 @@ icon-wlan = ${xrdb:color6}
icon-xbacklight = ${xrdb:color7}
background = ${xrdb:background}
background-alt = ${xrdb:color8}
background-alt = ${xrdb:color10}
foreground = ${xrdb:color15}
[res/config]

3
.vimrc
View File

@ -1,8 +1,7 @@
execute pathogen#infect()
colorscheme gruvbox
set background=dark
let g:gruvbox_contrast_dark='medium'
colorscheme solarized
syntax on
filetype plugin indent on