Compare commits

...

7 Commits

Author SHA1 Message Date
lelgenio 43c270e596 I don't even know 2020-12-02 23:59:11 -03:00
lelgenio 1e81ac2373 fix light theme LineNumberCursor 2020-12-02 23:58:44 -03:00
lelgenio 546eef0331 don't repeat myself and formatting 2020-12-02 23:58:13 -03:00
lelgenio 611f89656b format and add lighter/darker filters 2020-12-02 23:56:16 -03:00
lelgenio 4598c8051a add terminal emulators 2020-12-02 23:45:55 -03:00
lelgenio 23064088fe format 2020-12-02 23:45:40 -03:00
lelgenio ae74874294 update light nontxt 2020-12-02 23:44:47 -03:00
6 changed files with 336 additions and 221 deletions

View File

@ -5,7 +5,10 @@
# \__,_|\___/ \__\__,_|_| \___/| .__/
# |_|
###############################################################
variables:
###############################################################
username: lelgenio
mail: disroot.org
cursor_size: 24
@ -25,8 +28,11 @@ variables:
medium: 14
big: 16
###############################################################
profiles:
dark: # {{{
###############################################################
dark:
variables:
opacity: 0.98
@ -48,8 +54,7 @@ profiles:
cyan: '#70C0BA'
white: '#EAEAEA'
# }}}
light: # {{{
light:
variables:
opacity: 0.95
@ -59,7 +64,7 @@ profiles:
bg_light: '#A0A0A0'
bg_dark: '#EAEAEA'
txt: '#303030'
nontxt: '#F0F0F0'
nontxt: '#E0E0E0'
normal:
black: '#555555'
@ -71,8 +76,9 @@ profiles:
cyan: '#00A0A5'
white: '#FFFFFF'
# }}}
###############################################################
# Accents {{{
###############################################################
accent_red: {variables: {accent_color: "#D9534F"}}
accent_green: {variables: {accent_color: "#159828"}}
@ -82,8 +88,11 @@ profiles:
accent_magenta: {variables: {accent_color: "#9C27B0"}}
accent_orange: {variables: {accent_color: "#D93200"}}
# }}}
colemak: #{{{
###############################################################
# Keyboard Layouts
###############################################################
colemak:
variables:
key:
layout: colemak
@ -97,8 +106,7 @@ profiles:
insertMode: s
insertQuit: kk
#}}}
qwerty: #{{{
qwerty:
variables:
key:
layout: qwerty
@ -112,9 +120,12 @@ profiles:
insertMode: i
insertQuit: jj
#}}}
main: #{{{
###############################################################
# Main profile
###############################################################
main:
variables:
gtk_theme: "materia-{{@@ env['USER'] @@}}-{{@@ accent_color_name @@}}-{{@@ color.type @@}}"
kvantum_theme: "Materia{{@@ color.type.capitalize() @@}}"
@ -127,9 +138,11 @@ profiles:
- "{{@@ color_type @@}}"
- "accent_{{@@ accent_color_name @@}}"
#}}}
config: # {{{
###############################################################
config:
###############################################################
backup: false
banner: false
keepdot: false
@ -140,153 +153,31 @@ config: # {{{
- notify
func_file:
- funcs.py
filter_file:
- funcs.py
###############################################################
dynvariables:
###############################################################
color_type: test -n "$_COLOR_TYPE" && echo "$_COLOR_TYPE" || echo dark
accent_color_name: test -n "$_ACCENT_COLOR" && echo "$_ACCENT_COLOR" || echo red
blender_version: blender --version | head -n1 | sed -E 's|^Blender (.*)\..*|\1|g'
# }}}
dotfiles: # {{{
nvim:
src: nvim.vim
dst: ~/.config/nvim/init.vim
actions:
- vimplug
sway:
src: sway
dst: ~/.config/sway
actions:
- reload_sway
fish:
src: fish
dst: ~/.config/fish
actions:
- reload_fish
mako:
src: mako.conf
dst: ~/.config/mako/config
actions:
- reload_mako
waybar:
src: waybar
dst: ~/.config/waybar
actions:
- reload_sway
kitty:
src: kitty.conf
dst: ~/.config/kitty/kitty.conf
actions:
- reload_fish
qutebrowser:
src: qutebrowser
dst: ~/.config/qutebrowser
lesskey:
src: lesskey
dst: ~/.lesskey
actions:
- lesskey
scripts:
src: scripts
dst: ~/.local/bin
actions:
- make_theme
wofi:
src: wofi
dst: ~/.config/wofi
ranger:
src: ranger
dst: ~/.config/ranger
actions:
- ranger_icons
zathura:
src: zathura.conf
dst: ~/.config/zathura/zathurarc
wallpapers:
src: wallpapers
dst: ~/.local/share/wallpapers
mime:
src: mime/
dst: ~/
fusuma:
src: fusuma.yml
dst: ~/.config/fusuma/config.yml
alacritty:
src: alacritty.yml
dst: ~/.config/alacritty.yml
mpd:
src: mpd.conf
dst: ~/.config/mpd/mpd.conf
dav:
src: dav/
dst: ~/.config
actions:
- vdirsyncer
rclone:
src: rclone.conf
dst: ~/.config/rclone/rclone.conf
mutt:
src: neomutt/
dst: ~/.config/neomutt/
actions:
- lnMail
crontab:
src: crontab
dst: ~/.local/share/crontab
actions:
- crontab_install
theme:
src: theme
dst: ~/
kanshi:
src: kanshi
dst: ~/.config/kanshi/config
imv:
src: imv.conf
dst: ~/.config/imv/config
mpv:
src: mpv.conf
dst: ~/.config/mpv/mpv.conf
actions:
- sponsorblock
blender:
src: blenderTheme.xml
dst: "~/.config/blender/{{@@ blender_version @@}}/scripts/presets/interface_theme/blenderTheme.xml"
clang-format:
src: clang-format
dst: ~/.clang-format
gpg-agent:
src: gpg-agent.conf
dst: ~/.gnupg/gpg-agent.conf
actions:
- pam_gpg
tmux:
src: tmux.conf
dst: ~/.tmux.conf
git:
src: gitconfig
dst: ~/.config/git/config
telegram-theme:
src: ./telegram.palette
dst: ~/.local/share/TelegramDesktop/theme.tdesktop-palette
kakoune:
src: kak
dst: ~/.config/kak
packages:
src: metaPKGBUILD
dst: ~/.local/share/metapkg/PKGBUILD
actions:
- install_meta
bat:
src: bat
dst: ~/.config/bat/config
# }}}
actions: #{{{
notify: notify-send "Updating dotfiles" "{{@@ _dotfile_abs_dst.lstrip(env['HOME']) @@}}"
###############################################################
actions:
###############################################################
notify: >
notify-send
"Updating dotfiles"
"{{@@ _dotfile_abs_dst.lstrip(env['HOME']) @@}}"
reload_mako: makoctl reload
lesskey: lesskey
reload_sway: swaymsg reload &>/dev/null & disown
reload_fish: pkill -SIGHUP fish
vimplug: >
nvim
+PlugUpgrade
@ -295,14 +186,18 @@ actions: #{{{
+qall
&> /dev/null
& disown
crontab_install: |
crontab -r
crontab ~/.local/share/crontab
vdirsyncer: |
yes | vdirsyncer discover & disown
lnMail: |
ln -fs ~/.config/neomutt/mbsyncrc ~/.mbsyncrc
ln -fs ~/.config/neomutt/urlview ~/.urlview
sponsorblock: >
test -d ~/.config/mpv/scripts/sponsorblock_shared ||
git clone
@ -312,14 +207,174 @@ actions: #{{{
rm -f
~/.config/mpv/scripts/LICENSE
~/.config/mpv/scripts/README.md
ranger_icons:
git clone
https://github.com/alexanderjeurissen/ranger_devicons
~/.config/ranger/plugins/ranger_devicons
# bootstrap scripts
pam_gpg: _pam-gpg-strap
make_theme:
~/.local/bin/_make_theme
install_meta:
~/.local/bin/install_meta
# }}}
# vim: fdm=marker
make_theme: _make_theme
install_meta: install_meta
post:
# by having it be the last thing to run
# and quickly disowning,
# we can make it run only once
reload_sway: >
pidof swaymsg &>/dev/null ||
swaymsg reload &
disown
###############################################################
dotfiles: # Just a bunch of paths and action mappings
###############################################################
###############################################################
# Regular programs
###############################################################
sway:
src: sway
dst: ~/.config/sway
actions:
- reload_sway
fish:
src: fish
dst: ~/.config/fish
actions:
- reload_fish
mako:
src: mako.conf
dst: ~/.config/mako/config
actions:
- reload_mako
waybar:
src: waybar
dst: ~/.config/waybar
actions:
- reload_sway
kitty:
src: kitty.conf
dst: ~/.config/kitty/kitty.conf
actions:
- reload_fish
nvim:
src: nvim.vim
dst: ~/.config/nvim/init.vim
actions:
- vimplug
mutt:
src: neomutt/
dst: ~/.config/neomutt/
actions:
- lnMail
lesskey:
src: lesskey
dst: ~/.lesskey
actions:
- lesskey
ranger:
src: ranger
dst: ~/.config/ranger
actions:
- ranger_icons
mpv:
src: mpv.conf
dst: ~/.config/mpv/mpv.conf
actions:
- sponsorblock
dav:
src: dav/
dst: ~/.config
actions:
- vdirsyncer
tmux:
src: tmux.conf
dst: ~/.tmux.conf
###############################################################
# Other
###############################################################
scripts:
src: scripts
dst: ~/.local/bin
actions:
- make_theme
wallpapers:
src: wallpapers
dst: ~/.local/share/wallpapers
mime:
src: mime/
dst: ~/
crontab:
src: crontab
dst: ~/.local/share/crontab
actions:
- crontab_install
theme:
src: theme
dst: ~/
clang-format:
src: clang-format
dst: ~/.clang-format
gpg-agent:
src: gpg-agent.conf
dst: ~/.gnupg/gpg-agent.conf
actions:
- pam_gpg
packages:
src: metaPKGBUILD
dst: ~/.local/share/metapkg/PKGBUILD
actions:
- install_meta
###############################################################
# Big pahts
###############################################################
telegram-theme:
src: ./telegram.palette
dst: ~/.local/share/TelegramDesktop/theme.tdesktop-palette
blender:
"src": blenderTheme.xml
"dst": "~/.config/blender/{{@@ blender_version @@}}/scripts/presets/interface_theme/blenderTheme.xml"
###############################################################
# .config/, no actions
###############################################################
alacritty: { "src":"alacritty.yml", "dst":"~/.config/alacritty.yml" }
bat: { "src":"bat", "dst":"~/.config/bat/config" }
fusuma: { "src":"fusuma.yml", "dst":"~/.config/fusuma/config.yml" }
git: { "src":"gitconfig", "dst":"~/.config/git/config" }
imv: { "src":"imv.conf", "dst":"~/.config/imv/config" }
kakoune: { "src":"kak", "dst":"~/.config/kak" }
kanshi: { "src":"kanshi", "dst":"~/.config/kanshi/config" }
mpd: { "src":"mpd.conf", "dst":"~/.config/mpd/mpd.conf" }
qutebrowser: { "src":"qutebrowser", "dst":"~/.config/qutebrowser" }
rclone: { "src":"rclone.conf", "dst":"~/.config/rclone/rclone.conf" }
wofi: { "src":"wofi", "dst":"~/.config/wofi" }
zathura: { "src":"zathura.conf", "dst":"~/.config/zathura/zathurarc" }

