Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fb6d677bcf | ||
|
|
5a4745f637 | ||
|
|
233ad01bee |
@@ -1 +0,0 @@
|
||||
.worktrees/
|
||||
@@ -36,6 +36,7 @@ Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or
|
||||
../../modules/home-manager/openspec
|
||||
../../modules/home-manager/power-profiles
|
||||
../../modules/home-manager/ntfy-notify
|
||||
../../modules/home-manager/pinentry
|
||||
|
||||
inputs.zen-browser.homeModules.beta
|
||||
];
|
||||
@@ -150,13 +151,7 @@ Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or
|
||||
gpg.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;
|
||||
};
|
||||
custom.pinentry.enable = true;
|
||||
|
||||
services.swaync.enable = true;
|
||||
}
|
||||
|
||||
@@ -6,6 +6,15 @@
|
||||
}:
|
||||
let
|
||||
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
|
||||
{
|
||||
options.custom.ntfy-notify = {
|
||||
@@ -45,21 +54,19 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
home.packages = [ pkgs.ntfy-sh ];
|
||||
home.packages = [ pkgs.ntfy ];
|
||||
|
||||
# Client config with subscription → notify-send command mappings.
|
||||
# ntfy subscribe (without args) reads subscriptions from client.yml.
|
||||
# Client config with subscription → notify-send mappings.
|
||||
# ntfy subscribe (without args) reads subscriptions from here.
|
||||
xdg.configFile."ntfy/client.yml" = {
|
||||
text = ''
|
||||
# Generated by ndots ntfy-notify module.
|
||||
# Each message spawns notify-send → your notification daemon.
|
||||
# Each incoming message spawns a notify-send → your notification daemon.
|
||||
subscribe:
|
||||
'' + lib.concatMapStringsSep "\n" (sub:
|
||||
let
|
||||
cmd = "notify-send -a Kanban -u ${sub.priority} \"Kanban Update\" \"$m\"";
|
||||
in
|
||||
" - topic: ${cfg.server}/${sub.topic}\n"
|
||||
+ " command: ${cmd}"
|
||||
+ " command: >-\n"
|
||||
+ '' notify-send -a "Kanban" -u "${sub.priority}" "Kanban Update" "$m"''
|
||||
) cfg.subscriptions;
|
||||
};
|
||||
|
||||
@@ -71,7 +78,9 @@ in
|
||||
};
|
||||
Service = {
|
||||
Type = "simple";
|
||||
ExecStart = "${pkgs.ntfy-sh}/bin/ntfy subscribe";
|
||||
ExecStart = ''
|
||||
${pkgs.ntfy}/bin/ntfy subscribe
|
||||
'';
|
||||
Restart = "on-failure";
|
||||
RestartSec = 10;
|
||||
};
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
{
|
||||
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;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -21,17 +21,17 @@ in
|
||||
positionY = "top";
|
||||
cssPriority = "user";
|
||||
|
||||
control-center-width = 380;
|
||||
control-center-height = 860;
|
||||
control-center-width = 360;
|
||||
control-center-height = 760;
|
||||
control-center-margin-top = 2;
|
||||
control-center-margin-bottom = 2;
|
||||
control-center-margin-right = 1;
|
||||
control-center-margin-left = 0;
|
||||
|
||||
notification-window-width = 400;
|
||||
notification-icon-size = 48;
|
||||
notification-body-image-height = 160;
|
||||
notification-body-image-width = 200;
|
||||
notification-window-width = 360;
|
||||
notification-icon-size = 40;
|
||||
notification-body-image-height = 120;
|
||||
notification-body-image-width = 160;
|
||||
|
||||
timeout = 4;
|
||||
timeout-low = 2;
|
||||
@@ -115,7 +115,7 @@ in
|
||||
style = ''
|
||||
* {
|
||||
color: ${text};
|
||||
background-color: ${background}
|
||||
background-color: ${background};
|
||||
all: unset;
|
||||
font-size: 12px;
|
||||
font-family: "BerkeleyMono Nerd Font Propo";
|
||||
@@ -132,8 +132,8 @@ in
|
||||
background: alpha(${background}, 0.9);
|
||||
box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.6);
|
||||
border: 1px solid ${selected};
|
||||
border-radius: 24px;
|
||||
margin: 16px;
|
||||
border-radius: 14px;
|
||||
margin: 10px;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
@@ -177,7 +177,7 @@ in
|
||||
> *
|
||||
.notification-action {
|
||||
border-radius: 8px;
|
||||
background-color: ${background-alt}};
|
||||
background-color: ${background-alt};
|
||||
margin: 6px;
|
||||
border: 1px solid transparent;
|
||||
}
|
||||
@@ -252,15 +252,6 @@ in
|
||||
background-color: ${selected};
|
||||
}
|
||||
|
||||
* {
|
||||
color: ${text};
|
||||
|
||||
all: unset;
|
||||
font-size: 12px;
|
||||
font-family: "BerkeleyMono Nerd Font Propo";
|
||||
transition: 200ms;
|
||||
}
|
||||
|
||||
/* Avoid 'annoying' backgroud */
|
||||
.blank-window {
|
||||
background: transparent;
|
||||
@@ -269,12 +260,12 @@ in
|
||||
/* CONTROL CENTER ------------------------------------------------------------------------ */
|
||||
|
||||
.control-center {
|
||||
background: alpha(${background}, 0.7);
|
||||
border-radius: 24px;
|
||||
background: alpha(${background}, 0.85);
|
||||
border-radius: 16px;
|
||||
border: 1px solid ${selected};
|
||||
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.6);
|
||||
margin: 18px;
|
||||
padding: 12px;
|
||||
margin: 10px;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
/* Notifications */
|
||||
|
||||
Reference in New Issue
Block a user