From 92392ee2c2188a5fc2d2f2f8c5221bf0f43374e6 Mon Sep 17 00:00:00 2001 From: sefidel Date: Sat, 10 Aug 2024 15:28:03 +0900 Subject: feat(home/gui): replace dunst with mako --- home/profiles/gui/config/dunst.nix | 50 -------------------------------------- home/profiles/gui/config/mako.nix | 29 ++++++++++++++++++++++ home/profiles/gui/default.nix | 9 +++---- 3 files changed, 33 insertions(+), 55 deletions(-) delete mode 100644 home/profiles/gui/config/dunst.nix diff --git a/home/profiles/gui/config/dunst.nix b/home/profiles/gui/config/dunst.nix deleted file mode 100644 index f6e80b3..0000000 --- a/home/profiles/gui/config/dunst.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ config, neotheme }: - -with neotheme.colors; - -let - guiCfg = config.profiles.gui; -in -{ - global = { - padding = 8; - width = "330"; - origin = "top-right"; - offset = "8x25"; - notification_limit = 5; - frame_width = 2; - vertical_alignment = "center"; - horizontal_padding = 8; - icon_position = "left"; - corner_radius = 10; - - markup = "full"; - word_wrap = true; - show_indicators = false; - format = "%s\\n\\n%b"; - font = "${guiCfg.font.name} ${toString guiCfg.font.size}"; - frame_color = "#${color3}"; - separator_color = "auto"; - max_icon_size = 80; - }; - - urgency_low = { - foreground = "#${foreground}"; - background = "#${background}"; - frame_color = "#${color4}"; - timeout = 4; - }; - - urgency_normal = { - foreground = "#${foreground}"; - background = "#${background}"; - frame_color = "#${color3}"; - timeout = 8; - }; - - urgency_critical = { - foreground = "#${foreground}"; - background = "#${background}"; - frame_color = "#${color1}"; - }; -} diff --git a/home/profiles/gui/config/mako.nix b/home/profiles/gui/config/mako.nix index 041ee36..d9a6022 100644 --- a/home/profiles/gui/config/mako.nix +++ b/home/profiles/gui/config/mako.nix @@ -6,5 +6,34 @@ let guiCfg = config.profiles.gui; in { + anchor = "top-right"; + width = 330; + padding = "8"; + margin = "16,8"; + borderRadius = 10; + borderSize = 2; + borderColor = "#${color3}"; + backgroundColor = "#${background}"; + textColor = "#${foreground}"; + progressColor = "over #${color5}"; + + markup = true; + font = "${guiCfg.font.name} ${toString guiCfg.font.size}"; + + maxVisible = 5; + + extraConfig = '' + [urgency=low] + border-color=#${color4} + default-timeout=4000 + + [urgency=normal] + border-color=#${color3} + default-timeout=8000 + + [urgency=critical] + border-color=#${color1} + default-timeout=0 + ''; } diff --git a/home/profiles/gui/default.nix b/home/profiles/gui/default.nix index 7cfa2e0..9c269e9 100644 --- a/home/profiles/gui/default.nix +++ b/home/profiles/gui/default.nix @@ -169,11 +169,6 @@ in }; services = { - dunst = { - enable = true; - settings = import ./config/dunst.nix { inherit config neotheme; }; - }; - kanshi = { enable = true; settings = [ @@ -204,6 +199,10 @@ in ]; }; + mako = { + enable = true; + } // import ./config/mako.nix { inherit config neotheme; }; + swayidle = let # TODO: remove when >1.6.11 -- cgit 1.4.1