From f6c5755149d6cd15672c521863c9488ec625d5c2 Mon Sep 17 00:00:00 2001 From: Cedric Bonhomme Date: Tue, 9 Apr 2024 00:26:00 +0200 Subject: [PATCH] Fix eww and rofi with some hyprland styling on gaps_out --- bspwm/.config/eww/eww.scss | 2 +- bspwm/.config/eww/eww.yuck | 3 +- hyprland/.config/hypr/hyprland/env.conf | 24 +++-- hyprland/.config/hypr/hyprland/execs.conf | 3 +- hyprland/.config/hypr/hyprland/general.conf | 14 ++- hyprland/.config/hypr/hyprland/keybinds.conf | 25 ++++- hyprland/.config/hypr/hyprland/rules.conf | 19 +++- menu/.config/rofi/app.rasi | 1 - menu/.config/rofi/manga.rasi | 1 - menu/.config/rofi/menu.rasi | 1 - script/Videos/transmission-rss.conf | 3 + script/bin/wallpaper | 2 +- terminal/.config/fish/config.fish | 4 + .../wal/templates/colors-hyprland.conf | 3 + terminal/.config/wal/templates/colors.rasi | 4 +- web/.config/qutebrowser/config.py | 97 +++++++++---------- web/.config/qutebrowser/jmatrix-rules | 1 + 17 files changed, 123 insertions(+), 84 deletions(-) create mode 100644 terminal/.config/wal/templates/colors-hyprland.conf diff --git a/bspwm/.config/eww/eww.scss b/bspwm/.config/eww/eww.scss index 6f2a295..d4d8cc6 100644 --- a/bspwm/.config/eww/eww.scss +++ b/bspwm/.config/eww/eww.scss @@ -6,7 +6,7 @@ } window { - background-color: rgba($background,70%); + background-color: rgba($background,0.7); color: $foreground; font-family: IosevkaLyteTerm Nerd Font; } diff --git a/bspwm/.config/eww/eww.yuck b/bspwm/.config/eww/eww.yuck index cce3282..e947842 100644 --- a/bspwm/.config/eww/eww.yuck +++ b/bspwm/.config/eww/eww.yuck @@ -177,8 +177,9 @@ (defwindow bar-hypr :monitor 0 - :exclusive true + :exclusive false :stacking "bg" + :namespace "eww" :geometry (geometry :x "7px" :y "3px" diff --git a/hyprland/.config/hypr/hyprland/env.conf b/hyprland/.config/hypr/hyprland/env.conf index 76bb4a8..af7fd29 100644 --- a/hyprland/.config/hypr/hyprland/env.conf +++ b/hyprland/.config/hypr/hyprland/env.conf @@ -1,28 +1,26 @@ # Some default env vars. env = XCURSOR_SIZE,24 -#env = QT_QPA_PLATFORM,wayland;xcb -env = QT_QPA_PLATFORMTHEME,qt6ct -#env = QT_PLATFORM_PLUGIN,kde env = XDG_CURRENT_DESKTOP,Hyprland -env = XDG_SESSION_TYPE,wayland env = XDG_SESSION_DESKTOP,Hyprland -env = KRITA_NO_STYLE_OVERRIDE,1 - -env = GDK_BACKEND,wayland,x11 -#env = QT_QPA_PLATFORM,xcb -env = QT_QPA_PLATFORM,wayland -# env = QT_QPA_PLATFORMTHEME,qt6ct #env = QT_STYLE_OVERRIDE,kvantum +env = XDG_SESSION_TYPE,wayland +env = QT_QPA_PLATFORM,wayland;xcb +env = QT_QPA_PLATFORMTHEME,qt6ct env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 env = QT_AUTO_SCREEN_SCALE_FACTOR,1 env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 - +env = CLUTTER_BACKEND,wayland +env = GDK_BACKEND,wayland,x11 env = SDL_VIDEODRIVER,wayland env = _JAVA_AWT_WM_NONREPARENTING,1 env = WLR_NO_HARDWARE_CURSORS,1 - env = MOZ_DISABLE_RDD_SANDBOX,1 env = MOZ_ENABLE_WAYLAND,1 +env = OZONE_PLATFORM,wayland + +# vulkan +env = WLR_RENDERER,vulkan + +env = KRITA_NO_STYLE_OVERRIDE,1 env = GO111MODULE,on -env = OZONE_PLATFORM,wayland diff --git a/hyprland/.config/hypr/hyprland/execs.conf b/hyprland/.config/hypr/hyprland/execs.conf index fb5fc36..5e7ffaf 100644 --- a/hyprland/.config/hypr/hyprland/execs.conf +++ b/hyprland/.config/hypr/hyprland/execs.conf @@ -1,8 +1,9 @@ # # # Theme # # # +exec-once = ~/bin/hyprland-portals & exec-once = swaybg -m fill -i ~/.config/feh/wallpaper.png & -exec-once = wal -Rnq & +exec-once = wal -Rnq -a "70" & exec-once = hyprctl setcursor Bibata-Original-Classic 24 & # # # Plugins # diff --git a/hyprland/.config/hypr/hyprland/general.conf b/hyprland/.config/hypr/hyprland/general.conf index 76021f7..98fb27f 100644 --- a/hyprland/.config/hypr/hyprland/general.conf +++ b/hyprland/.config/hypr/hyprland/general.conf @@ -1,6 +1,8 @@ # See https://wiki.hyprland.org/Configuring/Monitors/ monitor=DP-2,1920x1080@144,0x0,1,vrr,1 +source=~/.cache/wal/colors-hyprland.conf + misc { disable_hyprland_logo = true disable_splash_rendering = true @@ -13,6 +15,7 @@ misc { mouse_move_focuses_monitor = true enable_swallow = true swallow_regex = ^(kitty)$ + no_direct_scanout = true #for fullscreen games } # For all categories, see https://wiki.hyprland.org/Configuring/Variables/ @@ -36,10 +39,10 @@ general { # See https://wiki.hyprland.org/Configuring/Variables/ for more gaps_in = 6 - gaps_out = 6 + gaps_out = 42, 6, 6, 6 # top, right, bottom, left border_size = 1 - col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg - col.inactive_border = rgba(595959aa) + col.active_border = rgba($border_focus_top) rgba($border_focus_bottom) 45deg + col.inactive_border = rgba($border_inactive) layout = dwindle resize_on_border = false @@ -97,15 +100,18 @@ dwindle { # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more pseudotile = true # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below preserve_split = true # you probably want this + force_split = 2 } binds { workspace_back_and_forth = true + allow_workspace_cycles = true } master { # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more - new_is_master = false + new_is_master = true + new_on_top = true } gestures { diff --git a/hyprland/.config/hypr/hyprland/keybinds.conf b/hyprland/.config/hypr/hyprland/keybinds.conf index 8f61f58..7267c58 100644 --- a/hyprland/.config/hypr/hyprland/keybinds.conf +++ b/hyprland/.config/hypr/hyprland/keybinds.conf @@ -7,8 +7,8 @@ bind=$mainMod,Z,killactive, bind=$mainMod + Alt, ESCAPE ,exit, bind=$mainMod,T,togglefloating, bind=$mainMod,F,fullscreen, -bind=$mainMod,SPACE, exec, rofi -show drun -fullscreen -monitor -4 --terminal kitty -theme app -drun-categories System,Utility,Network,Office,Settings,Game,Qt,Development,Graphics,GTK,AudioVideo,Audio,Video,Viewer,WebBrowser -bind=$mainMod + SHIFT, SPACE , exec, rofi -show drun -fullscreen -monitor -4 --terminal kitty -theme manga -drun-categories Manga +bind=$mainMod,SPACE, exec, rofi -show drun -window -monitor -4 --terminal kitty -theme app -drun-categories System,Utility,Network,Office,Settings,Game,Qt,Development,Graphics,GTK,AudioVideo,Audio,Video,Viewer,WebBrowser +bind=$mainMod + SHIFT, SPACE , exec, rofi -show drun -monitor -4 --terminal kitty -theme manga -drun-categories Manga bind=$mainMod + SHIFT, A , exec, ~/bin/qmenu_hud #bind=$mainMod + SHIFT, A , exec, qdbus com.github.zren.PlasmaHUD /PlasmaHUD com.github.zren.PlasmaHUD.toggleHUD bind=$mainMod, ESCAPE, exec, ~/.config/waybar/waybar.sh @@ -60,8 +60,10 @@ bind=$mainMod + SHIFT,0,movetoworkspace,10 bind=CTRL,SPACE,exec,dunstctl close bind=CTRL+SHIFT,SPACE,exec,dunstctl close-all -bind=CTRL,grave,exec,dunstctl hystory-pop +bind=CTRL,grave,exec,dunstctl history-pop bind=SUPERSHIFT,period,layoutmsg,cyclenext +#bind=CTRL,apostrophe,pass,^(org\.keepassxc\.KeePassXC)$ +bind=CTRL,apostrophe,pass,KeePassXC # Scroll through existing workspaces with mainMod + scroll bind = $mainMod, mouse_down, workspace, e+1 @@ -93,9 +95,24 @@ binde=,up,resizeactive,0 -10 binde=,down,resizeactive,0 10 # use reset to go back to the global submap -bind=,escape,submap,reset +bind=,escape,submap,reset # will reset the submap, meaning end the current one and return to the global one submap=reset +# start screenshot submap +bind = $mainMod, print, submap, screenshot + +# submap +submap = screenshot + +# fullscreen / selected area / active window +binde = , f, exec, grimblast copysave screen $HOME"/Pictures/Screenshots/Screenshot_"$(date +'%Y%m%d_%H%M%S.png'); hyprctl dispatch submap reset +binde = , s, exec, grimblast copysave area $HOME"/Pictures/Screenshots/Screenshot_"$(date +'%Y%m%d_%H%M%S.png'); hyprctl dispatch submap reset +binde = , a, exec, grimblast copysave active $HOME"/Pictures/Screenshots/Screenshot_"$(date +'%Y%m%d_%H%M%S.png'); hyprctl dispatch submap reset + +# reset screenshot submap +bind = , escape,submap,reset +submap = reset + # bind=$mainMod, F1, exec, ~/.config/hypr/gamemode.sh diff --git a/hyprland/.config/hypr/hyprland/rules.conf b/hyprland/.config/hypr/hyprland/rules.conf index da721dd..55f87a3 100644 --- a/hyprland/.config/hypr/hyprland/rules.conf +++ b/hyprland/.config/hypr/hyprland/rules.conf @@ -1,8 +1,23 @@ -layerrule = ignorezero, gtk-layer-shell +windowrule=float,title:^(Open File)(.*)$ +windowrule=float,title:^(Select a File)(.*)$ +windowrule=float,title:^(Choose wallpaper)(.*)$ +windowrule=float,title:^(Open Folder)(.*)$ +windowrule=float,title:^(Save As)(.*)$ +windowrule=float,title:^(Library)(.*)$ +windowrule = float, org.kde.polkit-kde-authentication-agent-1 + layerrule = blur, gtk-layer-shell +layerrule = ignorezero, gtk-layer-shell +layerrule = blur, notifications +layerrule = ignorezero, notifications layerrule = blur, eww layerrule = blur, laucher -layerrule = blur, notifications layerrule = ignorezero, waybar layerrule = blur, waybar +layerrule = unset, rofi layerrule = blur, rofi +layerrule = ignorezero, rofi +layerrule = xray 1, rofi +layerrule = xray 1, gtk-layer-shell +layerrule = xray 1, eww +# title: Copie — Dolphin state:float diff --git a/menu/.config/rofi/app.rasi b/menu/.config/rofi/app.rasi index 309b929..725c3f1 100644 --- a/menu/.config/rofi/app.rasi +++ b/menu/.config/rofi/app.rasi @@ -5,7 +5,6 @@ configuration { threads: 0; scroll-method: 0; disable-history: false; - fullscreen: true; hide-scrollbar: true; sidebar-mode: false; display-drun: " "; diff --git a/menu/.config/rofi/manga.rasi b/menu/.config/rofi/manga.rasi index b283d8a..d0624b9 100644 --- a/menu/.config/rofi/manga.rasi +++ b/menu/.config/rofi/manga.rasi @@ -6,7 +6,6 @@ configuration { threads: 0; scroll-method: 0; disable-history: true; - fullscreen: true; hide-scrollbar: true; sidebar-mode: false; display-drun: "龎 manga:"; diff --git a/menu/.config/rofi/menu.rasi b/menu/.config/rofi/menu.rasi index 5568d95..bd6f649 100644 --- a/menu/.config/rofi/menu.rasi +++ b/menu/.config/rofi/menu.rasi @@ -6,7 +6,6 @@ configuration { threads: 0; scroll-method: 0; disable-history: true; - fullscreen: true; hide-scrollbar: true; sidebar-mode: false; display-drun: "龎 menu:"; diff --git a/script/Videos/transmission-rss.conf b/script/Videos/transmission-rss.conf index 3a6b882..f66e951 100644 --- a/script/Videos/transmission-rss.conf +++ b/script/Videos/transmission-rss.conf @@ -508,3 +508,6 @@ feeds: - url: "https://nyaa.si/?page=rss&q=akuyaku+level+99+1080+erai&c=1_2&f=0" download_path: "/media/sakura/jojo/Videos/Akuyaku Reijou Level 99" regexp: ^((?!HEVC).)*$ + - url: "https://nyaa.si/?page=rss&q=goumon+no+jikan+erai+1080&c=1_2&f=0" + download_path: "/media/sakura/jojo/Videos/Hime-sama Goumon no Jikan Desu" + regexp: ^((?!HEVC).)*$ diff --git a/script/bin/wallpaper b/script/bin/wallpaper index 836bc06..a0e082d 100755 --- a/script/bin/wallpaper +++ b/script/bin/wallpaper @@ -2,6 +2,6 @@ WALLPAPER="$1" -wal -i "$WALLPAPER" -o "$HOME/bin/bspwmrc" -q +wal -i "$WALLPAPER" -o "$HOME/bin/bspwmrc" -a "70" -q # "$HOME/bin/rounded_borders.sh" "$WALLPAPER" diff --git a/terminal/.config/fish/config.fish b/terminal/.config/fish/config.fish index 4606bf2..15b62f7 100644 --- a/terminal/.config/fish/config.fish +++ b/terminal/.config/fish/config.fish @@ -3,6 +3,10 @@ # Activate vi mode fish_vi_key_bindings set fish_greeting +set -U pure_enable_single_line_prompt false +set -U pure_enable_container_detection false +set -U pure_symbol_container_prefix "🐋" # suggestion: '🐋' or '📦' +set -U pure_symbol_ssh_prefix "🌐" # suggestion: 'ssh:/' or '🔗🔐🔒🌐' # Accelerate key bindings set -U SXHKD_SHELL sh diff --git a/terminal/.config/wal/templates/colors-hyprland.conf b/terminal/.config/wal/templates/colors-hyprland.conf new file mode 100644 index 0000000..d0c80aa --- /dev/null +++ b/terminal/.config/wal/templates/colors-hyprland.conf @@ -0,0 +1,3 @@ +$border_focus_top = {color4.strip}ee +$border_focus_bottom = {color5.strip}ee +$border_inactive = {color0.strip}aa diff --git a/terminal/.config/wal/templates/colors.rasi b/terminal/.config/wal/templates/colors.rasi index a662a8d..2fd7ca8 100644 --- a/terminal/.config/wal/templates/colors.rasi +++ b/terminal/.config/wal/templates/colors.rasi @@ -1,8 +1,8 @@ * {{ background: #00000000; - background-color: {background}80; + background-color: {background.rgba}; background-entry: #00000033; - background-alt: {color5}80; + background-alt: {color5.rgba}; foreground: #f2f2f2EE; foreground-selected: #ffffffFF; urgent: #E91E6366; diff --git a/web/.config/qutebrowser/config.py b/web/.config/qutebrowser/config.py index a140a75..295c938 100644 --- a/web/.config/qutebrowser/config.py +++ b/web/.config/qutebrowser/config.py @@ -10,22 +10,15 @@ # qute://help/configuring.html # qute://help/settings.html -import sys, os, re, subprocess +import sys, os, re, subprocess, yaml sys.path.append(os.path.join(sys.path[0], 'jmatrix')) config.source("jmatrix/jmatrix/integrations/qutebrowser.py") -def read_xresources(prefix): - props = {} - x = subprocess.run(['xrdb', '-query'], stdout=subprocess.PIPE) - lines = x.stdout.decode().split('\n') - for line in filter(lambda l : l.startswith(prefix), lines): - prop, _, value = line.partition(':\t') - props[prop] = value - return props -xresources = read_xresources('*') +with open(os.path.join(os.path.expanduser("~") ,'.cache/wal/colors.yml'), 'r') as file: + wal = yaml.safe_load(file) -def color(name, alpha = 'C2'): - return re.sub('#', '#' + alpha , xresources[name]) +def color(color, alpha = 'C2'): + return re.sub('#', '#' + alpha , color) # Change the argument to True to still load settings configured via autoconfig.yml config.load_autoconfig(False) @@ -541,23 +534,23 @@ c.colors.completion.odd.bg = '#4A4A4A' # Background color of the completion widget for even rows. # Type: QssColor -c.colors.completion.even.bg = color('*background') +c.colors.completion.even.bg = color(wal['special']['background']) # Foreground color of completion widget category headers. # Type: QtColor -c.colors.completion.category.fg = color('*color5', alpha='FF') +c.colors.completion.category.fg = color(wal['colors']['color5'], alpha='FF') # Background color of the completion widget category headers. # Type: QssColor -c.colors.completion.category.bg = color('*background') +c.colors.completion.category.bg = color(wal['special']['background']) # Top border color of the completion widget category headers. # Type: QssColor -c.colors.completion.category.border.top = color('*background') +c.colors.completion.category.border.top = color(wal['special']['background']) # Bottom border color of the completion widget category headers. # Type: QssColor -c.colors.completion.category.border.bottom = color('*background') +c.colors.completion.category.border.bottom = color(wal['special']['background']) # Foreground color of the selected completion item. # Type: QtColor @@ -565,15 +558,15 @@ c.colors.completion.item.selected.fg = '#303030' # Background color of the selected completion item. # Type: QssColor -c.colors.completion.item.selected.bg = color('*color5', alpha='FF') +c.colors.completion.item.selected.bg = color(wal['colors']['color5'], alpha='FF') # Top border color of the selected completion item. # Type: QssColor -c.colors.completion.item.selected.border.top = color('*color5', alpha='FF') +c.colors.completion.item.selected.border.top = color(wal['colors']['color5'], alpha='FF') # Bottom border color of the selected completion item. # Type: QssColor -c.colors.completion.item.selected.border.bottom = color('*color5', alpha='FF') +c.colors.completion.item.selected.border.bottom = color(wal['colors']['color5'], alpha='FF') # Foreground color of the matched text in the selected completion item. # Type: QtColor @@ -589,12 +582,12 @@ c.colors.completion.scrollbar.fg = '#EEFFFF' # Color of the scrollbar in the completion view. # Type: QssColor -c.colors.completion.scrollbar.bg = color('*background') +c.colors.completion.scrollbar.bg = color(wal['special']['background']) # Background color of the context menu. If set to null, the Qt default # is used. # Type: QssColor -c.colors.contextmenu.menu.bg = color('*background') +c.colors.contextmenu.menu.bg = color(wal['special']['background']) # Foreground color of the context menu. If set to null, the Qt default # is used. @@ -604,7 +597,7 @@ c.colors.contextmenu.menu.fg = '#EEFFFF' # Background color of the context menu's selected item. If set to null, # the Qt default is used. # Type: QssColor -c.colors.contextmenu.selected.bg = color('*color5', alpha='FF') +c.colors.contextmenu.selected.bg = color(wal['colors']['color5'], alpha='FF') # Foreground color of the context menu's selected item. If set to null, # the Qt default is used. @@ -613,11 +606,11 @@ c.colors.contextmenu.selected.fg = '#303030' # Background color for the download bar. # Type: QssColor -c.colors.downloads.bar.bg = color('*background') +c.colors.downloads.bar.bg = color(wal['special']['background']) # Color gradient start for download text. # Type: QtColor -c.colors.downloads.start.fg = color('*background') +c.colors.downloads.start.fg = color(wal['special']['background']) # Color gradient start for download backgrounds. # Type: QtColor @@ -625,7 +618,7 @@ c.colors.downloads.start.bg = '#82AAFF' # Color gradient end for download text. # Type: QtColor -c.colors.downloads.stop.fg = color('*background') +c.colors.downloads.stop.fg = color(wal['special']['background']) # Color gradient stop for download backgrounds. # Type: QtColor @@ -637,12 +630,12 @@ c.colors.downloads.error.fg = '#F07178' # Font color for hints. # Type: QssColor -c.colors.hints.fg = color('*background') +c.colors.hints.fg = color(wal['special']['background']) # Background color for hints. Note that you can use a `rgba(...)` value # for transparency. # Type: QssColor -c.colors.hints.bg = color('*color5', alpha='FF') +c.colors.hints.bg = color(wal['colors']['color5'], alpha='FF') # Font color for the matched part of hints. # Type: QtColor @@ -658,11 +651,11 @@ c.colors.keyhint.suffix.fg = '#EEFFFF' # Background color of the keyhint widget. # Type: QssColor -c.colors.keyhint.bg = color('*background') +c.colors.keyhint.bg = color(wal['special']['background']) # Foreground color of an error message. # Type: QssColor -c.colors.messages.error.fg = color('*background') +c.colors.messages.error.fg = color(wal['special']['background']) # Background color of an error message. # Type: QssColor @@ -674,7 +667,7 @@ c.colors.messages.error.border = '#F07178' # Foreground color of a warning message. # Type: QssColor -c.colors.messages.warning.fg = color('*background') +c.colors.messages.warning.fg = color(wal['special']['background']) # Background color of a warning message. # Type: QssColor @@ -690,11 +683,11 @@ c.colors.messages.info.fg = '#EEFFFF' # Background color of an info message. # Type: QssColor -c.colors.messages.info.bg = color('*background') +c.colors.messages.info.bg = color(wal['special']['background']) # Border color of an info message. # Type: QssColor -c.colors.messages.info.border = color('*background') +c.colors.messages.info.border = color(wal['special']['background']) # Foreground color for prompts. # Type: QssColor @@ -702,15 +695,15 @@ c.colors.prompts.fg = '#EEFFFF' # Border used around UI elements in prompts. # Type: String -c.colors.prompts.border = color('*background') +c.colors.prompts.border = color(wal['special']['background']) # Background color for prompts. # Type: QssColor -c.colors.prompts.bg = color('*background') +c.colors.prompts.bg = color(wal['special']['background']) # Background color for the selected item in filename prompts. # Type: QssColor -c.colors.prompts.selected.bg = color('*color5', alpha='FF') +c.colors.prompts.selected.bg = color(wal['colors']['color5'], alpha='FF') # Foreground color of the statusbar. # Type: QssColor @@ -718,11 +711,11 @@ c.colors.statusbar.normal.fg = '#C3E88D' # Background color of the statusbar. # Type: QssColor -c.colors.statusbar.normal.bg = color('*background') +c.colors.statusbar.normal.bg = color(wal['special']['background']) # Foreground color of the statusbar in insert mode. # Type: QssColor -c.colors.statusbar.insert.fg = color('*background') +c.colors.statusbar.insert.fg = color(wal['special']['background']) # Background color of the statusbar in insert mode. # Type: QssColor @@ -730,7 +723,7 @@ c.colors.statusbar.insert.bg = '#82AAFF' # Foreground color of the statusbar in passthrough mode. # Type: QssColor -c.colors.statusbar.passthrough.fg = color('*background') +c.colors.statusbar.passthrough.fg = color(wal['special']['background']) # Background color of the statusbar in passthrough mode. # Type: QssColor @@ -738,7 +731,7 @@ c.colors.statusbar.passthrough.bg = '#89DDFF' # Foreground color of the statusbar in private browsing mode. # Type: QssColor -c.colors.statusbar.private.fg = color('*background') +c.colors.statusbar.private.fg = color(wal['special']['background']) # Background color of the statusbar in private browsing mode. # Type: QssColor @@ -750,7 +743,7 @@ c.colors.statusbar.command.fg = '#EEFFFF' # Background color of the statusbar in command mode. # Type: QssColor -c.colors.statusbar.command.bg = color('*background') +c.colors.statusbar.command.bg = color(wal['special']['background']) # Foreground color of the statusbar in private browsing + command mode. # Type: QssColor @@ -758,11 +751,11 @@ c.colors.statusbar.command.private.fg = '#EEFFFF' # Background color of the statusbar in private browsing + command mode. # Type: QssColor -c.colors.statusbar.command.private.bg = color('*background') +c.colors.statusbar.command.private.bg = color(wal['special']['background']) # Foreground color of the statusbar in caret mode. # Type: QssColor -c.colors.statusbar.caret.fg = color('*background') +c.colors.statusbar.caret.fg = color(wal['special']['background']) # Background color of the statusbar in caret mode. # Type: QssColor @@ -770,7 +763,7 @@ c.colors.statusbar.caret.bg = '#C792EA' # Foreground color of the statusbar in caret mode with a selection. # Type: QssColor -c.colors.statusbar.caret.selection.fg = color('*background') +c.colors.statusbar.caret.selection.fg = color(wal['special']['background']) # Background color of the statusbar in caret mode with a selection. # Type: QssColor @@ -808,7 +801,7 @@ c.colors.statusbar.url.warn.fg = '#C792EA' # Background color of the tab bar. # Type: QssColor -#c.colors.tabs.bar.bg = color('*background') +#c.colors.tabs.bar.bg = color(wal['special']['background']) c.colors.tabs.bar.bg = '#00000000' # Color gradient start for the tab indicator. @@ -829,7 +822,7 @@ c.colors.tabs.odd.fg = '#EEFFFF' # Background color of unselected odd tabs. # Type: QtColor -c.colors.tabs.odd.bg = color('*background') +c.colors.tabs.odd.bg = color(wal['special']['background']) # Foreground color of unselected even tabs. # Type: QtColor @@ -837,23 +830,23 @@ c.colors.tabs.even.fg = '#EEFFFF' # Background color of unselected even tabs. # Type: QtColor -c.colors.tabs.even.bg = color('*background') +c.colors.tabs.even.bg = color(wal['special']['background']) # Foreground color of selected odd tabs. # Type: QtColor -c.colors.tabs.selected.odd.fg = color('*background', alpha='FF') +c.colors.tabs.selected.odd.fg = color(wal['special']['background'], alpha='FF') # Background color of selected odd tabs. # Type: QtColor -c.colors.tabs.selected.odd.bg = color('*color5', alpha='FF') +c.colors.tabs.selected.odd.bg = color(wal['colors']['color5'], alpha='FF') # Foreground color of selected even tabs. # Type: QtColor -c.colors.tabs.selected.even.fg = color('*background', alpha='FF') +c.colors.tabs.selected.even.fg = color(wal['special']['background'], alpha='FF') # Background color of selected even tabs. # Type: QtColor -c.colors.tabs.selected.even.bg = color('*color5', alpha='FF') +c.colors.tabs.selected.even.bg = color(wal['colors']['color5'], alpha='FF') # Foreground color of pinned unselected odd tabs. # Type: QtColor @@ -881,7 +874,7 @@ c.colors.tabs.pinned.selected.odd.bg = '#EEFFFF' # Foreground color of pinned selected even tabs. # Type: QtColor -c.colors.tabs.pinned.selected.even.fg = color('*background') +c.colors.tabs.pinned.selected.even.fg = color(wal['special']['background']) # Background color of pinned selected even tabs. # Type: QtColor diff --git a/web/.config/qutebrowser/jmatrix-rules b/web/.config/qutebrowser/jmatrix-rules index 8697077..6dbbf9d 100644 --- a/web/.config/qutebrowser/jmatrix-rules +++ b/web/.config/qutebrowser/jmatrix-rules @@ -187,6 +187,7 @@ mittsies.bandcamp.com t4.bcbits.com media allow radicaldreamland.bandcamp.com t4.bcbits.com media allow frontoffice.byemisys.com cdnjs.cloudflare.com script allow github.com github.githubassets.com script allow +github.com private-user-images.githubusercontent.com media allow www.rome2rio.com static.r2r.io script allow www.rome2rio.com static.r2r.io other allow www.rome2rio.com cdnjs.cloudflare.com script allow