add light theme
This commit is contained in:
parent
274a9735d8
commit
aabce51283
101
config.yaml
101
config.yaml
|
@ -5,49 +5,68 @@
|
|||
# \__,_|\___/ \__\__,_|_| \___/| .__/
|
||||
# |_|
|
||||
|
||||
variables:
|
||||
key:
|
||||
layout: colemak
|
||||
left: n
|
||||
down: e
|
||||
up: i
|
||||
right: o
|
||||
next: l
|
||||
tabL: U
|
||||
tabR: Y
|
||||
insertMode: s
|
||||
insertQuit: kk
|
||||
font:
|
||||
mono: Fira Code
|
||||
interface: Inter
|
||||
cursor_size: 24
|
||||
color_dark: &dark # {{{
|
||||
type: dark
|
||||
accent: '#D9534F'
|
||||
bg: '#202020'
|
||||
bg_light: '#303030'
|
||||
bg_dark: '#191919'
|
||||
txt: '#ffffff'
|
||||
nontxt: '#252525'
|
||||
normal:
|
||||
black: '#555555'
|
||||
red: '#D54E53'
|
||||
green: '#B9CA4A'
|
||||
yellow: '#E6C547'
|
||||
blue: '#7AA6DA'
|
||||
magenta: '#C397D8'
|
||||
cyan: '#70C0BA'
|
||||
white: '#EAEAEA'
|
||||
# }}}
|
||||
color_light: &light # {{{
|
||||
type: light
|
||||
accent: '#D9534F'
|
||||
bg: '#E0E0E0'
|
||||
bg_light: '#F0F0F0'
|
||||
bg_dark: '#C9C9C9'
|
||||
txt: '#101010'
|
||||
nontxt: '#808080'
|
||||
normal:
|
||||
black: '#555555'
|
||||
red: '#D54E53'
|
||||
green: '#008800'
|
||||
yellow: '#E6C547'
|
||||
blue: '#7AA6DA'
|
||||
magenta: '#C397D8'
|
||||
cyan: '#70C0BA'
|
||||
white: '#EAEAEA'
|
||||
# }}}
|
||||
# Themes {{{
|
||||
gtk_theme: "materia-custom-accent{{@@ '-dark' if color.type =='dark' @@}}"
|
||||
icon_theme: "Papirus-{{@@ 'Dark' if color.type == 'dark' else 'Light' @@}}"
|
||||
cursor_theme: "capitaine-cursors{{@@ '-light' if color.type == 'light' @@}}"
|
||||
# }}}
|
||||
color: *light
|
||||
bar: waybar
|
||||
bar_pos: top
|
||||
profiles:
|
||||
i15:
|
||||
variables:
|
||||
key:
|
||||
layout: colemak
|
||||
left: n
|
||||
down: e
|
||||
up: i
|
||||
right: o
|
||||
next: l
|
||||
tabL: U
|
||||
tabR: Y
|
||||
insertMode: s
|
||||
insertQuit: kk
|
||||
font:
|
||||
mono: Fira Code
|
||||
interface: Inter
|
||||
theme:
|
||||
icon: Papirus-Dark
|
||||
gtk: materia-custom-accent-dark
|
||||
cursor: capitaine-cursors
|
||||
cursor_size: 24
|
||||
color_dark: &dark # {{{
|
||||
type: dark
|
||||
accent: '#D9534F'
|
||||
bg: '#202020'
|
||||
bg_light: '#303030'
|
||||
bg_dark: '#191919'
|
||||
txt: '#ffffff'
|
||||
nontxt: '#252525'
|
||||
normal:
|
||||
black: '#555555'
|
||||
red: '#D54E53'
|
||||
green: '#B9CA4A'
|
||||
yellow: '#E6C547'
|
||||
blue: '#7AA6DA'
|
||||
magenta: '#C397D8'
|
||||
cyan: '#70C0BA'
|
||||
white: '#EAEAEA'
|
||||
# }}}
|
||||
color: *dark
|
||||
bar: waybar
|
||||
bar_pos: top
|
||||
dotfiles:
|
||||
- ALL
|
||||
config: # {{{
|
||||
|
|
|
@ -126,7 +126,7 @@ function esway
|
|||
|
||||
set -x XCURSOR_THEME {{@@ theme.cursor @@}}
|
||||
set -x XCURSOR_SIZE {{@@ cursor_size @@}}
|
||||
set -x GTK_THEME materia-custom-accent:dark
|
||||
set -x GTK_THEME {{@@ theme.gtk @@}}
|
||||
|
||||
# set -x XDG_CURRENT_DESKTOP Unity
|
||||
set -x QT_SCALE_FACTOR 1.0001
|
||||
|
@ -174,8 +174,8 @@ end
|
|||
end
|
||||
|
||||
alias _fish_prompt_accent "_fish_prompt_color '{{@@ color.accent @@}}'"
|
||||
alias _fish_prompt_normal "_fish_prompt_color 'brwhite'"
|
||||
alias _fish_prompt_warn "_fish_prompt_color 'bryellow'"
|
||||
alias _fish_prompt_normal "_fish_prompt_color '{{@@ color.txt @@}}'"
|
||||
|
||||
function _fish_promt_git_status
|
||||
git status -s | grep "^$argv[1]" &> /dev/null &&
|
||||
|
@ -191,11 +191,11 @@ end
|
|||
if fish_vcs_prompt > /dev/null
|
||||
_fish_prompt_normal " on "
|
||||
|
||||
_fish_promt_git_status '??' '?' brwhite
|
||||
_fish_promt_git_status ' M' '~' yellow
|
||||
_fish_promt_git_status ' D' '-' red
|
||||
_fish_promt_git_status 'A ' '+' green
|
||||
_fish_promt_git_status 'M ' '~' green
|
||||
_fish_promt_git_status '??' '?' '{{@@ color.txt @@}}'
|
||||
_fish_promt_git_status ' M' '~' '{{@@ color.normal.yellow @@}}'
|
||||
_fish_promt_git_status ' D' '-' '{{@@ color.normal.red @@}}'
|
||||
_fish_promt_git_status 'A ' '+' '{{@@ color.normal.green @@}}'
|
||||
_fish_promt_git_status 'M ' '~' '{{@@ color.normal.green @@}}'
|
||||
|
||||
_fish_prompt_accent (fish_vcs_prompt | string replace -ra ' \(|\)' '')
|
||||
end
|
||||
|
|
|
@ -6,7 +6,11 @@ font_size 12
|
|||
cursor {{@@ color.accent @@}}
|
||||
background {{@@ color.bg @@}}
|
||||
foreground {{@@ color.txt @@}}
|
||||
{%@@ if color.type == 'dark' @@%}
|
||||
background_opacity 0.98
|
||||
{%@@ else @@%}
|
||||
background_opacity 0.90
|
||||
{%@@ endif @@%}
|
||||
|
||||
|
||||
# black
|
||||
|
|
|
@ -28,9 +28,10 @@ call plug#begin('~/.config/nvim/plugged')
|
|||
|
||||
" Language server support
|
||||
"
|
||||
{%@@ set lsp = "vim-lsp" @@%}
|
||||
" {%@@ set lsp = "vim-lsp" @@%}
|
||||
|
||||
{%@@ if lsp == "vim-lsp" @@%}
|
||||
" {%@@ if lsp == "vim-lsp" @@%}
|
||||
"
|
||||
Plug 'prabirshrestha/vim-lsp'
|
||||
Plug 'mattn/vim-lsp-settings'
|
||||
|
||||
|
@ -42,9 +43,10 @@ call plug#begin('~/.config/nvim/plugged')
|
|||
Plug 'prabirshrestha/asyncomplete-buffer.vim'
|
||||
|
||||
set completeopt+=menu,longest,preview
|
||||
{%@@ elif lsp == "coc" @@%}
|
||||
" {%@@ elif lsp == "coc" @@%}
|
||||
"
|
||||
Plug 'neoclide/coc.nvim', {'branch': 'release'}
|
||||
{%@@ endif @@%}
|
||||
" {%@@ endif @@%}
|
||||
|
||||
Plug 'sheerun/vim-polyglot'
|
||||
|
||||
|
@ -75,6 +77,7 @@ call plug#begin('~/.config/nvim/plugged')
|
|||
|
||||
" Color scheme
|
||||
Plug 'dikiaap/minimalist'
|
||||
Plug 'endel/vim-github-colorscheme'
|
||||
|
||||
" Latex
|
||||
Plug 'xuhdev/vim-latex-live-preview', { 'for': 'tex' }
|
||||
|
@ -165,14 +168,19 @@ call plug#end()
|
|||
endif
|
||||
" endif
|
||||
|
||||
colorscheme minimalist
|
||||
|
||||
set background=dark
|
||||
{%@@ if color.type == "light" @@%}
|
||||
colorscheme github
|
||||
set background=light
|
||||
{%@@ elif color.type == "dark" @@%}
|
||||
colorscheme minimalist
|
||||
set background=dark
|
||||
{%@@ endif @@%}
|
||||
|
||||
"background color is transparent
|
||||
highlight Normal guibg=None
|
||||
highlight EndOfBuffer guibg=None guifg={{@@ color.bg_light @@}}
|
||||
highlight SpecialKey guibg=None guifg={{@@ color.accent @@}}
|
||||
highlight Folded guibg=None
|
||||
|
||||
highlight tabLine None
|
||||
highlight tabLineFill None
|
||||
|
@ -185,14 +193,17 @@ call plug#end()
|
|||
"Line numers
|
||||
highlight LineNr term=bold ctermfg=9 guifg={{@@ color.bg_light @@}} guibg=None
|
||||
|
||||
" Comments
|
||||
highlight Comment guifg={{@@ color.nontxt @@}} guibg=None
|
||||
|
||||
"Make whitespace dark
|
||||
highlight NonText ctermfg=darkgray guifg={{@@ color.nontxt @@}} guibg=None
|
||||
highlight NonText guifg={{@@ color.bg_dark @@}} guibg=None
|
||||
" highlight SpecialKey ctermfg=black guifg=#252525 guibg=None
|
||||
|
||||
"Current line
|
||||
set cursorline
|
||||
highlight CursorLine term=bold cterm=bold gui=Bold guibg={{@@ color.bg_dark @@}}
|
||||
highlight CursorLineNr term=bold cterm=bold gui=Bold guibg={{@@ color.bg_dark @@}} guifg=white
|
||||
highlight CursorLineNr term=bold cterm=bold gui=Bold guibg={{@@ color.bg_dark @@}} guifg={{@@ color.nontxt @@}}
|
||||
|
||||
"Splits
|
||||
highlight VertSplit guibg=None guifg={{@@ color.bg_dark @@}}
|
||||
|
|
|
@ -131,15 +131,23 @@ c.url.start_pages = "{{@@ search_engine @@}}"
|
|||
# }}}
|
||||
# Colors {{{
|
||||
# Background color of the completion widget for odd rows.
|
||||
c.colors.completion.odd.bg = "{{@@ color.bg @@}}"
|
||||
c.colors.completion.fg = "{{@@ color.txt @@}}"
|
||||
c.colors.completion.odd.bg = "{{@@ color.bg_dark @@}}"
|
||||
c.colors.completion.even.bg = "{{@@ color.bg_light @@}}"
|
||||
c.colors.completion.category.bg = "{{@@ color.bg_dark @@}}"
|
||||
|
||||
c.colors.completion.category.fg = "{{@@ color.txt @@}}"
|
||||
c.colors.completion.category.bg = "{{@@ color.bg_light @@}}"
|
||||
c.colors.completion.category.border.top = "{{@@ color.bg_dark @@}}"
|
||||
c.colors.completion.category.border.bottom = "{{@@ color.bg_dark @@}}"
|
||||
|
||||
c.colors.completion.item.selected.bg = "{{@@ color.accent @@}}"
|
||||
c.colors.completion.item.selected.border.top = "#550000"
|
||||
c.colors.completion.item.selected.border.bottom = "#550000"
|
||||
c.colors.completion.item.selected.border.top = "{{@@ color.bg_dark @@}}"
|
||||
c.colors.completion.item.selected.border.bottom = "{{@@ color.bg_dark @@}}"
|
||||
|
||||
c.colors.statusbar.command.fg = "{{@@ color.txt @@}}"
|
||||
|
||||
# Foreground color of the matched text in the selected completion item.
|
||||
c.colors.completion.item.selected.match.fg = "white"
|
||||
c.colors.completion.item.selected.match.fg = "{{@@ color.txt @@}}"
|
||||
|
||||
# Color of the scrollbar in the completion view.
|
||||
c.colors.completion.scrollbar.bg = "{{@@ color.bg_light @@}}"
|
||||
|
@ -170,13 +178,13 @@ c.colors.keyhint.suffix.fg = "{{@@ color.accent @@}}"
|
|||
c.colors.keyhint.bg = "rgba(30, 30, 30, 95%)"
|
||||
|
||||
# Foreground color of the statusbar.
|
||||
c.colors.statusbar.normal.fg = "gray"
|
||||
c.colors.statusbar.normal.fg = "{{@@ color.txt @@}}"
|
||||
|
||||
# Background color of the statusbar.
|
||||
c.colors.statusbar.normal.bg = "{{@@ color.bg @@}}"
|
||||
|
||||
# Foreground color of the statusbar in insert mode.
|
||||
c.colors.statusbar.insert.fg = "#aaffaa"
|
||||
c.colors.statusbar.insert.fg = "{{@@ color.normal.green @@}}"
|
||||
|
||||
# Background color of the statusbar in insert mode.
|
||||
c.colors.statusbar.insert.bg = "{{@@ color.bg @@}}"
|
||||
|
@ -189,28 +197,24 @@ c.colors.statusbar.caret.selection.bg = "{{@@ color.accent @@}}"
|
|||
|
||||
# Foreground color of the URL in the statusbar on successful load
|
||||
# (https).
|
||||
c.colors.statusbar.url.success.https.fg = "white"
|
||||
c.colors.statusbar.url.success.https.fg = "{{@@ color.txt @@}}"
|
||||
|
||||
# Background color of the tab bar.
|
||||
c.colors.tabs.bar.bg = "{{@@ color.bg @@}}"
|
||||
|
||||
# Background color of unselected odd tabs.
|
||||
# Foreground color of tabs.
|
||||
c.colors.tabs.even.fg = "{{@@ color.txt @@}}"
|
||||
c.colors.tabs.odd.fg = "{{@@ color.txt @@}}"
|
||||
# Background color of tabs.
|
||||
c.colors.tabs.even.bg = "{{@@ color.bg @@}}"
|
||||
c.colors.tabs.odd.bg = "{{@@ color.bg @@}}"
|
||||
|
||||
# Background color of unselected even tabs.
|
||||
c.colors.tabs.even.bg = "{{@@ color.bg @@}}"
|
||||
|
||||
# Foreground color of selected odd tabs.
|
||||
c.colors.tabs.selected.odd.fg = "white"
|
||||
|
||||
# Background color of selected odd tabs.
|
||||
c.colors.tabs.selected.odd.bg = "{{@@ color.accent @@}}"
|
||||
|
||||
# Foreground color of selected even tabs.
|
||||
c.colors.tabs.selected.even.fg = "white"
|
||||
|
||||
# Background color of selected even tabs.
|
||||
# Foreground color of selected tabs.
|
||||
c.colors.tabs.selected.even.fg = "{{@@ color.txt @@}}"
|
||||
c.colors.tabs.selected.odd.fg = "{{@@ color.txt @@}}"
|
||||
# Background color of selected tabs.
|
||||
c.colors.tabs.selected.even.bg = "{{@@ color.accent @@}}"
|
||||
c.colors.tabs.selected.odd.bg = "{{@@ color.accent @@}}"
|
||||
|
||||
# Background color of pinned selected odd tabs.
|
||||
c.colors.tabs.pinned.selected.odd.bg = "{{@@ color.bg_light @@}}"
|
||||
|
@ -218,9 +222,12 @@ c.colors.tabs.pinned.selected.odd.bg = "{{@@ color.bg_light @@}}"
|
|||
# Background color of pinned selected even tabs.
|
||||
c.colors.tabs.pinned.selected.even.bg = "{{@@ color.bg_light @@}}"
|
||||
|
||||
# {%@@ if color.type == "dark" @@%}
|
||||
#
|
||||
c.colors.webpage.darkmode.enabled = True
|
||||
c.colors.webpage.darkmode.threshold.background = 256 // 2
|
||||
c.colors.webpage.darkmode.threshold.text = 256 // 2
|
||||
# {%@@ endif @@%}
|
||||
# }}}
|
||||
# Fonts {{{
|
||||
# Font used in the completion widget.
|
||||
|
|
|
@ -25,13 +25,17 @@
|
|||
# set $menu bmenu run $term
|
||||
font {{@@ font.interface @@}} 14px
|
||||
|
||||
{%@@ if color.type == 'dark' @@%}
|
||||
set $wallPath ~/.local/share/wallpapers/assembly.png
|
||||
{%@@ else @@%}
|
||||
set $wallPath ~/.local/share/wallpapers/austria.jpg
|
||||
{%@@ endif @@%}
|
||||
|
||||
# }}}
|
||||
# Output configuration {{{
|
||||
#
|
||||
# output * bg '#252525' solid_color
|
||||
output * bg $wallPath fit
|
||||
output * bg $wallPath fill
|
||||
# Output HDMI-A-1 resolution 1280x720
|
||||
|
||||
# Disable laptop screen if closed, --reload is important
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 2.7 MiB |
|
@ -7,7 +7,9 @@
|
|||
}
|
||||
|
||||
window#waybar {
|
||||
background-color: rgba(30,30,30,.9);
|
||||
/* background-color: rgba(30,30,30,.9); */
|
||||
opacity: 0.9;
|
||||
background-color: {{@@ color.bg @@}};
|
||||
{%@@ if bar_pos == "top" @@%}
|
||||
border-bottom:
|
||||
{%@@ else @@%}
|
||||
|
@ -17,6 +19,7 @@ window#waybar {
|
|||
}
|
||||
|
||||
window#waybar.solo {
|
||||
opacity: 1;
|
||||
background-color: {{@@ color.bg @@}};
|
||||
}
|
||||
|
||||
|
@ -30,7 +33,7 @@ window#waybar.empty {
|
|||
min-width:50px;
|
||||
background-color: transparent;
|
||||
border: 3px solid transparent;
|
||||
color: #aaaaaa;
|
||||
color: {{@@ color.nontxt @@}};
|
||||
}
|
||||
|
||||
#workspaces button.focused {
|
||||
|
@ -41,12 +44,12 @@ window#waybar.empty {
|
|||
{%@@ endif @@%}
|
||||
3px solid {{@@ color.accent @@}};
|
||||
/* border-bottom: 3px solid transparent; */
|
||||
color: #ffffff;
|
||||
color: {{@@ color.txt @@}};
|
||||
}
|
||||
|
||||
/*Window Title*/
|
||||
#window{
|
||||
color:#aaa;
|
||||
color: {{@@ color.txt @@}};
|
||||
margin:0 4px;
|
||||
}
|
||||
|
||||
|
|
Reference in New Issue