Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fb6d677bcf | ||
|
|
5a4745f637 | ||
|
|
233ad01bee |
@@ -1,2 +0,0 @@
|
|||||||
.worktrees/
|
|
||||||
/.direnv
|
|
||||||
@@ -28,13 +28,12 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
inputs@{ self, nixpkgs, ... }:
|
inputs:
|
||||||
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 {
|
||||||
@@ -62,21 +61,5 @@
|
|||||||
./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,7 +125,6 @@
|
|||||||
##------------------------------
|
##------------------------------
|
||||||
programs = {
|
programs = {
|
||||||
zsh.enable = true;
|
zsh.enable = true;
|
||||||
nix-ld.enable = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# System Packages
|
# System Packages
|
||||||
@@ -141,6 +140,7 @@
|
|||||||
glib
|
glib
|
||||||
gsettings-desktop-schemas
|
gsettings-desktop-schemas
|
||||||
zip
|
zip
|
||||||
|
yarn
|
||||||
];
|
];
|
||||||
|
|
||||||
virtualisation.docker.enable = true; # docker, buildx
|
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,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
@@ -112,7 +115,6 @@
|
|||||||
fastfetch
|
fastfetch
|
||||||
nodejs
|
nodejs
|
||||||
firefox
|
firefox
|
||||||
telegram-desktop
|
|
||||||
];
|
];
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
@@ -147,10 +149,6 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
gpg.enable = true;
|
gpg.enable = true;
|
||||||
direnv = {
|
|
||||||
enable = true;
|
|
||||||
nix-direnv.enable = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
custom.pinentry.enable = true;
|
custom.pinentry.enable = true;
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ in
|
|||||||
# nitch
|
# nitch
|
||||||
|
|
||||||
# ---- editors & dev tooling ----
|
# ---- editors & dev tooling ----
|
||||||
|
tree
|
||||||
ffmpeg
|
ffmpeg
|
||||||
chromium
|
chromium
|
||||||
neovim
|
neovim
|
||||||
@@ -67,9 +68,15 @@ 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,6 +6,15 @@
|
|||||||
}:
|
}:
|
||||||
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 = {
|
||||||
@@ -45,21 +54,19 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
home.packages = [ pkgs.ntfy-sh ];
|
home.packages = [ pkgs.ntfy ];
|
||||||
|
|
||||||
# Client config with subscription → notify-send command mappings.
|
# Client config with subscription → notify-send mappings.
|
||||||
# ntfy subscribe (without args) reads subscriptions from client.yml.
|
# ntfy subscribe (without args) reads subscriptions from here.
|
||||||
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 message spawns notify-send → your notification daemon.
|
# Each incoming message spawns a 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: ${cmd}"
|
+ " command: >-\n"
|
||||||
|
+ '' notify-send -a "Kanban" -u "${sub.priority}" "Kanban Update" "$m"''
|
||||||
) cfg.subscriptions;
|
) cfg.subscriptions;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -71,7 +78,9 @@ in
|
|||||||
};
|
};
|
||||||
Service = {
|
Service = {
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
ExecStart = "${pkgs.ntfy-sh}/bin/ntfy subscribe";
|
ExecStart = ''
|
||||||
|
${pkgs.ntfy}/bin/ntfy subscribe
|
||||||
|
'';
|
||||||
Restart = "on-failure";
|
Restart = "on-failure";
|
||||||
RestartSec = 10;
|
RestartSec = 10;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
worktrunk
|
worktrunk
|
||||||
sesh
|
sesh
|
||||||
sl
|
sl
|
||||||
|
ntfy-sh
|
||||||
signal-cli
|
signal-cli
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -21,17 +21,17 @@ in
|
|||||||
positionY = "top";
|
positionY = "top";
|
||||||
cssPriority = "user";
|
cssPriority = "user";
|
||||||
|
|
||||||
control-center-width = 380;
|
control-center-width = 360;
|
||||||
control-center-height = 860;
|
control-center-height = 760;
|
||||||
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 = 400;
|
notification-window-width = 360;
|
||||||
notification-icon-size = 48;
|
notification-icon-size = 40;
|
||||||
notification-body-image-height = 160;
|
notification-body-image-height = 120;
|
||||||
notification-body-image-width = 200;
|
notification-body-image-width = 160;
|
||||||
|
|
||||||
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: 24px;
|
border-radius: 14px;
|
||||||
margin: 16px;
|
margin: 10px;
|
||||||
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,15 +252,6 @@ 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;
|
||||||
@@ -269,12 +260,12 @@ in
|
|||||||
/* CONTROL CENTER ------------------------------------------------------------------------ */
|
/* CONTROL CENTER ------------------------------------------------------------------------ */
|
||||||
|
|
||||||
.control-center {
|
.control-center {
|
||||||
background: alpha(${background}, 0.7);
|
background: alpha(${background}, 0.85);
|
||||||
border-radius: 24px;
|
border-radius: 16px;
|
||||||
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: 18px;
|
margin: 10px;
|
||||||
padding: 12px;
|
padding: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Notifications */
|
/* Notifications */
|
||||||
|
|||||||
Reference in New Issue
Block a user