Compare commits

...

6 Commits

12 changed files with 230 additions and 103 deletions

View File

@ -4,73 +4,8 @@
# environment variables. Some entries may override variables # environment variables. Some entries may override variables
# set by alacritty itself. # set by alacritty itself.
schemes: import:
solarized_light: &light - ~/.config/alacritty/themes/gruvbox_dark.yaml
# Default colors
primary:
background: '#fdf6e3' # base3
foreground: '#657b83' # base00
# Cursor colors
cursor:
text: '#fdf6e3' # base3
cursor: '#657b83' # base00
# Normal colors
normal:
black: '#073642' # base02
red: '#dc322f' # red
green: '#859900' # green
yellow: '#b58900' # yellow
blue: '#268bd2' # blue
magenta: '#d33682' # magenta
cyan: '#2aa198' # cyan
white: '#eee8d5' # base2
# Bright colors
bright:
black: '#002b36' # base03
red: '#cb4b16' # orange
green: '#586e75' # base01
yellow: '#657b83' # base00
blue: '#839496' # base0
magenta: '#6c71c4' # violet
cyan: '#93a1a1' # base1
white: '#fdf6e3' # base3
solarized_dark: &dark
# Default colors
primary:
background: '#002b36' # base03
foreground: '#839496' # base0
# Cursor colors
cursor:
text: '#002b36' # base03
cursor: '#839496' # base0
# Normal colors
normal:
black: '#002b36' # base03
red: '#dc322f' # red
green: '#859900' # green
yellow: '#b58900' # yellow
blue: '#268bd2' # blue
magenta: '#d33682' # magenta
cyan: '#2aa198' # cyan
white: '#eee8d5' # base2
# Bright colors
bright:
black: '#073642' # base02
red: '#cb4b16' # orange
green: '#586e75' # base01
yellow: '#657b83' # base00
blue: '#839496' # base0
magenta: '#6c71c4' # violet
cyan: '#93a1a1' # base1
white: '#fdf6e3' # base3
colors: *dark
#window: #window:
# opacity: 0.9 # opacity: 0.9

View File

@ -0,0 +1,30 @@
# Colors (Gruvbox dark)
colors:
# Default colors
primary:
# hard contrast: background = '0x1d2021'
background: '0x282828'
# soft contrast: background = '0x32302f'
foreground: '0xebdbb2'
# Normal colors
normal:
black: '0x282828'
red: '0xcc241d'
green: '0x98971a'
yellow: '0xd79921'
blue: '0x458588'
magenta: '0xb16286'
cyan: '0x689d6a'
white: '0xa89984'
# Bright colors
bright:
black: '0x928374'
red: '0xfb4934'
green: '0xb8bb26'
yellow: '0xfabd2f'
blue: '0x83a598'
magenta: '0xd3869b'
cyan: '0x8ec07c'
white: '0xebdbb2'

View File

@ -0,0 +1,30 @@
# Colors (Gruvbox light)
colors:
# Default colors
primary:
# hard contrast: background = '0xf9f5d7'
background: '0xfbf1c7'
# soft contrast: background = '0xf2e5bc'
foreground: '0x3c3836'
# Normal colors
normal:
black: '0xfbf1c7'
red: '0xcc241d'
green: '0x98971a'
yellow: '0xd79921'
blue: '0x458588'
magenta: '0xb16286'
cyan: '0x689d6a'
white: '0x7c6f64'
# Bright colors
bright:
black: '0x928374'
red: '0x9d0006'
green: '0x79740e'
yellow: '0xb57614'
blue: '0x076678'
magenta: '0x8f3f71'
cyan: '0x427b58'
white: '0x3c3836'

View File

@ -0,0 +1,26 @@
# Colors (Gruvbox Material Dark Medium)
colors:
primary:
background: '0x282828'
foreground: '0xdfbf8e'
normal:
black: '0x665c54'
red: '0xea6962'
green: '0xa9b665'
yellow: '0xe78a4e'
blue: '0x7daea3'
magenta: '0xd3869b'
cyan: '0x89b482'
white: '0xdfbf8e'
bright:
black: '0x928374'
red: '0xea6962'
green: '0xa9b665'
yellow: '0xe3a84e'
blue: '0x7daea3'
magenta: '0xd3869b'
cyan: '0x89b482'
white: '0xdfbf8e'

View File

@ -0,0 +1,28 @@
# Colors (Solarized Dark)
colors:
# Default colors
primary:
background: '0x002b36'
foreground: '0x839496'
# Normal colors
normal:
black: '0x073642'
red: '0xdc322f'
green: '0x859900'
yellow: '0xb58900'
blue: '0x268bd2'
magenta: '0xd33682'
cyan: '0x2aa198'
white: '0xeee8d5'
# Bright colors
bright:
black: '0x002b36'
red: '0xcb4b16'
green: '0x586e75'
yellow: '0x657b83'
blue: '0x839496'
magenta: '0x6c71c4'
cyan: '0x93a1a1'
white: '0xfdf6e3'

View File

@ -0,0 +1,28 @@
# Colors (Solarized Light)
colors:
# Default colors
primary:
background: '0xfdf6e3'
foreground: '0x586e75'
# Normal colors
normal:
black: '0x073642'
red: '0xdc322f'
green: '0x859900'
yellow: '0xb58900'
blue: '0x268bd2'
magenta: '0xd33682'
cyan: '0x2aa198'
white: '0xeee8d5'
# Bright colors
bright:
black: '0x002b36'
red: '0xcb4b16'
green: '0x586e75'
yellow: '0x657b83'
blue: '0x839496'
magenta: '0x6c71c4'
cyan: '0x93a1a1'
white: '0xfdf6e3'

