Author SHA1 Message Date
jpporta 15d4a06719 ntfy + nvm 2026-07-23 10:42:53 -03:00
jpporta 6bbd22bce8 ntfy 2026-07-22 10:23:03 -03:00
7 changed files with 42 additions and 70 deletions
+1
View File
@@ -0,0 +1 @@
.worktrees/
+1
View File
@@ -125,6 +125,7 @@
##------------------------------ ##------------------------------
programs = { programs = {
zsh.enable = true; zsh.enable = true;
nix-ld.enable = true;
}; };
# System Packages # System Packages
+8 -5
View File
@@ -1,6 +1,3 @@
Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or directory.
Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or directory.
Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or directory.
{ {
config, config,
pkgs, pkgs,
@@ -36,7 +33,6 @@ Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or
../../modules/home-manager/openspec ../../modules/home-manager/openspec
../../modules/home-manager/power-profiles ../../modules/home-manager/power-profiles
../../modules/home-manager/ntfy-notify ../../modules/home-manager/ntfy-notify
../../modules/home-manager/pinentry
inputs.zen-browser.homeModules.beta inputs.zen-browser.homeModules.beta
]; ];
@@ -118,6 +114,7 @@ Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or
]; ];
programs = { programs = {
nvm.enable = true;
zen-browser.enable = true; zen-browser.enable = true;
git = { git = {
enable = true; enable = true;
@@ -151,7 +148,13 @@ Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or
gpg.enable = true; gpg.enable = true;
}; };
custom.pinentry.enable = true; services.gpg-agent = {
enable = true;
pinentry.package = pkgs.pinentry-rofi;
enableSshSupport = true; # only if you use gpg keys as ssh keys
defaultCacheTtl = 3600;
maxCacheTtl = 86400;
};
services.swaync.enable = true; services.swaync.enable = true;
} }
+9 -18
View File
@@ -6,15 +6,6 @@
}: }:
let let
cfg = config.custom.ntfy-notify; cfg = config.custom.ntfy-notify;
# Escape the whole command string for the YAML config. Since ntfy reads this
# from client.yml directly (not from systemd), we pass notify-send arguments
# as a shell command string — ntfy will spawn a shell to run it.
mkSubscription = topic: priority:
lib.generators.toYaml { } [{
topic = "${cfg.server}/${topic}";
command = ''notify-send -a "Kanban" -u "${priority}" "Kanban Update" "''${m}"'';
}];
in in
{ {
options.custom.ntfy-notify = { options.custom.ntfy-notify = {
@@ -54,19 +45,21 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
home.packages = [ pkgs.ntfy ]; home.packages = [ pkgs.ntfy-sh ];
# Client config with subscription → notify-send mappings. # Client config with subscription → notify-send command mappings.
# ntfy subscribe (without args) reads subscriptions from here. # ntfy subscribe (without args) reads subscriptions from client.yml.
xdg.configFile."ntfy/client.yml" = { xdg.configFile."ntfy/client.yml" = {
text = '' text = ''
# Generated by ndots ntfy-notify module. # Generated by ndots ntfy-notify module.
# Each incoming message spawns a notify-send your notification daemon. # Each message spawns notify-send your notification daemon.
subscribe: subscribe:
'' + lib.concatMapStringsSep "\n" (sub: '' + lib.concatMapStringsSep "\n" (sub:
let
cmd = "notify-send -a Kanban -u ${sub.priority} \"Kanban Update\" \"$m\"";
in
" - topic: ${cfg.server}/${sub.topic}\n" " - topic: ${cfg.server}/${sub.topic}\n"
+ " command: >-\n" + " command: ${cmd}"
+ '' notify-send -a "Kanban" -u "${sub.priority}" "Kanban Update" "$m"''
) cfg.subscriptions; ) cfg.subscriptions;
}; };
@@ -78,9 +71,7 @@ in
}; };
Service = { Service = {
Type = "simple"; Type = "simple";
ExecStart = '' ExecStart = "${pkgs.ntfy-sh}/bin/ntfy subscribe";
${pkgs.ntfy}/bin/ntfy subscribe
'';
Restart = "on-failure"; Restart = "on-failure";
RestartSec = 10; RestartSec = 10;
}; };
-1
View File
@@ -11,7 +11,6 @@
worktrunk worktrunk
sesh sesh
sl sl
ntfy-sh
signal-cli signal-cli
]; ];
}; };
-32
View File
@@ -1,32 +0,0 @@
{
lib,
config,
pkgs,
...
}:
let
pinentry-wrapper = pkgs.writeShellScriptBin "pinentry-wrapper" ''
if [ -n "''${SSH_CONNECTION:-}" ] || [ -n "''${SSH_TTY:-}" ]; then
exec ${pkgs.pinentry-curses}/bin/pinentry-curses "$@"
else
exec ${pkgs.pinentry-rofi}/bin/pinentry-rofi "$@"
fi
'';
in {
options.custom.pinentry = {
enable = lib.mkEnableOption "adaptive pinentry: rofi on TTY, curses on SSH";
};
config = lib.mkIf config.custom.pinentry.enable {
home.packages = [ pinentry-wrapper ];
services.gpg-agent = {
enable = true;
pinentry.package = pinentry-wrapper;
enableSshSupport = true;
defaultCacheTtl = 3600;
maxCacheTtl = 86400;
};
};
}
+23 -14
View File
@@ -21,17 +21,17 @@ in
positionY = "top"; positionY = "top";
cssPriority = "user"; cssPriority = "user";
control-center-width = 360; control-center-width = 380;
control-center-height = 760; control-center-height = 860;
control-center-margin-top = 2; control-center-margin-top = 2;
control-center-margin-bottom = 2; control-center-margin-bottom = 2;
control-center-margin-right = 1; control-center-margin-right = 1;
control-center-margin-left = 0; control-center-margin-left = 0;
notification-window-width = 360; notification-window-width = 400;
notification-icon-size = 40; notification-icon-size = 48;
notification-body-image-height = 120; notification-body-image-height = 160;
notification-body-image-width = 160; notification-body-image-width = 200;
timeout = 4; timeout = 4;
timeout-low = 2; timeout-low = 2;
@@ -115,7 +115,7 @@ in
style = '' style = ''
* { * {
color: ${text}; color: ${text};
background-color: ${background}; background-color: ${background}
all: unset; all: unset;
font-size: 12px; font-size: 12px;
font-family: "BerkeleyMono Nerd Font Propo"; font-family: "BerkeleyMono Nerd Font Propo";
@@ -132,8 +132,8 @@ in
background: alpha(${background}, 0.9); background: alpha(${background}, 0.9);
box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.6); box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.6);
border: 1px solid ${selected}; border: 1px solid ${selected};
border-radius: 14px; border-radius: 24px;
margin: 10px; margin: 16px;
padding: 0; padding: 0;
} }
@@ -177,7 +177,7 @@ in
> * > *
.notification-action { .notification-action {
border-radius: 8px; border-radius: 8px;
background-color: ${background-alt}; background-color: ${background-alt}};
margin: 6px; margin: 6px;
border: 1px solid transparent; border: 1px solid transparent;
} }
@@ -252,6 +252,15 @@ in
background-color: ${selected}; background-color: ${selected};
} }
* {
color: ${text};
all: unset;
font-size: 12px;
font-family: "BerkeleyMono Nerd Font Propo";
transition: 200ms;
}
/* Avoid 'annoying' backgroud */ /* Avoid 'annoying' backgroud */
.blank-window { .blank-window {
background: transparent; background: transparent;
@@ -260,12 +269,12 @@ in
/* CONTROL CENTER ------------------------------------------------------------------------ */ /* CONTROL CENTER ------------------------------------------------------------------------ */
.control-center { .control-center {
background: alpha(${background}, 0.85); background: alpha(${background}, 0.7);
border-radius: 16px; border-radius: 24px;
border: 1px solid ${selected}; border: 1px solid ${selected};
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.6); box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.6);
margin: 10px; margin: 18px;
padding: 10px; padding: 12px;
} }
/* Notifications */ /* Notifications */