diff options
| -rw-r--r-- | modules/communication/neomutt/macros.nix | 4 | ||||
| -rw-r--r-- | modules/communication/neomutt/neomutt.nix | 2 | ||||
| -rw-r--r-- | modules/desktop/waybar/lib.nix | 4 | ||||
| -rw-r--r-- | modules/desktop/waybar/module/default.nix | 2 | ||||
| -rw-r--r-- | modules/desktop/waybar/module/workspaces.nix | 2 | ||||
| -rw-r--r-- | modules/web/chawan/default.nix | 3 |
6 files changed, 10 insertions, 7 deletions
diff --git a/modules/communication/neomutt/macros.nix b/modules/communication/neomutt/macros.nix index d8b6f55..3fdc769 100644 --- a/modules/communication/neomutt/macros.nix +++ b/modules/communication/neomutt/macros.nix @@ -28,14 +28,14 @@ # for "open this in a browser-like view". map = [ "pager" ]; key = "\\Cb"; - action = "<enter-command>set my_pipe_decode=$pipe_decode pipe_decode=yes<enter><pipe-message>${lib.getExe config.web.chawan.package} -T text/html<enter><enter-command>set pipe_decode=$my_pipe_decode<enter>"; + action = "<enter-command>set my_pipe_decode=$pipe_decode pipe_decode=yes<enter><pipe-message>${lib.getExe config.web.chawan.package} -o \"title='neomutt'\"<enter><enter-command>set pipe_decode=$my_pipe_decode<enter>"; } { # Ctrl-B on a specific attachment (not just the top-level # message): pipe-entry sends the selected attachment instead. map = [ "attach" ]; key = "\\Cb"; - action = "<pipe-entry>${lib.getExe config.web.chawan.package} -cols 100 -T text/html<enter>"; + action = "<pipe-entry>${lib.getExe config.web.chawan.package} -o \"title='neomutt'\" <enter>"; } { # gF: clear the current limit/filter and show every message again, diff --git a/modules/communication/neomutt/neomutt.nix b/modules/communication/neomutt/neomutt.nix index 623c3dd..223ce5b 100644 --- a/modules/communication/neomutt/neomutt.nix +++ b/modules/communication/neomutt/neomutt.nix @@ -18,7 +18,7 @@ "x-scheme-handler/mailto" = "neomutt.desktop"; }; xdg.configFile."neomutt/mailcap".text = '' - text/html; ${lib.getExe config.web.chawan.package} '%s'; nametemplate=%s.html + text/html; ${lib.getExe config.web.chawan.package} -o "title='neomutt'" '%s'; nametemplate=%s.html image/*; xdg-open '%s' & application/pdf; xdg-open '%s'; nametemplate=%s.pdf video/*; xdg-open '%s' & diff --git a/modules/desktop/waybar/lib.nix b/modules/desktop/waybar/lib.nix index c4ccf06..a195e74 100644 --- a/modules/desktop/waybar/lib.nix +++ b/modules/desktop/waybar/lib.nix @@ -1,7 +1,9 @@ -{ ... }: +{ config, ... }: +with config.scheme.withHashtag; let mkIcon = color: icon: "<span foreground='${color}' font_size='120%'>${icon}</span>"; icons = { + "Default" = mkIcon base07 ""; "Chromium" = mkIcon "#4285F4" ""; "Kitty" = mkIcon "#F5A97F" ""; "VLC" = mkIcon "#FF8800" ""; diff --git a/modules/desktop/waybar/module/default.nix b/modules/desktop/waybar/module/default.nix index 133f597..77d97cb 100644 --- a/modules/desktop/waybar/module/default.nix +++ b/modules/desktop/waybar/module/default.nix @@ -3,7 +3,7 @@ ... }@input: let - inherit (import ../lib.nix { inherit lib; }) mkIcon icons; + inherit (import ../lib.nix input) mkIcon icons; args = input // { inherit mkIcon icons; diff --git a/modules/desktop/waybar/module/workspaces.nix b/modules/desktop/waybar/module/workspaces.nix index a47ee5e..cb64517 100644 --- a/modules/desktop/waybar/module/workspaces.nix +++ b/modules/desktop/waybar/module/workspaces.nix @@ -20,7 +20,7 @@ 10 ]; }; - window-rewrite-default = ""; + window-rewrite-default = icons."Default"; window-rewrite = { "class<chromium-browser>" = lib.mkIf config.web.chromium.enable icons."Chromium"; "class<kitty>" = lib.mkIf config.terminal.kitty.enable icons."Kitty"; diff --git a/modules/web/chawan/default.nix b/modules/web/chawan/default.nix index 0b47aec..845ffb5 100644 --- a/modules/web/chawan/default.nix +++ b/modules/web/chawan/default.nix @@ -52,7 +52,8 @@ ''; }; display = { - image-mode = lib.mkIf config.terminal.kitty.enable "kitty"; + image-mode = "auto"; + set-title = false; }; network = { allow-http-from-file = true; |