From 10847eaaca99cc4aeefa4330286537eaa5816858 Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Thu, 22 Dec 2022 16:06:24 -0300 Subject: [PATCH] home/qutebrowser: remove for now --- .../desktop/common/wayland-wm/default.nix | 1 - .../desktop/common/wayland-wm/qutebrowser.nix | 180 ------------------ .../desktop/common/wayland-wm/waybar.nix | 1 + .../features/desktop/hyprland/config.nix | 2 +- home/misterio/features/trusted/neomutt.nix | 8 +- 5 files changed, 6 insertions(+), 186 deletions(-) delete mode 100644 home/misterio/features/desktop/common/wayland-wm/qutebrowser.nix diff --git a/home/misterio/features/desktop/common/wayland-wm/default.nix b/home/misterio/features/desktop/common/wayland-wm/default.nix index fbf9101a..81a2faf2 100644 --- a/home/misterio/features/desktop/common/wayland-wm/default.nix +++ b/home/misterio/features/desktop/common/wayland-wm/default.nix @@ -4,7 +4,6 @@ ./gammastep.nix ./kitty.nix ./mako.nix - ./qutebrowser.nix ./swayidle.nix ./swaylock.nix ./waybar.nix diff --git a/home/misterio/features/desktop/common/wayland-wm/qutebrowser.nix b/home/misterio/features/desktop/common/wayland-wm/qutebrowser.nix deleted file mode 100644 index d6857db7..00000000 --- a/home/misterio/features/desktop/common/wayland-wm/qutebrowser.nix +++ /dev/null @@ -1,180 +0,0 @@ -{ config, lib, ... }: - -let inherit (config.colorscheme) colors kind; -in -{ - home = { - sessionVariables = { - BROWSER = "qutebrowser"; - }; - persistence = { - "/persist/home/misterio".directories = [ - ".config/qutebrowser/bookmarks" - ".config/qutebrowser/greasemonkey" - ".local/share/qutebrowser" - ]; - }; - }; - - - - xdg.mimeApps.defaultApplications = { - "text/html" = [ "org.qutebrowser.qutebrowser.desktop" ]; - "text/xml" = [ "org.qutebrowser.qutebrowser.desktop" ]; - "x-scheme-handler/http" = [ "org.qutebrowser.qutebrowser.desktop" ]; - "x-scheme-handler/https" = [ "org.qutebrowser.qutebrowser.desktop" ]; - "x-scheme-handler/qute" = [ "org.qutebrowser.qutebrowser.desktop" ]; - }; - - - programs.qutebrowser = { - enable = true; - loadAutoconfig = true; - settings = { - tabs = { - show = "multiple"; - position = "left"; - }; - fonts = { - default_family = config.fontProfiles.regular.family; - default_size = "12pt"; - }; - colors = { - webpage = { - preferred_color_scheme = kind; - bg = "#ffffff"; - }; - completion = { - fg = "#${colors.base05}"; - match.fg = "#${colors.base09}"; - even.bg = "#${colors.base00}"; - odd.bg = "#${colors.base00}"; - scrollbar = { - bg = "#${colors.base00}"; - fg = "#${colors.base05}"; - }; - category = { - bg = "#${colors.base00}"; - fg = "#${colors.base0D}"; - border = { - bottom = "#${colors.base00}"; - top = "#${colors.base00}"; - }; - }; - item.selected = { - bg = "#${colors.base02}"; - fg = "#${colors.base05}"; - match.fg = "#${colors.base05}"; - border = { - bottom = "#${colors.base02}"; - top = "#${colors.base02}"; - }; - }; - }; - contextmenu = { - disabled = { - bg = "#${colors.base01}"; - fg = "#${colors.base04}"; - }; - menu = { - bg = "#${colors.base00}"; - fg = "#${colors.base05}"; - }; - selected = { - bg = "#${colors.base02}"; - fg = "#${colors.base05}"; - }; - }; - downloads = { - bar.bg = "#${colors.base00}"; - error.fg = "#${colors.base08}"; - start = { - bg = "#${colors.base0D}"; - fg = "#${colors.base00}"; - }; - stop = { - bg = "#${colors.base0C}"; - fg = "#${colors.base00}"; - }; - }; - hints = { - bg = "#${colors.base0A}"; - fg = "#${colors.base00}"; - match.fg = "#${colors.base05}"; - }; - keyhint = { - bg = "#${colors.base00}"; - fg = "#${colors.base05}"; - suffix.fg = "#${colors.base05}"; - }; - messages = { - error.bg = "#${colors.base08}"; - error.border = "#${colors.base08}"; - error.fg = "#${colors.base00}"; - info.bg = "#${colors.base00}"; - info.border = "#${colors.base00}"; - info.fg = "#${colors.base05}"; - warning.bg = "#${colors.base0E}"; - warning.border = "#${colors.base0E}"; - warning.fg = "#${colors.base00}"; - }; - prompts = { - bg = "#${colors.base00}"; - fg = "#${colors.base05}"; - border = "#${colors.base00}"; - selected.bg = "#${colors.base02}"; - }; - statusbar = { - caret.bg = "#${colors.base00}"; - caret.fg = "#${colors.base0D}"; - caret.selection.bg = "#${colors.base00}"; - caret.selection.fg = "#${colors.base0D}"; - command.bg = "#${colors.base01}"; - command.fg = "#${colors.base04}"; - command.private.bg = "#${colors.base01}"; - command.private.fg = "#${colors.base0E}"; - insert.bg = "#${colors.base00}"; - insert.fg = "#${colors.base0C}"; - normal.bg = "#${colors.base00}"; - normal.fg = "#${colors.base05}"; - passthrough.bg = "#${colors.base00}"; - passthrough.fg = "#${colors.base0A}"; - private.bg = "#${colors.base00}"; - private.fg = "#${colors.base0E}"; - progress.bg = "#${colors.base0D}"; - url.error.fg = "#${colors.base08}"; - url.fg = "#${colors.base05}"; - url.hover.fg = "#${colors.base09}"; - url.success.http.fg = "#${colors.base0B}"; - url.success.https.fg = "#${colors.base0B}"; - url.warn.fg = "#${colors.base0E}"; - }; - tabs = { - bar.bg = "#${colors.base00}"; - even.bg = "#${colors.base00}"; - even.fg = "#${colors.base05}"; - indicator.error = "#${colors.base08}"; - indicator.start = "#${colors.base0D}"; - indicator.stop = "#${colors.base0C}"; - odd.bg = "#${colors.base00}"; - odd.fg = "#${colors.base05}"; - pinned.even.bg = "#${colors.base0B}"; - pinned.even.fg = "#${colors.base00}"; - pinned.odd.bg = "#${colors.base0B}"; - pinned.odd.fg = "#${colors.base00}"; - pinned.selected.even.bg = "#${colors.base02}"; - pinned.selected.even.fg = "#${colors.base05}"; - pinned.selected.odd.bg = "#${colors.base02}"; - pinned.selected.odd.fg = "#${colors.base05}"; - selected.even.bg = "#${colors.base02}"; - selected.even.fg = "#${colors.base05}"; - selected.odd.bg = "#${colors.base02}"; - selected.odd.fg = "#${colors.base05}"; - }; - }; - }; - extraConfig = '' - c.tabs.padding = {"bottom": 10, "left": 10, "right": 10, "top": 10} - ''; - }; -} diff --git a/home/misterio/features/desktop/common/wayland-wm/waybar.nix b/home/misterio/features/desktop/common/wayland-wm/waybar.nix index 136fc0f1..ff08c0a7 100644 --- a/home/misterio/features/desktop/common/wayland-wm/waybar.nix +++ b/home/misterio/features/desktop/common/wayland-wm/waybar.nix @@ -305,6 +305,7 @@ in "spotify" = "阮"; "ncspot" = "阮"; "qutebrowser" = "爵"; + "firefox" = ""; "discord" = "ﭮ"; "sublimemusic" = ""; }; diff --git a/home/misterio/features/desktop/hyprland/config.nix b/home/misterio/features/desktop/hyprland/config.nix index 44d16dba..1d5752cb 100644 --- a/home/misterio/features/desktop/hyprland/config.nix +++ b/home/misterio/features/desktop/hyprland/config.nix @@ -79,7 +79,7 @@ bind=SUPER,w,exec,makoctl dismiss bind=SUPER,v,exec,$TERMINAL $SHELL -ic nvim bind=SUPER,m,exec,$TERMINAL $SHELL -ic neomutt - bind=SUPER,b,exec,qutebrowser + bind=SUPER,b,exec,$BROWSER bind=SUPER,x,exec,wofi -S drun -x 10 -y 10 -W 25% -H 60% bind=SUPER,d,exec,wofi -S run diff --git a/home/misterio/features/trusted/neomutt.nix b/home/misterio/features/trusted/neomutt.nix index d6909769..6a9fab22 100644 --- a/home/misterio/features/trusted/neomutt.nix +++ b/home/misterio/features/trusted/neomutt.nix @@ -51,8 +51,8 @@ ]; macros = let - qutebrowserpipe = - "cat /dev/stdin > /tmp/muttmail.html && ${pkgs.qutebrowser}/bin/qutebrowser /tmp/muttmail.html"; + browserpipe = + "cat /dev/stdin > /tmp/muttmail.html && xdg-open /tmp/muttmail.html"; in [ { @@ -72,7 +72,7 @@ map = [ "index" "pager" ]; } { - action = "${qutebrowserpipe}"; + action = "${browserpipe}"; key = "V"; map = [ "attach" ]; } @@ -83,7 +83,7 @@ } { action = - "html${qutebrowserpipe}"; + "html${browserpipe}"; key = "V"; map = [ "index" "pager" ]; }