diff --git a/modules/home/hyprland/applications/default.nix b/modules/home/hyprland/applications/default.nix index 8b434be..193c696 100644 --- a/modules/home/hyprland/applications/default.nix +++ b/modules/home/hyprland/applications/default.nix @@ -58,7 +58,6 @@ in imports = [ ./bemenu ./dmenu-bluetooth - ./dunst-toggle ./element-desktop ./feh ./kitty @@ -136,11 +135,6 @@ in bind = [ "$mod SHIFT, m, exec, ${terminal} -T ${musicplayer} -e ${musicplayer}" ]; }; - notifications = mkAppAttrs { - default = "dunst-toggle"; - bind = [ "$mod, Backspace, exec, ${notifications}" ]; - }; - networksettings = mkAppAttrs { default = "networkmanager_dmenu"; bind = [ "$mod SHIFT, n, exec, ${networksettings}" ]; diff --git a/modules/home/hyprland/applications/dunst-toggle/default.nix b/modules/home/hyprland/applications/dunst-toggle/default.nix deleted file mode 100644 index 69e4938..0000000 --- a/modules/home/hyprland/applications/dunst-toggle/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -let - cfg = config.wayland.windowManager.hyprland; - app = cfg.applications.notifications.default; - - inherit (lib) mkIf; -in -{ - config = mkIf (cfg.enable && app == "dunst-toggle") { - home.packages = [ (import ./dunst-toggle.nix { inherit config pkgs; }) ]; - }; -} diff --git a/modules/home/hyprland/applications/dunst-toggle/dunst-toggle.nix b/modules/home/hyprland/applications/dunst-toggle/dunst-toggle.nix deleted file mode 100644 index 248faec..0000000 --- a/modules/home/hyprland/applications/dunst-toggle/dunst-toggle.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, pkgs, ... }: - -let - dunst = "${pkgs.dunst}/bin/dunstctl"; - pkill = "${pkgs.procps}/bin/pkill"; - signal = "${toString config.programs.waybar.settings.mainBar."custom/notifications".signal}"; -in -(pkgs.writeShellScriptBin "dunst-toggle" '' - ${dunst} set-paused toggle - ${pkill} -RTMIN+${signal} waybar -'') diff --git a/modules/home/waybar/default.nix b/modules/home/waybar/default.nix index 6a208a3..af54412 100644 --- a/modules/home/waybar/default.nix +++ b/modules/home/waybar/default.nix @@ -56,7 +56,6 @@ let }; # Add your custom modules here - "custom/notifications" = import ./modules/notifications.nix { inherit lib pkgs; }; "custom/newsboat" = import ./modules/newsboat.nix { inherit lib pkgs; }; "pulseaudio#input" = import ./modules/pulseaudio/input.nix { inherit lib pkgs; }; "pulseaudio#output" = import ./modules/pulseaudio/output.nix { inherit lib pkgs; }; @@ -96,13 +95,11 @@ in "disk" "pulseaudio#input" "pulseaudio#output" - "custom/notifications" "tray" ]; inherit "custom/newsboat" - "custom/notifications" "hyprland/language" "hyprland/workspaces" "pulseaudio#input" diff --git a/modules/home/waybar/modules/notifications.nix b/modules/home/waybar/modules/notifications.nix deleted file mode 100644 index 1f21931..0000000 --- a/modules/home/waybar/modules/notifications.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ pkgs, lib, ... }: - -let - inherit (lib) mkDefault; - dunst = "${pkgs.dunst}/bin/dunstctl"; -in -{ - format = mkDefault "{icon}"; - format-icons = { - unmuted = mkDefault ""; - muted = mkDefault ""; - }; - return-type = mkDefault "json"; - exec = mkDefault ( - pkgs.writeShellScript "notifications" '' - is_paused=$(${dunst} is-paused) - if [ "$is_paused" = "true" ]; then - echo '{"alt": "muted", "class": "muted"}' - else - echo '{"alt": "unmuted", "class": "unmuted"}' - fi - '' - ); - on-click = mkDefault "dunst-toggle"; - interval = mkDefault "once"; - signal = mkDefault 12; -} diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 60c31b9..094f15e 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -21,7 +21,6 @@ miniflux = import ./miniflux; nginx = import ./nginx; normalUsers = import ./normalUsers; - nostr-relay = import ./nostr-relay; nvidia = import ./nvidia; ollama = import ./ollama; open-webui-oci = import ./open-webui-oci; diff --git a/modules/nixos/nostr-relay/default.nix b/modules/nixos/nostr-relay/default.nix deleted file mode 100644 index 199f702..0000000 --- a/modules/nixos/nostr-relay/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ config, lib, ... }: - -let - cfg = config.services.nostr-relay; - domain = config.networking.domain; - subdomain = cfg.reverseProxy.subdomain; - fqdn = if (cfg.reverseProxy.enable && subdomain != "") then "${subdomain}.${domain}" else domain; - - inherit (lib) - mkDefault - mkIf - ; - - inherit (lib.utils) - mkReverseProxyOption - ; -in -{ - options.services.nostr-relay = { - reverseProxy = mkReverseProxyOption "Nostr Relay" "nostr"; - }; - - config = mkIf cfg.enable { - services.nostr-rs-relay = { - settings = { - network = { - port = mkDefault 12849; - host = mkDefault (if cfg.reverseProxy.enable then "127.0.0.1" else "0.0.0.0"); - }; - limits = { - max_event_size = mkDefault 65536; - max_subscriptions = mkDefault 20; - max_filters = mkDefault 10; - max_subid_length = mkDefault 128; - max_event_tags = mkDefault 2000; - max_content_length = mkDefault 32768; - }; - federation = { - enabled = mkDefault true; - max_message_size = mkDefault 1048576; - }; - database = { - max_query_time_ms = mkDefault 5000; - }; - }; - }; - - services.nginx.virtualHosts = mkIf cfg.reverseProxy.enable { - "${fqdn}" = { - enableACME = cfg.reverseProxy.forceSSL; - forceSSL = cfg.reverseProxy.forceSSL; - locations."/".proxyPass = - "http://127.0.0.1:${toString config.services.nostr-rs-relay.settings.network.port}"; - }; - }; - }; -}