Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fb6d677bcf | ||
|
|
5a4745f637 | ||
|
|
233ad01bee |
-10
@@ -1,10 +0,0 @@
|
||||
# Nix build artifacts
|
||||
result
|
||||
result-*
|
||||
|
||||
# direnv
|
||||
.direnv/
|
||||
|
||||
# editor / OS cruft
|
||||
*.swp
|
||||
.DS_Store
|
||||
@@ -1,3 +1,6 @@
|
||||
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,
|
||||
pkgs,
|
||||
@@ -32,6 +35,8 @@
|
||||
../../modules/home-manager/tmux
|
||||
../../modules/home-manager/openspec
|
||||
../../modules/home-manager/power-profiles
|
||||
../../modules/home-manager/ntfy-notify
|
||||
../../modules/home-manager/pinentry
|
||||
|
||||
inputs.zen-browser.homeModules.beta
|
||||
];
|
||||
@@ -91,8 +96,9 @@
|
||||
};
|
||||
openspec.enable = true;
|
||||
power-profiles.enable = true;
|
||||
};
|
||||
ntfy-notify.enable = true;
|
||||
|
||||
};
|
||||
home.packages =
|
||||
let
|
||||
mediaplayerPython = pkgs.python3.withPackages (ps: with ps; [ pygobject3 ]);
|
||||
@@ -145,13 +151,7 @@
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
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 = {
|
||||
enable = lib.mkEnableOption "ntfy desktop notification subscriber";
|
||||
|
||||
server = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "ntfy.sh";
|
||||
description = "ntfy server base URL (e.g. ntfy.sh or self-hosted).";
|
||||
};
|
||||
|
||||
subscriptions = lib.mkOption {
|
||||
type = lib.types.listOf (lib.types.submodule {
|
||||
options = {
|
||||
topic = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = "ntfy topic to subscribe to.";
|
||||
};
|
||||
priority = lib.mkOption {
|
||||
type = lib.types.enum [ "low" "normal" "critical" ];
|
||||
default = "normal";
|
||||
description = "Urgency level passed to notify-send -u.";
|
||||
};
|
||||
};
|
||||
});
|
||||
default = [
|
||||
{
|
||||
topic = "joao-kanban";
|
||||
priority = "critical";
|
||||
}
|
||||
];
|
||||
description = ''
|
||||
List of ntfy topics to subscribe to. Each topic gets a notify-send
|
||||
command that feeds into the desktop notification daemon (SwayNC).
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
home.packages = [ pkgs.ntfy ];
|
||||
|
||||
# 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 incoming message spawns a notify-send → your notification daemon.
|
||||
subscribe:
|
||||
'' + lib.concatMapStringsSep "\n" (sub:
|
||||
" - topic: ${cfg.server}/${sub.topic}\n"
|
||||
+ " command: >-\n"
|
||||
+ '' notify-send -a "Kanban" -u "${sub.priority}" "Kanban Update" "$m"''
|
||||
) cfg.subscriptions;
|
||||
};
|
||||
|
||||
systemd.user.services.ntfy-notify = {
|
||||
Unit = {
|
||||
Description = "ntfy push notification subscriber (kanban → notify-send)";
|
||||
After = [ "graphical-session.target" ];
|
||||
PartOf = [ "graphical-session.target" ];
|
||||
};
|
||||
Service = {
|
||||
Type = "simple";
|
||||
ExecStart = ''
|
||||
${pkgs.ntfy}/bin/ntfy subscribe
|
||||
'';
|
||||
Restart = "on-failure";
|
||||
RestartSec = 10;
|
||||
};
|
||||
Install.WantedBy = [ "graphical-session.target" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -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 */
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
/nix/store/kldv63c3f6aqvk95rbwp7jf9ms7qjbb9-home-manager-generation
|
||||
Symlink
+1
@@ -0,0 +1 @@
|
||||
/nix/store/z1w7hmcjbxlj4zif3lwb8ifkn66rjy60-home-manager-generation
|
||||
Reference in New Issue
Block a user