Merge pull request 'develop' (#40) from develop into release-25.11
All checks were successful
Deploy docs / build-and-deploy (push) Successful in 17s
All checks were successful
Deploy docs / build-and-deploy (push) Successful in 17s
Reviewed-on: #40
This commit is contained in:
commit
d953dd7f8a
7 changed files with 123 additions and 0 deletions
|
|
@ -58,6 +58,7 @@ in
|
||||||
imports = [
|
imports = [
|
||||||
./bemenu
|
./bemenu
|
||||||
./dmenu-bluetooth
|
./dmenu-bluetooth
|
||||||
|
./dunst-toggle
|
||||||
./element-desktop
|
./element-desktop
|
||||||
./feh
|
./feh
|
||||||
./kitty
|
./kitty
|
||||||
|
|
@ -135,6 +136,11 @@ in
|
||||||
bind = [ "$mod SHIFT, m, exec, ${terminal} -T ${musicplayer} -e ${musicplayer}" ];
|
bind = [ "$mod SHIFT, m, exec, ${terminal} -T ${musicplayer} -e ${musicplayer}" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
notifications = mkAppAttrs {
|
||||||
|
default = "dunst-toggle";
|
||||||
|
bind = [ "$mod, Backspace, exec, ${notifications}" ];
|
||||||
|
};
|
||||||
|
|
||||||
networksettings = mkAppAttrs {
|
networksettings = mkAppAttrs {
|
||||||
default = "networkmanager_dmenu";
|
default = "networkmanager_dmenu";
|
||||||
bind = [ "$mod SHIFT, n, exec, ${networksettings}" ];
|
bind = [ "$mod SHIFT, n, exec, ${networksettings}" ];
|
||||||
|
|
|
||||||
18
modules/home/hyprland/applications/dunst-toggle/default.nix
Normal file
18
modules/home/hyprland/applications/dunst-toggle/default.nix
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
{
|
||||||
|
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; }) ];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
{ 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
|
||||||
|
'')
|
||||||
|
|
@ -56,6 +56,7 @@ let
|
||||||
};
|
};
|
||||||
|
|
||||||
# Add your custom modules here
|
# Add your custom modules here
|
||||||
|
"custom/notifications" = import ./modules/notifications.nix { inherit lib pkgs; };
|
||||||
"custom/newsboat" = import ./modules/newsboat.nix { inherit lib pkgs; };
|
"custom/newsboat" = import ./modules/newsboat.nix { inherit lib pkgs; };
|
||||||
"pulseaudio#input" = import ./modules/pulseaudio/input.nix { inherit lib pkgs; };
|
"pulseaudio#input" = import ./modules/pulseaudio/input.nix { inherit lib pkgs; };
|
||||||
"pulseaudio#output" = import ./modules/pulseaudio/output.nix { inherit lib pkgs; };
|
"pulseaudio#output" = import ./modules/pulseaudio/output.nix { inherit lib pkgs; };
|
||||||
|
|
@ -95,11 +96,13 @@ in
|
||||||
"disk"
|
"disk"
|
||||||
"pulseaudio#input"
|
"pulseaudio#input"
|
||||||
"pulseaudio#output"
|
"pulseaudio#output"
|
||||||
|
"custom/notifications"
|
||||||
"tray"
|
"tray"
|
||||||
];
|
];
|
||||||
|
|
||||||
inherit
|
inherit
|
||||||
"custom/newsboat"
|
"custom/newsboat"
|
||||||
|
"custom/notifications"
|
||||||
"hyprland/language"
|
"hyprland/language"
|
||||||
"hyprland/workspaces"
|
"hyprland/workspaces"
|
||||||
"pulseaudio#input"
|
"pulseaudio#input"
|
||||||
|
|
|
||||||
27
modules/home/waybar/modules/notifications.nix
Normal file
27
modules/home/waybar/modules/notifications.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
||||||
|
{ 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;
|
||||||
|
}
|
||||||
|
|
@ -21,6 +21,7 @@
|
||||||
miniflux = import ./miniflux;
|
miniflux = import ./miniflux;
|
||||||
nginx = import ./nginx;
|
nginx = import ./nginx;
|
||||||
normalUsers = import ./normalUsers;
|
normalUsers = import ./normalUsers;
|
||||||
|
nostr-relay = import ./nostr-relay;
|
||||||
nvidia = import ./nvidia;
|
nvidia = import ./nvidia;
|
||||||
ollama = import ./ollama;
|
ollama = import ./ollama;
|
||||||
open-webui-oci = import ./open-webui-oci;
|
open-webui-oci = import ./open-webui-oci;
|
||||||
|
|
|
||||||
57
modules/nixos/nostr-relay/default.nix
Normal file
57
modules/nixos/nostr-relay/default.nix
Normal file
|
|
@ -0,0 +1,57 @@
|
||||||
|
{ 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}";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue