chore: update hyprland

This commit is contained in:
danny 2025-11-24 20:27:02 +08:00
parent c7743490a7
commit 4456977b9e
8 changed files with 309 additions and 202 deletions

View file

@ -49,7 +49,7 @@ in
}
{
from = 31000;
to = 31010;
to = 32000;
}
];

View file

@ -202,4 +202,18 @@ in
'';
};
};
services.mail-ntfy-server = {
enable = true;
settings = {
NTFY_URL = "https://ntfy.net.dn";
NTFY_TOPIC = "dachxy-mail";
NTFY_RCPTS = [ "dachxy@dnywe.com" ];
HOST = "127.0.0.1";
PORT = 31010;
};
environmentFiles = [
config.sops.secrets."ntfy".path
];
};
}

View file

@ -62,14 +62,9 @@ in
};
};
systemd.services.fetch-allowed-domains = {
path = with pkgs; [
nftables
dig.dnsutils
];
after = [ "network.target" ];
serviceConfig = {
ExecStart = "${pkgs.writeShellScript "fetch-allowed-domains" ''
systemd.services.fetch-allowed-domains =
let
script = pkgs.writeShellScript "fetch-allowed-domains" ''
DOMAINS=(${toString (map (x: ''"${x}"'') cfg.allowedDomains)})
SETNAME="inet filter ${cfg.rules.setName}"
@ -83,9 +78,19 @@ in
echo "Added $ip for $domain"
done
done
''}";
Type = "oneshot";
'';
in
{
path = with pkgs; [
nftables
dig.dnsutils
];
after = [ "network.target" ];
serviceConfig = {
ExecStart = "${script}";
Type = "oneshot";
};
restartTriggers = [ script ];
};
};
};
}

View file

@ -9,6 +9,7 @@ in
{
systemConf.security.allowedDomains = [
"ntfy.sh"
"web.push.apple.com"
];
services.ntfy-sh = {
@ -22,6 +23,8 @@ in
auth-default-access = "deny-all";
enable-login = true;
auth-file = "/var/lib/ntfy-sh/user.db";
web-push-public-key = "BHN3E5Mwckakf6gOf2uAaiTueB-2L6i96QA1l0r1rSTX_N4qGtMgobmIgEfdY6LAFxradYLtRmwEzTzEnp_Xs5w";
web-push-file = "/var/lib/ntfy-sh/webpush.db";
};
environmentFile = config.sops.secrets."ntfy".path;
};

View file

