diff --git a/hm-modules/default.nix b/hm-modules/default.nix index f9e6bfc..ffcc8c8 100644 --- a/hm-modules/default.nix +++ b/hm-modules/default.nix @@ -9,5 +9,6 @@ ./browser ./terminal ./development + ./notification ]; } diff --git a/hm-modules/notification/default.nix b/hm-modules/notification/default.nix new file mode 100644 index 0000000..fcfbdcc --- /dev/null +++ b/hm-modules/notification/default.nix @@ -0,0 +1,7 @@ +{ config, lib, pkgs, ... }: + +{ + imports = [ + ./mako + ]; +} diff --git a/hm-modules/notification/mako/default.nix b/hm-modules/notification/mako/default.nix new file mode 100644 index 0000000..2bf8ee0 --- /dev/null +++ b/hm-modules/notification/mako/default.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.dov.notification.mako; + colors = config.lib.stylix.colors; +in { + options.dov.notification.mako.enable = mkEnableOption "mako option"; + + config = mkIf cfg.enable { + services.mako = { + enable = true; + + settings = { + background-color = mkForce "#${colors.base01}"; + border-color = mkForce "#${colors.base00}"; + border-radius = 10; + text-color = mkForce "#${colors.base0A}"; + + default-timeout = 5000; + }; + }; + }; +} diff --git a/machines/fujin/main/home.nix b/machines/fujin/main/home.nix index 0a4732c..c41b5e8 100644 --- a/machines/fujin/main/home.nix +++ b/machines/fujin/main/home.nix @@ -65,6 +65,8 @@ vscode.enable = true; jetbrains.toolbox.enable = true; }; + + notification.mako.enable = true; }; programs = { diff --git a/modules/window-manager/hypr/default.nix b/modules/window-manager/hypr/default.nix index 5ea98ed..70afbe6 100644 --- a/modules/window-manager/hypr/default.nix +++ b/modules/window-manager/hypr/default.nix @@ -45,7 +45,6 @@ in { home-manager.users.fujin.config = { home.packages = with pkgs; [ swww - mako pipewire wireplumber libnotify @@ -87,7 +86,6 @@ in { ]; exec-once = [ - "mako" "polkit-kde-agent" "emacs --fg-daemon" "hypridle" @@ -97,7 +95,7 @@ in { #"element-desktop" "keepassxc" "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" - ] ++ lib.optionals hm-cfg.bar.waybar.enable [ "waybar" ]; + ] ++ lib.optionals hm-cfg.bar.waybar.enable [ "waybar" "mako" ]; "$mainMod" = "SUPER";