Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5a4745f637 | ||
|
|
233ad01bee |
@@ -1,2 +0,0 @@
|
||||
.worktrees/
|
||||
/.direnv
|
||||
@@ -28,13 +28,12 @@
|
||||
};
|
||||
|
||||
outputs =
|
||||
inputs@{ self, nixpkgs, ... }:
|
||||
inputs:
|
||||
let
|
||||
systems = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
forAllSystems = nixpkgs.lib.genAttrs systems;
|
||||
in
|
||||
{
|
||||
nixosConfigurations.jpporta-nixos = inputs.nixpkgs.lib.nixosSystem {
|
||||
@@ -62,21 +61,5 @@
|
||||
./hosts/writter-deck/home.nix
|
||||
];
|
||||
};
|
||||
|
||||
devShells = forAllSystems (
|
||||
system:
|
||||
let
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
in
|
||||
{
|
||||
default = pkgs.mkShell {
|
||||
packages = with pkgs; [
|
||||
nixfmt
|
||||
nil # Nix LSP — your Neovim will pick it up via direnv
|
||||
statix # linter, optional
|
||||
];
|
||||
};
|
||||
}
|
||||
);
|
||||
};
|
||||
}
|
||||
|
||||
@@ -125,7 +125,6 @@
|
||||
##------------------------------
|
||||
programs = {
|
||||
zsh.enable = true;
|
||||
nix-ld.enable = true;
|
||||
};
|
||||
|
||||
# System Packages
|
||||
@@ -141,6 +140,7 @@
|
||||
glib
|
||||
gsettings-desktop-schemas
|
||||
zip
|
||||
yarn
|
||||
];
|
||||
|
||||
virtualisation.docker.enable = true; # docker, buildx
|
||||
|
||||
@@ -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,
|
||||
@@ -112,7 +115,6 @@
|
||||
fastfetch
|
||||
nodejs
|
||||
firefox
|
||||
telegram-desktop
|
||||
];
|
||||
|
||||
programs = {
|
||||
@@ -147,10 +149,6 @@
|
||||
];
|
||||
};
|
||||
gpg.enable = true;
|
||||
direnv = {
|
||||
enable = true;
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
custom.pinentry.enable = true;
|
||||
|
||||
@@ -37,6 +37,7 @@ in
|
||||
# nitch
|
||||
|
||||
# ---- editors & dev tooling ----
|
||||
tree
|
||||
ffmpeg
|
||||
chromium
|
||||
neovim
|
||||
@@ -67,9 +68,15 @@ in
|
||||
cargo
|
||||
php
|
||||
julia
|
||||
eslint_d
|
||||
golangci-lint
|
||||
rust-analyzer
|
||||
imagemagick
|
||||
ghostscript
|
||||
ripgrep
|
||||
gopls
|
||||
typescript-language-server
|
||||
nixfmt
|
||||
|
||||
# ---- cloud / infra ----
|
||||
awscli2
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
worktrunk
|
||||
sesh
|
||||
sl
|
||||
ntfy-sh
|
||||
signal-cli
|
||||
];
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user