@ -40,7 +40,7 @@ crowdsec:
capi.yaml: ENC[AES256_GCM,data:+13mu3XXst8J5okb+jQ/IPOd5TfdcDgLuTP8L46U53GTgTJChQoT4Ttw6xKQhp6L7vNoArQBQL66leRt3DEXATUjxl/Zoi2eymxqLn6/NUpPkv0g7hszJGVbMZEUGjo3IAk5ZRQWaNXHA9mRq/OkHzpMMM6ZpCd0KpY92QbLSHxJ6yUMazL1Wh4hwvyWyN6lLxujrgnZWOQDPZYQmIi+c/Af,iv:OO+Ujqq89SbWcRoqhwiJX2jtIJIUrtgG9xll7WuDhzw=,tag:R+Mx2UAkwA238quvMKCBLQ==,type:str]
consoleToken: ENC[AES256_GCM,data:G/UfbMqHW0lecT7vKmZsusvXzgxz6apdRQ==,iv:JJTN1RPhFNMd2gqE3Vw2FvC+bA/vgOiYNfBhr96veIw=,tag:HKbhtwCWkLte8e8uGDt2Gw==,type:str]
opencloud: ENC[AES256_GCM,data:NrhvojLoMUbGkWNkfDN12iAU70F9o1MXa3m8RzYtcBU1r9zk0e+4ZlPAqw2SIobMDC3vo3few7cA21ruYGP2p36lskG6UjafyJPJoHQcxlq04Kp/9GVeSsvI3KP08WLmoaBqk6b+f1K57P4OzSHPYKQ4/f51B4yhmt8n/DNg7RgF8wNKi4KUTOBuC/j+T+51vsJdjqHUuBi1y2ZqaolAwfEYbnswNVJUcOxHUezIAGke/22U0fS01+p1JQ/PAzSeDdxuX8dAMDVYHHZ13A07kXIRchpSb63Y5pTLUUAl25zAaSYoq+fZ0s61DZrYCaityZCishhCpJwmyoOsCWEesOpRFYNjIALIxWmM9b3aU/5G1WNiPRdlfvZpowhm3r+4X7QGCoXvuoI94l8DuXW7wN77XhLr7s4w,iv:TrUgpRHN7NYFZw+tihcxJ+dhNi4nIuNHMxNWgCE53AA=,tag:YZNL/Pv8S0hYtSt5IBE1GA==,type:str]
ntfy: ENC[AES256_GCM,data:BapVKt2WzKLMP6KsxZ32+SS0mpIy0waqUTI7Rj0yyWA1mF9bstp0VfRv/6Dna41ttecFjyLRMmlF0jLqHXcNtqmlB3lHiE5IvVcEadjGB5C1fcQKrj5CveVPecvxzc+CfMMt4tlzike9TYL2tP5siGQzU7HvpNfIlT/Qfi40j8l7eT+Tne+XAadu/GQ1CH5dWKr8gPrR8fpfw6CgDvvc05SBLlfM2LsfTxz/UNV3vAbfRLchCsqd9s9jcR4UJPoJv6HVe480HXgY5SLcZA/Gh58=,iv:MqYwns9JITCskQo+ADgWghfRCwiSV+IGdUvi568Fmrc=,tag:Re20TMCnk5EA+X9wQRYg3w==,type:str]
ntfy: ENC[AES256_GCM,data:y2evjuP49mnN8dCnS+nC6KGYEiO5ZPykgtHXQJqYoW/yq7zMpPowe5cFdKYO6MYWYFwT4Vy8okl64h8GQXZOPfqjEct2eB23GL6021ZCm5FmGJf4pYERwuYV0LC3VV74nnvTd9rDhWeSDd1awXzwkbviy7CtI55R3+ZBxRKhIYL31f4T4OHs51wldJWE6Lf8f6eNldN0M+Ki4Pxvyhbtt/A3OLmfSKhCd+eehdCABkuWaiPAu55dJS/m/b8++lQaod0Vmdbp9WlLGP5Ep7G5XwG92F5PgPr6dRa78x5AcvahVgSr8inlTVhXrue5EBzd3TAj2cIf953S2V6GKCFqhdjajbPvqzqXVxC5JuTCX9d6bWAMVGkVqeF0i33kHewM+cT3iGAYUSt38UTvCqI7UY5X0AIlZe5S8J2BCoDlRbHA7mERQrDl2Q==,iv:n+ubsZKbW2odqQeK4aqhxPxdCxtCsO7wS2wIthaQPHE=,tag:j7Ju4FrPYnKfUcy5pNQI3w==,type:str]
sops:
age:
- recipient: age17rjcght2y5p4ryr76ysnxpy2wff62sml7pyc5udcts48985j05vqpwdfq2
@ -70,7 +70,7 @@ sops:
OFloWEFuTC9GTXJsMG5NNktmdmIrY1kK0yN0ae0xNaydujV5lt2FiwXdyursG0DK
9i/B3TTAm9csDMMSTSFbiAUJDzG7kIqn++JU/cxvsGScSnhMqjEK/g==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2025-11-22T18:17:35Z"
mac: ENC[AES256_GCM,data:88NsRj8t483hQ1jWu3u+772he7G2oyybf+pcgyFoBpfrb5GZqXzlae7TpTqstRLvXLcvaXXWI+QUA9WKvuozHEZ2OPzP84JbTjj72POBaIf5k9jHwzNrbXdWPlQF0PLHjnguniDeKLMC8KI7Aypww7CM3N3Gkuyr6bVGGDIsPLw=,iv:D0O8HmtjYyTRd+ZeDkGctA79i+LVOh2f8B1vUjWYqPI=,tag:OU77+XJh9nOOo54fmj35kQ==,type:str]
lastmodified: "2025-11-24T10:30:46Z"
mac: ENC[AES256_GCM,data:yBegCnXXKimHlZ5UcPL6O9VbhdpASMd09t7m2fxLFGYgHXYFsuRda8puVpe9EiukNRJzhkWZRjJUHI+nE2cdibx5Ewaom8lbe8pKB1A7qrVSXjU+f5HTMjUdB+ACAcGlErc0wniekwSQj2LfIYknYm2nVz2M5VeDbYxz7F5PAO0=,iv:vMdsGEe1ZPQdNtSXhtwC0StiuhBVViCuBGTURep37UM=,tag:mB2kZZcrGnmChQQRc4wvTA==,type:str]
unencrypted_suffix: _unencrypted
version: 3.11.0