View File

@ -62,14 +62,14 @@ face global MatchingChar default,default+b
# Goodies
add-highlighter global/ number-lines -relative -hlcursor
face global LineNumbers {{@@ bg_light @@}},default
face global LineNumberCursor white,{{@@ bg_dark @@}}
face global LineNumbers {{@@ bg_light @@}},default
face global LineNumberCursor default,{{@@ bg_dark @@}}
face global LineNumbersWrapped red,default
add-highlighter global/ show-whitespaces
face global Whitespace {{@@ nontxt @@}},default+f
face global BufferPadding {{@@ nontxt @@}},default
# highlight trailing whitespace
## highlight trailing whitespace
# add-highlighter global/ regex '\h*$' 0:red,red+g

View File

@ -47,6 +47,9 @@ depends=(
papirus-folders capitaine-cursors
# Terminal
# Emulators
kitty alacritty
#Tools
ranger atool p7zip tree jq fzf
neofetch htop
# Replacements
@ -105,3 +108,4 @@ depends=(
)
# vim: ft=sh

View File

@ -1,32 +1,33 @@
colors:
########################################################
# Tabs
########################################################
tabs:
bar:
bg: "{{@@ color.bg @@}}"
odd:
bg: "{{@@ color.bg @@}}"
fg: "{{@@ color.txt @@}}"
even:
bg: "{{@@ color.bg_dark @@}}"
fg: "{{@@ color.txt @@}}"
selected:
pinned: &tabs_defaults
odd:
bg: "{{@@ accent_color @@}}"
bg: "{{@@ color.bg @@}}"
fg: "{{@@ color.txt @@}}"
even:
bg: "{{@@ accent_color @@}}"
bg: "{{@@ color.bg_dark @@}}"
fg: "{{@@ color.txt @@}}"
pinned:
selected:
odd:
bg: "{{@@ color.bg @@}}"
bg: "{{@@ accent_color @@}}"
fg: "{{@@ color.txt @@}}"
even:
bg: "{{@@ color.bg_dark @@}}"
bg: "{{@@ accent_color @@}}"
fg: "{{@@ color.txt @@}}"
<<: *tabs_defaults
########################################################
# Completion for urls and commands
########################################################
completion:
fg: "{{@@ color.txt @@}}"
even:
@ -35,6 +36,8 @@ colors:
bg: "{{@@ color.bg @@}}"
scrollbar:
bg: "{{@@ color.bg_light @@}}"
match:
fg: "{{@@ accent_color @@}}"
category:
fg: "{{@@ color.txt @@}}"
bg: "{{@@ color.bg_light @@}}"
@ -50,9 +53,12 @@ colors:
bottom: "{{@@ color.bg_dark @@}}"
match:
fg: "{{@@ color.txt @@}}"
########################################################
# Statusbar
########################################################
statusbar:
normal:
fg: "{{@@ color.txt @@}}"
@ -70,12 +76,16 @@ colors:
success:
https:
fg: "{{@@ color.txt @@}}"
fg: "{{@@ color.normal.yellow @@}}"
http:
fg: "{{@@ color.normal.red @@}}"
hover:
fg: "{{@@ color.normal.cyan @@}}"
########################################################
# Downloads
########################################################
downloads:
start:
bg: "{{@@ color.normal.blue @@}}"
@ -83,25 +93,34 @@ colors:
bg: "{{@@ color.normal.green @@}}"
bar:
bg: "{{@@ color.bg @@}}"
########################################################
# Choice of what element should be clicked
########################################################
hints:
fg: "{{@@ color.txt @@}}"
bg: "{{@@ color.bg @@}}"
match:
fg: "{{@@ accent_color @@}}"
########################################################
# List of what each keybinding does
########################################################
keyhint:
fg: "{{@@ color.txt @@}}"
bg: "rgba({{@@ hex2rgb(color.bg) @@}}, {{@@ opacity @@}})"
suffix:
fg: "{{@@ accent_color @@}}"
########################################################
# Right click menu
########################################################
contextmenu:
menu:
bg: "{{@@ color.bg @@}}"
@ -111,10 +130,13 @@ colors:
disabled:
fg: "{{@@ color.bg_light @@}}"
########################################################
# Dark theme
########################################################
# {%@@ if color.type == "dark" @@%} #
webpage:
bg: "{{@@ color.bg @@}}"
prefers_color_scheme_dark: True
@ -123,4 +145,5 @@ colors:
threshold:
background: {{@@ 256 // 2 @@}}
text: {{@@ 256 // 2 @@}}
# {%@@ endif @@%}

View File

@ -29,7 +29,7 @@ imageBgTransparent: windowFg ;
activeButtonBg: {{@@ accent_color @@}} ;
activeButtonBgOver: {{@@ accent_color @@}} ;
activeButtonBgRipple: {{@@ accent_color @@}} ;
activeButtonFg: windowFg ;
activeButtonFg: {{@@ color.nontxt @@}} ;
activeButtonFgOver: activeButtonFg ;
activeButtonSecondaryFg: windowBgRipple ;
activeButtonSecondaryFgOver: activeButtonSecondaryFg ;
@ -189,17 +189,7 @@ stickerPanDeleteBg: #000000cc ;
stickerPanDeleteFg: #525252f2 ;
stickerPreviewBg: {{@@ color.txt @@}} ;
historyTextInFg: {{@@ color.txt @@}} ;
historyTextOutFg: #000000 ;
historyCaptionInFg: historyTextInFg ;
historyCaptionOutFg: historyTextOutFg ;
historyFileNameInFg: historyTextInFg ;
historyFileNameOutFg: #000000 ;
historyOutIconFg: #000000 ;
historyOutIconFgSelected: #000000 ;
historyIconFgInverted: {{@@ color.txt @@}} ;
historySendingOutIconFg: {{@@ accent_color @@}} ;
historySendingInIconFg: {{@@ color.bg_light @@}} ;
historySendingInvertedIconFg: #ffffffc8 ;
historySystemBg: #89a0b47f ;
historySystemBgSelected: #bbc8d4a2 ;
@ -232,34 +222,50 @@ historyScrollBg: #00000000 ;
historyScrollBgOver: {{@@ color.bg_light @@}} ;
msgOutBg: {{@@ accent_color @@}} ;
msgOutBgSelected: msgOutBg ;
msgOutDateFg: {{@@ color.bg_dark @@}} ;
msgOutDateFgSelected: msgOutDateFg ;
msgOutMonoFg: {{@@ color.nontxt @@}} ;
msgOutReplyBarColor: msgInReplyBarColor ;
msgOutReplyBarSelColor: {{@@ color.nontxt @@}} ;
msgOutServiceFg: {{@@ color.bg_dark @@}} ;
msgOutServiceFgSelected: msgOutServiceFg ;
msgOutShadow: {{@@ accent_color | darker @@}} ;
msgOutShadowSelected: msgOutShadow ;
historyCaptionOutFg: historyTextOutFg ;
historyFileNameOutFg: {{@@ color.bg_dark @@}} ;
historyOutIconFg: {{@@ color.bg_dark @@}} ;
historyOutIconFgSelected: {{@@ color.bg_dark @@}} ;
historySendingOutIconFg: {{@@ color.bg_dark @@}} ;
historyTextOutFg: {{@@ color.nontxt @@}} ;
msgInBg: {{@@ color.bg @@}} ;
msgInBgSelected: {{@@ color.bg_light @@}} ;
msgOutBg: {{@@ accent_color @@}} ;
msgOutBgSelected: {{@@ accent_color @@}} ;
msgSelectOverlay: #358cd44c ;
msgStickerOverlay: #358cd47f ;
msgInServiceFg: {{@@ color.txt @@}} ;
msgInServiceFgSelected: {{@@ color.txt @@}} ;
msgOutServiceFg: #000000 ;
msgOutServiceFgSelected: #000000 ;
msgInShadow: {{@@ color.bg_dark @@}} ;
msgInShadowSelected: {{@@ color.bg_light @@}} ;
msgOutShadow: {{@@ color.bg_dark @@}} ;
msgOutShadowSelected: {{@@ color.bg_light @@}} ;
msgInDateFg: {{@@ color.bg_light @@}} ;
msgInDateFgSelected: {{@@ color.txt @@}} ;
msgOutDateFg: #000000 ;
msgOutDateFgSelected: #000000 ;
msgInMonoFg: {{@@ color.bg_light @@}} ;
msgInReplyBarColor: {{@@ color.bg_light @@}} ;
msgInReplyBarSelColor: {{@@ color.txt @@}} ;
msgInServiceFg: {{@@ color.txt @@}} ;
msgInServiceFgSelected: {{@@ color.txt @@}} ;
msgInShadow: {{@@ color.bg_dark @@}} ;
msgInShadowSelected: {{@@ color.bg_light @@}} ;
historyTextInFg: {{@@ color.txt @@}} ;
historyCaptionInFg: historyTextInFg ;
historyFileNameInFg: historyTextInFg ;
historySendingInIconFg: {{@@ color.bg_light @@}} ;
msgSelectOverlay: #358cd44c ;
msgStickerOverlay: #358cd47f ;
msgServiceFg: {{@@ color.txt @@}} ;
msgServiceBg: #5B606F95 ;
msgServiceBgSelected: #8ca0b3a2 ;
msgInReplyBarColor: {{@@ color.bg_light @@}} ;
msgInReplyBarSelColor: {{@@ color.txt @@}} ;
msgOutReplyBarColor: msgInReplyBarColor ;
msgOutReplyBarSelColor: {{@@ color.txt @@}} ;
msgImgReplyBarColor: msgServiceFg ;
msgInMonoFg: {{@@ color.bg_light @@}} ;
msgOutMonoFg: {{@@ color.txt @@}} ;
msgDateImgFg: {{@@ color.bg_light @@}} ;
msgDateImgBg: #00000054 ;
msgDateImgBgOver: #5B606F95 ;

View File

@ -18,23 +18,6 @@ def ordered_path():
return ':'.join(newPATH)
def hex2rgb(e):
assert e.startswith("#")
e = e.strip("#").lower()
assert len(e) == 6
for i in e:
assert (i in "0123456789abcdef")
def h2r(i):
return str(eval('0x{}'.format(i)))
r = e[0:2]
g = e[2:4]
b = e[4:6]
return ", ".join([h2r(i) for i in (r, g, b)])
def rclone_obscure(pass_name):
try:
fPath = os.path.expanduser("~/.config/rclone/rclone.conf")
@ -50,3 +33,47 @@ def rclone_obscure(pass_name):
return check_output(args).decode().strip()
return sh("rclone", "obscure", sh("_get-pass", pass_name))
####################################################################
# color
####################################################################
def split_hex(e):
e = e.lstrip("#").lower()
return e[0:2], e[2:4], e[4:6]
def hex2rgb(e):
return ", ".join([str(int(s, base=16))
for s in split_hex(e)])
def color_mult(e: str, amount: float):
"""\
Multiply e hex rgb colorCode with amount number
Usefull for lightening/darkening
"""
def segment(s):
base256 = int(s, base=16)
result_val = base256 * amount
hex_result = hex(int(result_val))[2:]
return str(hex_result)
prefix = "#" * e.startswith("#")
return prefix + "".join(map(segment, split_hex(e)))
####################################################################
# Filters
####################################################################
def darker(arg1, amount=0.75):
return color_mult(arg1, amount)
def lighter(arg1, amount=1.25):
return color_mult(arg1, amount)