diff --git a/.config/qutebrowser/config.py b/.config/qutebrowser/config.py index afaff8c..e9ef0af 100644 --- a/.config/qutebrowser/config.py +++ b/.config/qutebrowser/config.py @@ -766,6 +766,7 @@ c.colors.webpage.darkmode.contrast = 0.5 ## selective inversion of everything": Combines the two variants above. ## Type: Bool c.colors.webpage.darkmode.enabled = False +config.set('colors.webpage.darkmode.enabled', True, '*://qutebrowser.org/*') ## Render all colors as grayscale. This only has an effect when ## `colors.webpage.darkmode.algorithm` is set to `lightness-hsl` or @@ -1060,6 +1061,7 @@ c.content.headers.do_not_track = True ## from hostblocking. ## Type: List of UrlPattern c.content.blocking.whitelist = ['https://staff.tfcconnection.org'] +c.content.blocking.method = 'both' ## Enable hyperlink auditing (``). ## Type: Bool @@ -2297,12 +2299,12 @@ config.bind("J", "tab-prev") # config.bind('gu', 'navigate up') # config.bind('h', 'scroll left') # config.bind('i', 'enter-mode insert') -# config.bind('j', 'scroll down') -# config.bind('k', 'scroll up') +config.bind('j', 'cmd-repeat 2 scroll down') +config.bind('k', 'cmd-repeat 2 scroll up') # config.bind('l', 'scroll right') # config.bind('m', 'quickmark-save') # config.bind('n', 'search-next') -config.bind("o", "set-cmd-text -s :open") +config.bind("o", "cmd-set-text -s :open") # config.bind('pP', 'open -- {primary}') # config.bind('pp', 'open -- {clipboard}') # config.bind('q', 'record-macro') @@ -2486,7 +2488,7 @@ config.bind('', 'completion-item-focus next', mode='command') # config.bind('y', 'prompt-accept yes', mode='yesno') ## Bindings for MPV and YTDL -config.bind("v", 'hint links spawn --detach mpv --profile=fast --force-window yes "{hint-url}"') +config.bind("v", 'hint links spawn --detach empv "{hint-url}"') config.bind("gv", "spawn --detach mpv --profile=fast --force-window yes --ytdl=bestvideo[height<=?720][fps<=?30]+bestaudio/best \'{url}\'") config.bind("gc", 'spawn org-capture "{url}"') config.bind( @@ -2503,8 +2505,11 @@ config.bind("gt", 'hint links spawn --detach transadd "{hint-url}"') config.bind("gD", 'hint links spawn alacritty -e aria2c -o ~/Downloads/') +config.bind('', 'zoom-in') +config.bind('', 'zoom-out') +config.bind('', 'zoom') config.bind('d', 'tab-close') -config.bind('b', 'set-cmd-text -s :tab-select ') +config.bind('b', 'cmd-set-text -s :tab-select ') config.bind('pt', 'tab-pin') config.bind('tm', 'tab-move') config.bind('st', 'config-cycle tabs.show always switching') diff --git a/home/home.nix b/home/home.nix index 4f895f8..a76ce20 100644 --- a/home/home.nix +++ b/home/home.nix @@ -87,8 +87,9 @@ in "audio/opus" = "mpv-slow.desktop"; "audio/x-opus" = "mpv-slow.desktop"; "audio/x-opus+ogg" = "mpv-slow.desktop"; - "x-scheme-handler/http" = "firefox.desktop"; - "x-scheme-handler/https" = "firefox.desktop"; + "x-scheme-handler/http" = "qutebrowser.desktop"; + "x-scheme-handler/https" = "qutebrowser.desktop"; + "text/html" = "qutebrowser.desktop"; }; defaultApplications = { "video/mp4" = "mpv.desktop"; @@ -116,8 +117,9 @@ in "audio/flac" = "mpv-slow.desktop"; "audio/wav" = "mpv-slow.desktop"; "audio/opus" = "mpv-slow.desktop"; - "x-scheme-handler/http" = "firefox.desktop"; - "x-scheme-handler/https" = "firefox.desktop"; + "x-scheme-handler/http" = "qutebrowser.desktop"; + "x-scheme-handler/https" = "qutebrowser.desktop"; + "text/html" = "qutebrowser.desktop"; }; }; @@ -1058,8 +1060,68 @@ end }; }; - home.file.".config/dunst" = { - source = ../.config/dunst; + # home.file.".config/dunst" = { + # source = ../.config/dunst; + # }; + + services.dunst = { + enable = true; + iconTheme = { + package = pkgs.papirus-icon-theme; + name = "Papirus-Dark"; + size = "16x16"; + }; + settings = { + global = { + monitor = 2; + follow = "none"; + width = "(0, 300)"; + height = "(0, 500)"; + offset = "20x50"; + origin = if laptop then "top-right" else "bottom-right"; + notification_limit = 0; + progress_bar = true; + progress_bar_height = 10; + progress_bar_frame_width = 1; + progress_bar_min_width = 150; + progress_bar_max_width = 300; + transparency = 10; + separator_height = 2; + padding = 10; + horizontal_padding = 8; + text_icon_padding = 8; + frame_width = 0; + frame_color = "#aaaaaa"; + gap_size = 8; + separator_color = "frame"; + sort = "yes"; + font = "VictorMono Nerd Font 10"; + markup = "full"; + format = "%s\n%b"; + alignment = "center"; + vertical_alignment = "center"; + corner_radius = 18; + dmenu = "${pkgs.rofi}/bin/rofi -dmenu -p dunst:"; + }; + urgency_low = { + background = "#282a36"; + foreground = "#57c7ff"; + timeout = 10; + }; + + urgency_normal = { + background = "#282a36"; + foreground = "#5af78e"; + timeout = 10; + }; + + urgency_critical = { + background = "#282a36"; + foreground = "#ff5c57"; + frame_color = "#ff0000"; + timeout = 0; + }; + }; }; diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index d66d37a..c46ba52 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -246,7 +246,7 @@ in "SUPER,E,exec,/home/chris/bin/emacslof" "SUPER,d,exec,emacsclient -c -e '(dired-jump)'" "SUPER,v,exec,cliphist list | rofi -p '󱃔 ' -dmenu -theme ~/.config/rofi/launchers-git/laptop-rbw-wayland.rasi | cliphist decode | wl-copy" - "SUPER,B,exec,/home/chris/bin/fflof" + "SUPER,B,exec,/home/chris/bin/qblof" "SUPER,A,exec,alacritty --class pulsemixer -e pulsemixer" "SUPERCTRL,i,exec,alacritty --class btop -e btop" ",Print,exec,screenshot" @@ -345,7 +345,7 @@ in "swww-daemon --format xrgb" # "eww open ${if laptop then "bar0" else "bar1"}" # "dunst" - "ags" + "waybar" "rbw-agent" "hyprctl dispatch --batch 'splitratio 1; splitration -0.35'" "dbus-update-activation-environment --systemd --all" diff --git a/scripts/qblof b/scripts/qblof index 395b93b..4309b04 100755 --- a/scripts/qblof +++ b/scripts/qblof @@ -1,39 +1,10 @@ #!/bin/sh # Check to see if qb is running -if [ $(pgrep -c qutebrowser) -gt 0 ]; then +if [ $(pgrep -c -f '.qutebrowser-wrapped') -gt 0 ]; then echo "qb running" - - if [ $XDG_SESSION_TYPE = "x11" ]; then - #X11 - echo "X11" - qbrg=$(wmctrl -lx | rg qutebrowser | awk '{print $1}') - # echo $emacsrg - - if [ -z $qbrg ]; then - exec env QT_QPA_PLATFORMTHEME="" qutebrowser - exit - else - exec wmctrl -ia $qbrg - exit - fi - else - if [ $KDE_FULL_SESSION = "true" ]; then - exec /home/chris/bin/ww -f org.qutebrowser.qutebrowser -c qutebrowser - exit - else - echo "other wayland" - # WAYLAND - qbrg=$(wlrctl window list | rg qutebrowser) - - qbwin=$(echo $qbrg | sed 's/\(.*r\)\:.*/\1/') - # echo $ffwin - - exec hyprctl dispatch focuswindow qutebrowser - exit - fi - fi + exec hyprctl dispatch focuswindow qutebrowser else - exec env QT_QPA_PLATFORMTHEME="" qutebrowser + qutebrowser fi diff --git a/scripts/voldown b/scripts/voldown index 88f44a9..f478b4d 100755 --- a/scripts/voldown +++ b/scripts/voldown @@ -1,16 +1,8 @@ #!/bin/sh -# killall volup -# killall voldown dunstctl close pamixer --allow-boost -d 5 pw-play /run/current-system/sw/share/sounds/freedesktop/stereo/audio-volume-change.oga & volume=$(pulsemixer --get-volume | awk '{print $1}') echo $volume > /tmp/vol -notify-send $volume - -# eww open volume & - -# sleep 3 - -# eww close volume +dunstify -i audio-volume-low $volume diff --git a/scripts/volup b/scripts/volup index 2724d05..7dcb3f9 100755 --- a/scripts/volup +++ b/scripts/volup @@ -1,16 +1,8 @@ #!/bin/sh -# killall volup -# killall voldown dunstctl close pamixer --allow-boost -i 5 pw-play /run/current-system/sw/share/sounds/freedesktop/stereo/audio-volume-change.oga & volume=$(pulsemixer --get-volume | awk '{print $1}') echo $volume > /tmp/vol -notify-send $volume - -# eww open volume & - -# sleep 3 - -# eww close volume +dunstify -i audio-volume-high $volume