Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
32facdd02d
|
||
|
|
9d842e34cc
|
||
|
|
d4c2b37d46
|
||
|
|
15d4a06719
|
||
|
|
6bbd22bce8
|
@@ -0,0 +1,2 @@
|
|||||||
|
.worktrees/
|
||||||
|
/.direnv
|
||||||
@@ -28,12 +28,13 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
inputs:
|
inputs@{ self, nixpkgs, ... }:
|
||||||
let
|
let
|
||||||
systems = [
|
systems = [
|
||||||
"x86_64-linux"
|
"x86_64-linux"
|
||||||
"aarch64-linux"
|
"aarch64-linux"
|
||||||
];
|
];
|
||||||
|
forAllSystems = nixpkgs.lib.genAttrs systems;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
nixosConfigurations.jpporta-nixos = inputs.nixpkgs.lib.nixosSystem {
|
nixosConfigurations.jpporta-nixos = inputs.nixpkgs.lib.nixosSystem {
|
||||||
@@ -61,5 +62,21 @@
|
|||||||
./hosts/writter-deck/home.nix
|
./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,6 +125,7 @@
|
|||||||
##------------------------------
|
##------------------------------
|
||||||
programs = {
|
programs = {
|
||||||
zsh.enable = true;
|
zsh.enable = true;
|
||||||
|
nix-ld.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# System Packages
|
# System Packages
|
||||||
@@ -140,7 +141,6 @@
|
|||||||
glib
|
glib
|
||||||
gsettings-desktop-schemas
|
gsettings-desktop-schemas
|
||||||
zip
|
zip
|
||||||
yarn
|
|
||||||
];
|
];
|
||||||
|
|
||||||
virtualisation.docker.enable = true; # docker, buildx
|
virtualisation.docker.enable = true; # docker, buildx
|
||||||
|
|||||||
@@ -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,
|
||||||
@@ -115,6 +112,7 @@ Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or
|
|||||||
fastfetch
|
fastfetch
|
||||||
nodejs
|
nodejs
|
||||||
firefox
|
firefox
|
||||||
|
telegram-desktop
|
||||||
];
|
];
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
@@ -149,6 +147,10 @@ Warning: Identity file /home/jpporta/.ssh/id_rsa not accessible: No such file or
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
gpg.enable = true;
|
gpg.enable = true;
|
||||||
|
direnv = {
|
||||||
|
enable = true;
|
||||||
|
nix-direnv.enable = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
custom.pinentry.enable = true;
|
custom.pinentry.enable = true;
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ in
|
|||||||
# nitch
|
# nitch
|
||||||
|
|
||||||
# ---- editors & dev tooling ----
|
# ---- editors & dev tooling ----
|
||||||
tree
|
|
||||||
ffmpeg
|
ffmpeg
|
||||||
chromium
|
chromium
|
||||||
neovim
|
neovim
|
||||||
@@ -68,15 +67,9 @@ in
|
|||||||
cargo
|
cargo
|
||||||
php
|
php
|
||||||
julia
|
julia
|
||||||
eslint_d
|
|
||||||
golangci-lint
|
|
||||||
rust-analyzer
|
|
||||||
imagemagick
|
imagemagick
|
||||||
ghostscript
|
ghostscript
|
||||||
ripgrep
|
ripgrep
|
||||||
gopls
|
|
||||||
typescript-language-server
|
|
||||||
nixfmt
|
|
||||||
|
|
||||||
# ---- cloud / infra ----
|
# ---- cloud / infra ----
|
||||||
awscli2
|
awscli2
|
||||||
|
|||||||
@@ -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;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -11,7 +11,6 @@
|
|||||||
worktrunk
|
worktrunk
|
||||||
sesh
|
sesh
|
||||||
sl
|
sl
|
||||||
ntfy-sh
|
|
||||||
signal-cli
|
signal-cli
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user