From d0dc106ccbd3a61aa7abb087c39b88f99fbf0f31 Mon Sep 17 00:00:00 2001 From: Lucas Sta Maria Date: Sun, 17 Aug 2025 13:47:55 +0000 Subject: [PATCH] fix(nix): change notification service --- nix/hosts/framework/home.nix | 7 +---- nix/hosts/framework/sys.nix | 17 +++--------- nix/modules/swaynotificationcenter.nix | 36 ++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 20 deletions(-) create mode 100644 nix/modules/swaynotificationcenter.nix diff --git a/nix/hosts/framework/home.nix b/nix/hosts/framework/home.nix index 7fb81e6..50b2156 100644 --- a/nix/hosts/framework/home.nix +++ b/nix/hosts/framework/home.nix @@ -79,6 +79,7 @@ xdg-desktop-portal xdg-desktop-portal-wlr wpaperd + swaynotificationcenter discord steam @@ -223,12 +224,6 @@ }; }; - services.mako = { - enable = true; - defaultTimeout = 10000; - margin = "40,20"; - }; - ### Programs programs.home-manager.enable = true; programs.mu.enable = true; diff --git a/nix/hosts/framework/sys.nix b/nix/hosts/framework/sys.nix index c6e1672..8178f8c 100644 --- a/nix/hosts/framework/sys.nix +++ b/nix/hosts/framework/sys.nix @@ -1,5 +1,5 @@ { inputs, config, pkgs, lib, ... }: { - imports = [ ./hw.nix ]; + imports = [ ./hw.nix ../../modules/swaynotificationcenter.nix ]; networking.hostName = "framework"; time.timeZone = "America/New_York"; @@ -103,19 +103,6 @@ # Mouse services.libinput.mouse = { middleEmulation = false; }; - # Notification Server - systemd.user.services.deadd-notification-center = { - description = "deadd notification center"; - wantedBy = [ "graphical-session.target" ]; - partOf = [ "graphical-session.target" ]; - serviceConfig = { - ExecStart = - "${pkgs.deadd-notification-center}/bin/deadd-notification-center"; - Restart = "always"; - RestartSec = 3; - }; - }; - virtualisation.docker.enable = true; users.users.priime = { @@ -152,6 +139,8 @@ programs.niri.enable = true; programs.xwayland.enable = true; + services.swaynotificationcenter.enable = true; + services.tailscale = { enable = true; useRoutingFeatures = "client"; diff --git a/nix/modules/swaynotificationcenter.nix b/nix/modules/swaynotificationcenter.nix new file mode 100644 index 0000000..bf42574 --- /dev/null +++ b/nix/modules/swaynotificationcenter.nix @@ -0,0 +1,36 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.swaynotificationcenter; +in { + options.services.swaynotificationcenter = with lib; { + enable = lib.mkEnableOption "SwayNotificationCenter daemon"; + + package = lib.mkOption { + type = types.package; + default = pkgs.swaynotificationcenter; + description = "The SwayNotificationCenter package to use."; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.user.services.swaync = { + description = "SwayNotificationCenter daemon"; + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; + after = [ "graphical-session-pre.target" ]; + + serviceConfig = { + Type = "simple"; + ExecStart = "${cfg.package}/bin/swaync"; + Restart = "on-failure"; + RestartSec = 1; + TimeoutStopSec = 10; + }; + }; + + environment.systemPackages = [ cfg.package ]; + }; +}