View File

@ -26,8 +26,10 @@ set inccommand=split
" theme " theme
set termguicolors set termguicolors
set background=dark "set background=dark
colorscheme solarized8 "colorscheme solarized8
autocmd vimenter * ++nested colorscheme gruvbox
" transparancy for background " transparancy for background
"hi Normal guibg=NONE ctermbg=NONE "hi Normal guibg=NONE ctermbg=NONE
@ -38,4 +40,5 @@ set fileencoding=utf8
" plugins " plugins
call plug#begin('~/.local/share/nvim/site/plugged') call plug#begin('~/.local/share/nvim/site/plugged')
Plug 'lervag/vimtex' Plug 'lervag/vimtex'
Plug 'morhetz/gruvbox'
call plug#end() call plug#end()

View File

@ -1,20 +1,39 @@
#!/bin/sh #!/bin/sh
base03="#002b36" # Solarized
base02="#073642" #base03="#002b36"
base01="#586e75" #base02="#073642"
base00="#657b83" #base01="#586e75"
base0="#839496" #base00="#657b83"
base1="#93a1a1" #base0="#839496"
base2="#eee8d5" #base1="#93a1a1"
base3="#fdf6e3" #base2="#eee8d5"
yellow="#b58900" #base3="#fdf6e3"
orange="#cb4b16" #yellow="#b58900"
red="#dc322f" #orange="#cb4b16"
magenta="#d33682" #red="#dc322f"
violet="#6c71c4" #magenta="#d33682"
blue="#268bd2" #violet="#6c71c4"
cyan="#2aa198" #blue="#268bd2"
green="#859900" #cyan="#2aa198"
#green="#859900"
# Gruvbox
base03="#282828"
base02="#3c3836"
base01="#a89984"
base00="#bdae93"
base0="#d5c4a1"
base1="#ebdbb2"
base2="#ebdbb2"
base3="#fbf1c7"
yellow="#d79921"
orange="#d65d0e"
red="#cc241d"
magenta="#b16286"
violet="#b16286"
blue="#458588"
cyan="#689d6a"
green="#98971a"
bemenu_cmd() bemenu_cmd()
{ {

View File

@ -7,7 +7,7 @@ password_files=( "$prefix"/**/*.gpg )
password_files=( "${password_files[@]#"$prefix"/}" ) password_files=( "${password_files[@]#"$prefix"/}" )
password_files=( "${password_files[@]%.gpg}" ) password_files=( "${password_files[@]%.gpg}" )
password=$(printf '%s\n' "${password_files[@]}" | "$HOME/.config/wm_scripts/menucmd" "$@") password=$(printf '%s\n' "${password_files[@]}" | menucmd "$@")
[[ -n $password ]] || exit [[ -n $password ]] || exit

View File

@ -12,22 +12,7 @@ exec_always ~/.config/scripts/sway/import-gsettings
### Variables ### Variables
# #
# Colors # Colors
set $base03 #002b36 include gruvbox
set $base02 #073642
set $base01 #586e75
set $base00 #657b83
set $base0 #839496
set $base1 #93a1a1
set $base2 #eee8d5
set $base3 #fdf6e3
set $yellow #b58900
set $orange #cb4b16
set $red #dc322f
set $magenta #d33682
set $violet #6c71c4
set $blue #268bd2
set $cyan #2aa198
set $green #859900
# Font # Font
#set $font SourceCodePro Semibold 11px #set $font SourceCodePro Semibold 11px
set $font FiraCode SemiBold 11px set $font FiraCode SemiBold 11px
@ -302,7 +287,7 @@ bar {
# #
# Window Colors and aesthetics: # Window Colors and aesthetics:
# #
client.focused $base01 $green $base03 $blue $cyan client.focused $base01 $base0 $base03 $blue $orange
client.focused_inactive $base0 $base02 $base0 $blue $base0 client.focused_inactive $base0 $base02 $base0 $blue $base0
client.unfocused $base01 $base03 $base01 $blue $base01 client.unfocused $base01 $base03 $base01 $blue $base01
client.urgent $base03 $red $base0 $red $red client.urgent $base03 $red $base0 $red $red

27
.config/sway/gruvbox Normal file
View File

@ -0,0 +1,27 @@
# Gruvbox colorscheme, but using solarized's color names to avoid renaming.
#
# bg
set $base03 #282828
# bg1
set $base02 #3c3836
# fg4
set $base01 #a89984
# fg3
set $base00 #bdae93
# fg2
set $base0 #d5c4a1
# fg1
set $base1 #ebdbb2
set $base2 #ebdbb2
# fg0
set $base3 #fbf1c7
set $yellow #d79921
set $orange #d65d0e
set $red #cc241d
# purple
set $magenta #b16286
set $violet #b16286
set $blue #458588
# aqua
set $cyan #689d6a
set $green #98971a

16
.config/sway/solarized Normal file
View File

@ -0,0 +1,16 @@
set $base03 #002b36
set $base02 #073642
set $base01 #586e75
set $base00 #657b83
set $base0 #839496
set $base1 #93a1a1
set $base2 #eee8d5
set $base3 #fdf6e3
set $yellow #b58900
set $orange #cb4b16
set $red #dc322f
set $magenta #d33682
set $violet #6c71c4
set $blue #268bd2
set $cyan #2aa198
set $green #859900