Compare commits
1 Commits
main
..
37078353c9
| Author | SHA1 | Date | |
|---|---|---|---|
| 37078353c9 |
Generated
+65
-65
@@ -43,11 +43,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1778620495,
|
"lastModified": 1773436376,
|
||||||
"narHash": "sha256-Gu7UhWjwKCgSiVC3Qz/Rc7cYi9DNuDTBxYzg3kfLvfM=",
|
"narHash": "sha256-OUPRrprbgN27BXHuWkMAPSCfLLQ/uwpWghEfKYN2iAg=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "aquamarine",
|
"repo": "aquamarine",
|
||||||
"rev": "be35f75ac305f430f5f9d89b5f5a4af59ca7567e",
|
"rev": "43f10d24391692bba3d762931ee35e7f17f8e8b8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -85,11 +85,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779226674,
|
"lastModified": 1773889306,
|
||||||
"narHash": "sha256-wuOkjI6pRiN4sEn/EPBRnNW5cmcpvd7xtIM8y5LooAs=",
|
"narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "65fb947964bd44fc0008faf77d1fcb7a9f40bb32",
|
"rev": "5ad85c82cc52264f4beddc934ba57f3789f28347",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -106,11 +106,11 @@
|
|||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779250628,
|
"lastModified": 1773912849,
|
||||||
"narHash": "sha256-QrHi1w+g7p58wMxcK9jOXr3oi2PRWQ+i4Sw38sL3dB4=",
|
"narHash": "sha256-j8+nTPoUiiyyMAN0bk/8AqqkApusi38laEaQ4m45KIA=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "5f8f3a12b25e29c1dd0a6363b61eba7d2f9944fe",
|
"rev": "4ce92db83efd3393ba51df6bbc06cc34f48c4475",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -237,11 +237,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779213149,
|
"lastModified": 1773898372,
|
||||||
"narHash": "sha256-Cf+p/T4Z3n9Sw0TiR3kQaIwQI+/hfvLJcoTzeq6yS3E=",
|
"narHash": "sha256-PqeDgmyI/Df3/Mv0B81FP/ZC4KuO88YRQF5ZfeFyA4k=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "bd868f769a69d3b6091a1da68a75cb83a181033c",
|
"rev": "ecf019baf47df009937b5f8c4604cee10f410a76",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -266,11 +266,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776511930,
|
"lastModified": 1772461003,
|
||||||
"narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=",
|
"narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprcursor",
|
"repo": "hyprcursor",
|
||||||
"rev": "39435900785d0c560c6ae8777d29f28617d031ef",
|
"rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -295,11 +295,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776426399,
|
"lastModified": 1772461523,
|
||||||
"narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=",
|
"narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprgraphics",
|
"repo": "hyprgraphics",
|
||||||
"rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84",
|
"rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -327,11 +327,11 @@
|
|||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779190425,
|
"lastModified": 1773865169,
|
||||||
"narHash": "sha256-C0hPhLeo3ztBXYSnpYarYjw6HDvlgZRnNyFfG5PoaVI=",
|
"narHash": "sha256-3LpwmNjKfZttXsR/CIKTn+z7GiJPeF5ENJJSS6Yjizk=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "Hyprland",
|
"repo": "Hyprland",
|
||||||
"rev": "203a121537d0868bd4d8258b58861ca970483157",
|
"rev": "d635b499e1b2b9cf54b780ca7aee2b97cadeee89",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -347,11 +347,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1778488488,
|
"lastModified": 1771502235,
|
||||||
"narHash": "sha256-6Vvr0qMRdccvJqwzrXJkqoK6lWsdyC1nMrLjoHKqoGM=",
|
"narHash": "sha256-aH8h5ZOiyEGtHmEyuE/eFxx8TN7a+NGDnl4V+dbzJ6E=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "contrib",
|
"repo": "contrib",
|
||||||
"rev": "55b1393a23d6e4968ce6da704c8095f7e5e9fa3c",
|
"rev": "918f266dddae39fa4184a1b8bf51ec5381cf29f7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -393,11 +393,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776426575,
|
"lastModified": 1772467975,
|
||||||
"narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=",
|
"narHash": "sha256-kipyuDBxrZq+beYpZqWzGvFWm4QbayW9agAvi94vDXY=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprland-guiutils",
|
"repo": "hyprland-guiutils",
|
||||||
"rev": "a968d211048e3ed538e47b84cb3649299578f19d",
|
"rev": "5e1c6b9025aaf4d578f3eff7c0eb1f0c197a9507",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -447,11 +447,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1777320127,
|
"lastModified": 1772459629,
|
||||||
"narHash": "sha256-Qu+Wf2Bp5qUjyn2YpZNq8a7JyzTGowhT1knrwE38a9U=",
|
"narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprlang",
|
"repo": "hyprlang",
|
||||||
"rev": "090117506ddc3d7f26e650ff344d378c2ec329cc",
|
"rev": "7615ee388de18239a4ab1400946f3d0e498a8186",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -524,11 +524,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1778234770,
|
"lastModified": 1773436263,
|
||||||
"narHash": "sha256-jAcsogZwWMfXT9MfXxZzkwliAqIuZUV0p71h6Ba9ReE=",
|
"narHash": "sha256-n+2xFJngUkBqUJD5FsbVnYEHBTyDFSqtBIwQIGPXWWo=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprutils",
|
"repo": "hyprutils",
|
||||||
"rev": "a2dbd8a4cc51f7cbe4224732668392bb1aa79df2",
|
"rev": "5e228db6821380a5875d5643176c5c46a47b8134",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -549,11 +549,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1777159683,
|
"lastModified": 1772459835,
|
||||||
"narHash": "sha256-Jxixw6wZphUp+nHYxOKUYSckL17QMBx2d5Zp0rJHr1g=",
|
"narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprwayland-scanner",
|
"repo": "hyprwayland-scanner",
|
||||||
"rev": "b8632713a6beaf28b56f2a7b0ab2fb7088dbb404",
|
"rev": "0a692d4a645165eebd65f109146b8861e3a925e7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -578,11 +578,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1778410714,
|
"lastModified": 1773074819,
|
||||||
"narHash": "sha256-o6RzFj4nJXaPRY7EM01siuCQeT41RfwwmcmFQqwFJJg=",
|
"narHash": "sha256-qRqYnXiKoJLRTcfaRukn7EifmST2IVBUMZOeZMAc5UA=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprwire",
|
"repo": "hyprwire",
|
||||||
"rev": "85148a8e612808cf5ddb25d0b3c5840f3498a7dc",
|
"rev": "f68afd0e73687598cc2774804fedad76693046f0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -719,11 +719,11 @@
|
|||||||
"systems": "systems_5"
|
"systems": "systems_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1778951860,
|
"lastModified": 1773491467,
|
||||||
"narHash": "sha256-aFjBC3AVLh/bsgcsoI6Z/yQmh/NABffwHJIqQOTj+Tg=",
|
"narHash": "sha256-PuCDdZyWQRP1F0fQ7urr+mJ5szDyHBcfqBv4jBuKit0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-jetbrains-plugins",
|
"repo": "nix-jetbrains-plugins",
|
||||||
"rev": "68930eefa5e77fc6bb7977635c83a003683c2f11",
|
"rev": "6f77b7d7a109a8a11fa3e7a24a6051d812aa2a77",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -734,11 +734,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779099457,
|
"lastModified": 1773533765,
|
||||||
"narHash": "sha256-u73aVD/lUmmT3JV+kPDztl7zPwQKd0eobD1AbJltaGs=",
|
"narHash": "sha256-qonGfS2lzCgCl59Zl63jF6dIRRpvW3AJooBGMaXjHiY=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "8792fab9d4a6454a9201675f01326f827ce35ead",
|
"rev": "f8e82243fd601afb9f59ad230958bd073795cbfe",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -766,11 +766,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779102034,
|
"lastModified": 1773814637,
|
||||||
"narHash": "sha256-vZJZjLo513IeI8hjzHFc6TDezUd4uCE2Eq4SNO3DNNg=",
|
"narHash": "sha256-GNU+ooRmrHLfjlMsKdn0prEKVa0faVanm0jrgu1J/gY=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "687f05a9184cad4eaf905c48b63649e3a86f5433",
|
"rev": "fea3b367d61c1a6592bc47c72f40a9f3e6a53e96",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -782,11 +782,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1778869304,
|
"lastModified": 1773821835,
|
||||||
"narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
|
"narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
|
"rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -827,11 +827,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1778507602,
|
"lastModified": 1772893680,
|
||||||
"narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=",
|
"narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a",
|
"rev": "8baab586afc9c9b57645a734c820e4ac0a604af9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -944,11 +944,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1780482259,
|
"lastModified": 1739029248,
|
||||||
"narHash": "sha256-buOczAkw78U+g7DYcB7nMabTGzQoN15HtVE3y0kIt3I=",
|
"narHash": "sha256-ux/Udy0Mhs66P/EQQ8S+xIuXRm9UHEYwSy12IZtlbnA=",
|
||||||
"ref": "master",
|
"ref": "master",
|
||||||
"rev": "b9ee418d14d6cb500506f9ef0cb9d54a8e78afa9",
|
"rev": "222a8f6dde2e9270f6390b5e1e83c7ae1ea48290",
|
||||||
"revCount": 373,
|
"revCount": 371,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://gitea@git.ppp.pm:1122/alex/whib.git"
|
"url": "ssh://gitea@git.ppp.pm:1122/alex/whib.git"
|
||||||
},
|
},
|
||||||
@@ -965,11 +965,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1780483645,
|
"lastModified": 1761508816,
|
||||||
"narHash": "sha256-Nr0WTh72uBCSO5jCcvHPE+4dqAPn07HZ5U1lAE4/3II=",
|
"narHash": "sha256-adV/lyxcmuopyuzZ49v46Yt0gft+ioEL4yl1S+vUbus=",
|
||||||
"ref": "master",
|
"ref": "master",
|
||||||
"rev": "14f98eced1ccf1e62493ad65eb38502b38db5cba",
|
"rev": "ab10bf50cb6b023a1b99f91c7e8d550231135eef",
|
||||||
"revCount": 224,
|
"revCount": 223,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://gitea@git.ppp.pm:1122/alex/whib-react.git"
|
"url": "ssh://gitea@git.ppp.pm:1122/alex/whib-react.git"
|
||||||
},
|
},
|
||||||
@@ -1007,11 +1007,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1778265244,
|
"lastModified": 1772669058,
|
||||||
"narHash": "sha256-8jlPtGSsv/CQY6tVVyLF4Jjd0gnS+Zbn9yk/V13A9nM=",
|
"narHash": "sha256-XhnY0aRuDo5LT8pmJVPofPOgO2hAR7T+XRoaQxtNPzQ=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "xdg-desktop-portal-hyprland",
|
"repo": "xdg-desktop-portal-hyprland",
|
||||||
"rev": "813ea5ca9a1702a9a2d1f5836bc00172ef698968",
|
"rev": "906d0ac159803a7df2dc1f948df9327670380f69",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -79,16 +79,11 @@
|
|||||||
{ device = config.disko.devices.disk.root.device; }
|
{ device = config.disko.devices.disk.root.device; }
|
||||||
{ device = config.disko.devices.disk.disk1.device; }
|
{ device = config.disko.devices.disk.disk1.device; }
|
||||||
{ device = config.disko.devices.disk.disk2.device; }
|
{ device = config.disko.devices.disk.disk2.device; }
|
||||||
{ device = config.disko.devices.disk.disk3.device; }
|
|
||||||
{ device = config.disko.devices.disk.disk4.device; }
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
services.zfs.autoScrub.enable = true;
|
services.zfs.autoScrub.enable = true;
|
||||||
|
|
||||||
# Don't force-import the pool if it appears in use elsewhere; safer default in 26.11+.
|
|
||||||
boot.zfs.forceImportRoot = false;
|
|
||||||
|
|
||||||
networking.hostId = "0a9474e7"; # Required by ZFS
|
networking.hostId = "0a9474e7"; # Required by ZFS
|
||||||
disko.devices = {
|
disko.devices = {
|
||||||
disk = {
|
disk = {
|
||||||
|
|||||||
@@ -33,19 +33,6 @@
|
|||||||
"--http-timeout=60"
|
"--http-timeout=60"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
"romm.ppp.pm" = {
|
|
||||||
dnsProvider = "hetzner";
|
|
||||||
environmentFile = config.age.secrets.hetzner-dns.path;
|
|
||||||
group = "nginx";
|
|
||||||
|
|
||||||
extraLegoFlags = [
|
|
||||||
"--dns.resolvers=1.1.1.1:53,8.8.8.8:53"
|
|
||||||
"--dns.propagation-wait=60s"
|
|
||||||
"--dns-timeout=60"
|
|
||||||
"--http-timeout=60"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -18,12 +18,10 @@ in
|
|||||||
transmission.enable = true;
|
transmission.enable = true;
|
||||||
audiobookshelf.enable = true;
|
audiobookshelf.enable = true;
|
||||||
jellyfin.enable = true;
|
jellyfin.enable = true;
|
||||||
immich.enable = false;
|
immich.enable = true;
|
||||||
navidrome.enable = true;
|
navidrome.enable = true;
|
||||||
komga.enable = true;
|
komga.enable = true;
|
||||||
romm.enable = true;
|
|
||||||
homepage.enable = true;
|
homepage.enable = true;
|
||||||
disk-smart.enable = true;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,159 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
enabled = config.mod.disk-smart.enable;
|
|
||||||
|
|
||||||
disks = [
|
|
||||||
{ path = "/dev/disk/by-id/ata-ST8000VN004-3CP101_WWZ8QCG4"; name = "seagate_8tb_1"; label = "Seagate 8TB #1"; }
|
|
||||||
{ path = "/dev/disk/by-id/ata-ST8000VN004-3CP101_WWZ8QDJ5"; name = "seagate_8tb_2"; label = "Seagate 8TB #2"; }
|
|
||||||
{ path = "/dev/disk/by-id/ata-TOSHIBA_MG10ACA20TE_85K2A0UCF4MJ"; name = "toshiba_20tb_1"; label = "Toshiba 20TB #1"; }
|
|
||||||
{ path = "/dev/disk/by-id/ata-TOSHIBA_MG10ACA20TE_85K2A0V6F4MJ"; name = "toshiba_20tb_2"; label = "Toshiba 20TB #2"; }
|
|
||||||
];
|
|
||||||
|
|
||||||
outputDir = "/var/lib/disk-smart";
|
|
||||||
|
|
||||||
collectScript = pkgs.writeShellScript "disk-smart-collect" ''
|
|
||||||
set -euo pipefail
|
|
||||||
export PATH="${lib.makeBinPath [ pkgs.smartmontools pkgs.jq pkgs.coreutils ]}"
|
|
||||||
|
|
||||||
mkdir -p ${outputDir}
|
|
||||||
|
|
||||||
result="{"
|
|
||||||
|
|
||||||
${lib.concatMapStringsSep "\n" (disk: ''
|
|
||||||
raw=$(smartctl -j -A -H ${disk.path} 2>/dev/null || true)
|
|
||||||
|
|
||||||
temp=$(echo "$raw" | jq -r '.temperature.current // empty')
|
|
||||||
power_on=$(echo "$raw" | jq -r '.power_on_time.hours // empty')
|
|
||||||
smart_status=$(echo "$raw" | jq -r '.smart_status.passed // empty')
|
|
||||||
reallocated=$(echo "$raw" | jq -r '[.ata_smart_attributes.table[] | select(.name == "Reallocated_Sector_Ct")][0].raw.value // empty')
|
|
||||||
pending=$(echo "$raw" | jq -r '[.ata_smart_attributes.table[] | select(.name == "Current_Pending_Sector")][0].raw.value // empty')
|
|
||||||
|
|
||||||
result="$result\"${disk.name}\":{\"temperature\":$temp,\"power_on_hours\":$power_on,\"smart_passed\":$smart_status,\"reallocated_sectors\":$reallocated,\"pending_sectors\":$pending},"
|
|
||||||
'') disks}
|
|
||||||
|
|
||||||
# Remove trailing comma, close object
|
|
||||||
result="''${result%,}}"
|
|
||||||
|
|
||||||
echo "$result" | jq . > ${outputDir}/smart.json.tmp
|
|
||||||
mv ${outputDir}/smart.json.tmp ${outputDir}/smart.json
|
|
||||||
'';
|
|
||||||
|
|
||||||
indent = prefix: s:
|
|
||||||
lib.concatMapStringsSep "\n"
|
|
||||||
(line: if line == "" then line else prefix + line)
|
|
||||||
(lib.splitString "\n" s);
|
|
||||||
|
|
||||||
mkSensor = disk: ''
|
|
||||||
- name: "${disk.label} Temperature"
|
|
||||||
value_template: "{{ value_json.${disk.name}.temperature }}"
|
|
||||||
unit_of_measurement: "°C"
|
|
||||||
device_class: temperature
|
|
||||||
state_class: measurement
|
|
||||||
- name: "${disk.label} Power On Hours"
|
|
||||||
value_template: "{{ value_json.${disk.name}.power_on_hours }}"
|
|
||||||
unit_of_measurement: "h"
|
|
||||||
state_class: total_increasing
|
|
||||||
- name: "${disk.label} SMART Passed"
|
|
||||||
value_template: "{{ value_json.${disk.name}.smart_passed }}"
|
|
||||||
- name: "${disk.label} Reallocated Sectors"
|
|
||||||
value_template: "{{ value_json.${disk.name}.reallocated_sectors }}"
|
|
||||||
state_class: measurement
|
|
||||||
- name: "${disk.label} Pending Sectors"
|
|
||||||
value_template: "{{ value_json.${disk.name}.pending_sectors }}"
|
|
||||||
state_class: measurement
|
|
||||||
'';
|
|
||||||
|
|
||||||
sensorYaml = indent " " (lib.concatMapStrings mkSensor disks);
|
|
||||||
|
|
||||||
sectorEntities = lib.concatMap (disk: [
|
|
||||||
"sensor.${disk.name}_reallocated_sectors"
|
|
||||||
"sensor.${disk.name}_pending_sectors"
|
|
||||||
]) disks;
|
|
||||||
|
|
||||||
sectorEntitiesYaml = lib.concatMapStringsSep "\n"
|
|
||||||
(id: " - ${id}") sectorEntities;
|
|
||||||
|
|
||||||
smartPassedEntities = map (disk: "sensor.${disk.name}_smart_passed") disks;
|
|
||||||
|
|
||||||
smartPassedEntitiesYaml = lib.concatMapStringsSep "\n"
|
|
||||||
(id: " - ${id}") smartPassedEntities;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options = {
|
|
||||||
mod.disk-smart = {
|
|
||||||
enable = lib.mkEnableOption "Enable disk SMART monitoring module";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf enabled {
|
|
||||||
mod.home-assistant.extraConfig = ''
|
|
||||||
rest:
|
|
||||||
- resource: http://127.0.0.1:9633/smart.json
|
|
||||||
scan_interval: 60
|
|
||||||
sensor:
|
|
||||||
${sensorYaml}
|
|
||||||
automation disk_smart:
|
|
||||||
- alias: "Disk sector count increased"
|
|
||||||
trigger:
|
|
||||||
- platform: state
|
|
||||||
entity_id:
|
|
||||||
${sectorEntitiesYaml}
|
|
||||||
condition:
|
|
||||||
- condition: template
|
|
||||||
value_template: "{{ trigger.from_state.state | int(-1) >= 0 and trigger.to_state.state | int(0) > trigger.from_state.state | int(0) }}"
|
|
||||||
action:
|
|
||||||
- service: notify.mobile_app_pixel_9_pro
|
|
||||||
data:
|
|
||||||
title: "Disk SMART warning"
|
|
||||||
message: "{{ trigger.to_state.attributes.friendly_name }} increased from {{ trigger.from_state.state }} to {{ trigger.to_state.state }}"
|
|
||||||
- alias: "Disk SMART check failed"
|
|
||||||
trigger:
|
|
||||||
- platform: state
|
|
||||||
entity_id:
|
|
||||||
${smartPassedEntitiesYaml}
|
|
||||||
condition:
|
|
||||||
- condition: template
|
|
||||||
value_template: "{{ trigger.to_state.state | lower == 'false' }}"
|
|
||||||
action:
|
|
||||||
- service: notify.mobile_app_pixel_9_pro
|
|
||||||
data:
|
|
||||||
title: "Disk SMART FAILURE"
|
|
||||||
message: "{{ trigger.to_state.attributes.friendly_name }} reports SMART failure — drive is likely failing"
|
|
||||||
'';
|
|
||||||
|
|
||||||
systemd.services.disk-smart-collect = {
|
|
||||||
description = "Collect disk SMART data";
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
ExecStart = collectScript;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.timers.disk-smart-collect = {
|
|
||||||
description = "Periodically collect disk SMART data";
|
|
||||||
wantedBy = [ "timers.target" ];
|
|
||||||
timerConfig = {
|
|
||||||
OnBootSec = "1min";
|
|
||||||
OnUnitActiveSec = "1min";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nginx.virtualHosts."127.0.0.1" = {
|
|
||||||
listen = [
|
|
||||||
{ addr = "127.0.0.1"; port = 9633; }
|
|
||||||
];
|
|
||||||
|
|
||||||
locations."= /smart.json" = {
|
|
||||||
alias = "${outputDir}/smart.json";
|
|
||||||
extraConfig = ''
|
|
||||||
default_type application/json;
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -6,42 +6,8 @@
|
|||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
nginxEnabled = config.mod.nginx.enable;
|
nginxEnabled = config.mod.nginx.enable;
|
||||||
cfg = config.mod.home-assistant;
|
|
||||||
|
|
||||||
configFile = pkgs.writeText "ha-configuration.yaml" ''
|
script = pkgs.writeShellScript "bt-reset" ''
|
||||||
# Loads default set of integrations. Do not remove.
|
|
||||||
default_config:
|
|
||||||
|
|
||||||
http:
|
|
||||||
use_x_forwarded_for: true
|
|
||||||
trusted_proxies:
|
|
||||||
- 127.0.0.1
|
|
||||||
|
|
||||||
# Load frontend themes from the themes folder
|
|
||||||
frontend:
|
|
||||||
themes: !include_dir_merge_named themes
|
|
||||||
|
|
||||||
automation: !include automations.yaml
|
|
||||||
script: !include scripts.yaml
|
|
||||||
scene: !include scenes.yaml
|
|
||||||
|
|
||||||
recorder:
|
|
||||||
purge_keep_days: 365
|
|
||||||
|
|
||||||
alert:
|
|
||||||
fridge_door:
|
|
||||||
name: Fridge is open
|
|
||||||
done_message: Fride is closed
|
|
||||||
entity_id: binary_sensor.kyldorr
|
|
||||||
state: "on"
|
|
||||||
repeat: 2
|
|
||||||
skip_first: true
|
|
||||||
notifiers:
|
|
||||||
- mobile_app_pixel_9_pro
|
|
||||||
|
|
||||||
${cfg.extraConfig}'';
|
|
||||||
|
|
||||||
btResetScript = pkgs.writeShellScript "bt-reset" ''
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
export PATH="${
|
export PATH="${
|
||||||
lib.makeBinPath [
|
lib.makeBinPath [
|
||||||
@@ -96,194 +62,181 @@ ${cfg.extraConfig}'';
|
|||||||
'';
|
'';
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options = {
|
mod.homepage.services = [
|
||||||
mod.home-assistant = {
|
{
|
||||||
extraConfig = lib.mkOption {
|
name = "Home Assistant";
|
||||||
type = lib.types.lines;
|
port = 8123;
|
||||||
default = "";
|
description = "Home automation";
|
||||||
description = "Extra YAML to append to Home Assistant's configuration.yaml";
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
hardware.bluetooth.enable = true;
|
||||||
|
|
||||||
|
virtualisation.oci-containers = {
|
||||||
|
backend = "podman";
|
||||||
|
|
||||||
|
containers.homeassistant = {
|
||||||
|
image = "ghcr.io/home-assistant/home-assistant:stable";
|
||||||
|
|
||||||
|
volumes = [
|
||||||
|
"/home/alex/.config/home-assistant:/config"
|
||||||
|
# Pass in bluetooth
|
||||||
|
"/run/dbus:/run/dbus:ro"
|
||||||
|
];
|
||||||
|
|
||||||
|
environment.TZ = "Europe/Stockholm";
|
||||||
|
|
||||||
|
extraOptions = [
|
||||||
|
"--network=host"
|
||||||
|
|
||||||
|
# Allows HA to perform low-level network operations (scan/reset adapter)
|
||||||
|
"--cap-add=NET_ADMIN"
|
||||||
|
"--cap-add=NET_RAW"
|
||||||
|
|
||||||
|
# Pass in Zigbee antenna
|
||||||
|
"--device=/dev/serial/by-id/usb-Nabu_Casa_ZBT-2_9C139EAAD464-if00:/dev/ttyACM0"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
services = {
|
||||||
|
blueman.enable = true;
|
||||||
|
|
||||||
|
nginx = lib.mkIf nginxEnabled {
|
||||||
|
recommendedProxySettings = true;
|
||||||
|
|
||||||
|
virtualHosts."ha.ppp.pm" = {
|
||||||
|
forceSSL = true;
|
||||||
|
useACMEHost = "ha.ppp.pm";
|
||||||
|
|
||||||
|
extraConfig = ''
|
||||||
|
proxy_buffering off;
|
||||||
|
'';
|
||||||
|
|
||||||
|
locations."/" = {
|
||||||
|
proxyPass = "http://127.0.0.1:8123";
|
||||||
|
proxyWebsockets = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Trigger reset via udev when hci0 disappears
|
||||||
|
udev.extraRules = ''
|
||||||
|
ACTION=="remove", SUBSYSTEM=="bluetooth", KERNEL=="hci0", \
|
||||||
|
TAG+="systemd", ENV{SYSTEMD_WANTS}+="bt-reset.service"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd = {
|
||||||
|
services = {
|
||||||
|
# Trigger reset on bluetoothd failure
|
||||||
|
bluetooth = {
|
||||||
|
unitConfig.OnFailure = [ "bt-reset.service" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
bt-reset = {
|
||||||
|
description = "Reset Bluetooth adapter";
|
||||||
|
after = [ "bluetooth.service" ];
|
||||||
|
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
ExecStart = script;
|
||||||
|
|
||||||
|
Restart = "on-failure";
|
||||||
|
RestartSec = "10s";
|
||||||
|
StartLimitIntervalSec = "120";
|
||||||
|
StartLimitBurst = 3;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
timers.bt-reset = {
|
||||||
|
description = "Periodically reset Bluetooth adapter";
|
||||||
|
wantedBy = [ "timers.target" ];
|
||||||
|
timerConfig = {
|
||||||
|
OnBootSec = "5min"; # first run 5 min after boot
|
||||||
|
OnUnitActiveSec = "4h"; # then every 4 hours
|
||||||
|
RandomizedDelaySec = "5min";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
user = {
|
||||||
|
timers = {
|
||||||
|
"update-hetzner-dns" = {
|
||||||
|
unitConfig = {
|
||||||
|
Description = "updates Hetzner DNS records";
|
||||||
|
};
|
||||||
|
|
||||||
|
timerConfig = {
|
||||||
|
Unit = "update-hetzner-dns.service";
|
||||||
|
OnCalendar = "*-*-* *:00/30:00";
|
||||||
|
Persistent = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
wantedBy = [ "timers.target" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
services = {
|
||||||
|
"update-hetzner-dns" = {
|
||||||
|
unitConfig = {
|
||||||
|
Description = "updates Hetzner DNS records";
|
||||||
|
};
|
||||||
|
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "exec";
|
||||||
|
EnvironmentFile = config.age.secrets.hetzner-dns.path;
|
||||||
|
};
|
||||||
|
|
||||||
|
path = [
|
||||||
|
pkgs.curl
|
||||||
|
pkgs.coreutils
|
||||||
|
pkgs.jq
|
||||||
|
];
|
||||||
|
|
||||||
|
script = ''
|
||||||
|
SUBDOMAINS="ha komga"
|
||||||
|
INTERFACE="enp3s0"
|
||||||
|
|
||||||
|
CURRENT_IP=$(curl -s --fail --interface "$INTERFACE" ifconfig.me)
|
||||||
|
|
||||||
|
for SUBDOMAIN in $SUBDOMAINS; do
|
||||||
|
LAST_IP_FILE="/tmp/hetzner-dns-''${SUBDOMAIN}-ip"
|
||||||
|
|
||||||
|
LAST_IP=""
|
||||||
|
if [[ -f "$LAST_IP_FILE" ]]; then
|
||||||
|
LAST_IP=$(cat "$LAST_IP_FILE")
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$CURRENT_IP" == "$LAST_IP" ]]; then
|
||||||
|
echo "$SUBDOMAIN: IP unchanged, NOOP update."
|
||||||
|
else
|
||||||
|
echo "$SUBDOMAIN: Updating IP"
|
||||||
|
|
||||||
|
JSON_BODY=$(jq -n --arg ip "$CURRENT_IP" '{records: [{value: $ip}]}')
|
||||||
|
|
||||||
|
curl \
|
||||||
|
--fail \
|
||||||
|
-X POST \
|
||||||
|
-H "Authorization: Bearer $HETZNER_API_TOKEN" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d "$JSON_BODY" \
|
||||||
|
"https://api.hetzner.cloud/v1/zones/ppp.pm/rrsets/''${SUBDOMAIN}/A/actions/set_records" \
|
||||||
|
&& echo $CURRENT_IP > $LAST_IP_FILE
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = {
|
age = {
|
||||||
mod.homepage.services = [
|
secrets = {
|
||||||
{
|
"hetzner-dns" = {
|
||||||
name = "Home Assistant";
|
file = ../../../../secrets/manatee/hetzner-dns.age;
|
||||||
port = 8123;
|
owner = "alex";
|
||||||
description = "Home automation";
|
group = "users";
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
hardware.bluetooth.enable = true;
|
|
||||||
|
|
||||||
virtualisation.oci-containers = {
|
|
||||||
backend = "podman";
|
|
||||||
|
|
||||||
containers.homeassistant = {
|
|
||||||
image = "ghcr.io/home-assistant/home-assistant:stable";
|
|
||||||
|
|
||||||
volumes = [
|
|
||||||
"/home/alex/.config/home-assistant:/config"
|
|
||||||
"${configFile}:/config/configuration.yaml:ro"
|
|
||||||
# Pass in bluetooth
|
|
||||||
"/run/dbus:/run/dbus:ro"
|
|
||||||
];
|
|
||||||
|
|
||||||
environment.TZ = "Europe/Stockholm";
|
|
||||||
|
|
||||||
extraOptions = [
|
|
||||||
"--network=host"
|
|
||||||
|
|
||||||
# Allows HA to perform low-level network operations (scan/reset adapter)
|
|
||||||
"--cap-add=NET_ADMIN"
|
|
||||||
"--cap-add=NET_RAW"
|
|
||||||
|
|
||||||
# Pass in Zigbee antenna
|
|
||||||
"--device=/dev/serial/by-id/usb-Nabu_Casa_ZBT-2_9C139EAAD464-if00:/dev/ttyACM0"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services = {
|
|
||||||
blueman.enable = true;
|
|
||||||
|
|
||||||
nginx = lib.mkIf nginxEnabled {
|
|
||||||
recommendedProxySettings = true;
|
|
||||||
|
|
||||||
virtualHosts."ha.ppp.pm" = {
|
|
||||||
forceSSL = true;
|
|
||||||
useACMEHost = "ha.ppp.pm";
|
|
||||||
|
|
||||||
extraConfig = ''
|
|
||||||
proxy_buffering off;
|
|
||||||
'';
|
|
||||||
|
|
||||||
locations."/" = {
|
|
||||||
proxyPass = "http://127.0.0.1:8123";
|
|
||||||
proxyWebsockets = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Trigger reset via udev when hci0 disappears
|
|
||||||
udev.extraRules = ''
|
|
||||||
ACTION=="remove", SUBSYSTEM=="bluetooth", KERNEL=="hci0", \
|
|
||||||
TAG+="systemd", ENV{SYSTEMD_WANTS}+="bt-reset.service"
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd = {
|
|
||||||
services = {
|
|
||||||
# Trigger reset on bluetoothd failure
|
|
||||||
bluetooth = {
|
|
||||||
unitConfig.OnFailure = [ "bt-reset.service" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
bt-reset = {
|
|
||||||
description = "Reset Bluetooth adapter";
|
|
||||||
after = [ "bluetooth.service" ];
|
|
||||||
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
ExecStart = btResetScript;
|
|
||||||
|
|
||||||
Restart = "on-failure";
|
|
||||||
RestartSec = "10s";
|
|
||||||
StartLimitIntervalSec = "120";
|
|
||||||
StartLimitBurst = 3;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
timers.bt-reset = {
|
|
||||||
description = "Periodically reset Bluetooth adapter";
|
|
||||||
wantedBy = [ "timers.target" ];
|
|
||||||
timerConfig = {
|
|
||||||
OnBootSec = "5min"; # first run 5 min after boot
|
|
||||||
OnUnitActiveSec = "4h"; # then every 4 hours
|
|
||||||
RandomizedDelaySec = "5min";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
user = {
|
|
||||||
timers = {
|
|
||||||
"update-hetzner-dns" = {
|
|
||||||
unitConfig = {
|
|
||||||
Description = "updates Hetzner DNS records";
|
|
||||||
};
|
|
||||||
|
|
||||||
timerConfig = {
|
|
||||||
Unit = "update-hetzner-dns.service";
|
|
||||||
OnCalendar = "*-*-* *:00/30:00";
|
|
||||||
Persistent = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
wantedBy = [ "timers.target" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services = {
|
|
||||||
"update-hetzner-dns" = {
|
|
||||||
unitConfig = {
|
|
||||||
Description = "updates Hetzner DNS records";
|
|
||||||
};
|
|
||||||
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "exec";
|
|
||||||
EnvironmentFile = config.age.secrets.hetzner-dns.path;
|
|
||||||
};
|
|
||||||
|
|
||||||
path = [
|
|
||||||
pkgs.curl
|
|
||||||
pkgs.coreutils
|
|
||||||
pkgs.jq
|
|
||||||
];
|
|
||||||
|
|
||||||
script = ''
|
|
||||||
SUBDOMAINS="ha komga romm"
|
|
||||||
INTERFACE="enp3s0"
|
|
||||||
|
|
||||||
CURRENT_IP=$(curl -s --fail --interface "$INTERFACE" ifconfig.me)
|
|
||||||
|
|
||||||
for SUBDOMAIN in $SUBDOMAINS; do
|
|
||||||
LAST_IP_FILE="/tmp/hetzner-dns-''${SUBDOMAIN}-ip"
|
|
||||||
|
|
||||||
LAST_IP=""
|
|
||||||
if [[ -f "$LAST_IP_FILE" ]]; then
|
|
||||||
LAST_IP=$(cat "$LAST_IP_FILE")
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "$CURRENT_IP" == "$LAST_IP" ]]; then
|
|
||||||
echo "$SUBDOMAIN: IP unchanged, NOOP update."
|
|
||||||
else
|
|
||||||
echo "$SUBDOMAIN: Updating IP"
|
|
||||||
|
|
||||||
JSON_BODY=$(jq -n --arg ip "$CURRENT_IP" '{records: [{value: $ip}]}')
|
|
||||||
|
|
||||||
curl \
|
|
||||||
--fail \
|
|
||||||
-X POST \
|
|
||||||
-H "Authorization: Bearer $HETZNER_API_TOKEN" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d "$JSON_BODY" \
|
|
||||||
"https://api.hetzner.cloud/v1/zones/ppp.pm/rrsets/''${SUBDOMAIN}/A/actions/set_records" \
|
|
||||||
&& echo $CURRENT_IP > $LAST_IP_FILE
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
age = {
|
|
||||||
secrets = {
|
|
||||||
"hetzner-dns" = {
|
|
||||||
file = ../../../../secrets/manatee/hetzner-dns.age;
|
|
||||||
owner = "alex";
|
|
||||||
group = "users";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ in
|
|||||||
imports = [
|
imports = [
|
||||||
inputs.komga-comictracker.nixosModules.default
|
inputs.komga-comictracker.nixosModules.default
|
||||||
inputs.komga-bookmanager.nixosModules.default
|
inputs.komga-bookmanager.nixosModules.default
|
||||||
inputs.komga-reading-stats.nixosModules.default
|
|
||||||
];
|
];
|
||||||
|
|
||||||
config = lib.mkIf enabled {
|
config = lib.mkIf enabled {
|
||||||
@@ -143,14 +142,10 @@ in
|
|||||||
|
|
||||||
"komga-reading-stats-claude-api-key" = {
|
"komga-reading-stats-claude-api-key" = {
|
||||||
file = ../../../../secrets/manatee/komga-reading-stats-claude-api-key.age;
|
file = ../../../../secrets/manatee/komga-reading-stats-claude-api-key.age;
|
||||||
mode = "0440";
|
|
||||||
group = "komga-reading-stats";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
"komga-reading-stats-komga-api-key" = {
|
"komga-reading-stats-komga-api-key" = {
|
||||||
file = ../../../../secrets/manatee/komga-reading-stats-komga-api-key.age;
|
file = ../../../../secrets/manatee/komga-reading-stats-claude-api-key.age;
|
||||||
mode = "0440";
|
|
||||||
group = "komga-reading-stats";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,216 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
enabled = config.mod.romm.enable;
|
|
||||||
nginxEnabled = config.mod.nginx.enable;
|
|
||||||
|
|
||||||
configFile = pkgs.writeText "romm-config.yml" ''
|
|
||||||
filesystem:
|
|
||||||
skip_hash_calculation: false
|
|
||||||
exclude:
|
|
||||||
roms:
|
|
||||||
single_file:
|
|
||||||
extensions:
|
|
||||||
- xml
|
|
||||||
- txt
|
|
||||||
- nfo
|
|
||||||
- dat
|
|
||||||
- jpg
|
|
||||||
- png
|
|
||||||
names:
|
|
||||||
- '._*'
|
|
||||||
- 'Thumbs.db'
|
|
||||||
- '.DS_Store'
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options = {
|
|
||||||
mod.romm = {
|
|
||||||
enable = lib.mkEnableOption "Enable romm module";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf enabled {
|
|
||||||
mod.homepage.services = [
|
|
||||||
{
|
|
||||||
name = "RomM";
|
|
||||||
port = 8085;
|
|
||||||
description = "ROM library manager";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
"d /var/lib/romm 0755 root root -"
|
|
||||||
"d /var/lib/romm/db 0755 root root -"
|
|
||||||
"d /var/lib/romm/redis 0755 999 1000 -"
|
|
||||||
"d /var/lib/romm/resources 0755 root root -"
|
|
||||||
"d /var/lib/romm/assets 0755 root root -"
|
|
||||||
];
|
|
||||||
|
|
||||||
systemd.services.romm-net = {
|
|
||||||
description = "Create Podman network for RomM";
|
|
||||||
after = [ "podman.service" ];
|
|
||||||
requires = [ "podman.service" ];
|
|
||||||
before = [
|
|
||||||
"podman-romm.service"
|
|
||||||
"podman-romm-db.service"
|
|
||||||
"podman-romm-redis.service"
|
|
||||||
];
|
|
||||||
requiredBy = [
|
|
||||||
"podman-romm.service"
|
|
||||||
"podman-romm-db.service"
|
|
||||||
"podman-romm-redis.service"
|
|
||||||
];
|
|
||||||
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
RemainAfterExit = true;
|
|
||||||
ExecStart = pkgs.writeShellScript "romm-net-create" ''
|
|
||||||
${pkgs.podman}/bin/podman network exists romm-net \
|
|
||||||
|| ${pkgs.podman}/bin/podman network create romm-net
|
|
||||||
'';
|
|
||||||
ExecStop = "${pkgs.podman}/bin/podman network rm -f romm-net";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
virtualisation.oci-containers = {
|
|
||||||
backend = "podman";
|
|
||||||
|
|
||||||
containers.romm-db = {
|
|
||||||
image = "mariadb:latest";
|
|
||||||
|
|
||||||
environment = {
|
|
||||||
MARIADB_DATABASE = "romm";
|
|
||||||
MARIADB_USER = "romm";
|
|
||||||
};
|
|
||||||
|
|
||||||
environmentFiles = [
|
|
||||||
config.age.secrets.romm-db-password.path
|
|
||||||
];
|
|
||||||
|
|
||||||
volumes = [
|
|
||||||
"/var/lib/romm/db:/var/lib/mysql"
|
|
||||||
];
|
|
||||||
|
|
||||||
extraOptions = [
|
|
||||||
"--network=romm-net"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
containers.romm-redis = {
|
|
||||||
image = "redis:alpine";
|
|
||||||
|
|
||||||
volumes = [
|
|
||||||
"/var/lib/romm/redis:/data"
|
|
||||||
];
|
|
||||||
|
|
||||||
extraOptions = [
|
|
||||||
"--network=romm-net"
|
|
||||||
"--user=root"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
containers.romm = {
|
|
||||||
image = "rommapp/romm:latest";
|
|
||||||
|
|
||||||
dependsOn = [
|
|
||||||
"romm-db"
|
|
||||||
"romm-redis"
|
|
||||||
];
|
|
||||||
|
|
||||||
environment = {
|
|
||||||
DB_HOST = "romm-db";
|
|
||||||
DB_PORT = "3306";
|
|
||||||
DB_NAME = "romm";
|
|
||||||
DB_USER = "romm";
|
|
||||||
REDIS_HOST = "romm-redis";
|
|
||||||
REDIS_PORT = "6379";
|
|
||||||
ROMM_AUTH_ENABLED = "true";
|
|
||||||
};
|
|
||||||
|
|
||||||
environmentFiles = [
|
|
||||||
config.age.secrets.romm-auth-secret-key.path
|
|
||||||
config.age.secrets.romm-db-password.path
|
|
||||||
config.age.secrets.romm-metadata-api-keys.path
|
|
||||||
];
|
|
||||||
|
|
||||||
ports = [
|
|
||||||
"127.0.0.1:8086:8080"
|
|
||||||
];
|
|
||||||
|
|
||||||
volumes = [
|
|
||||||
"${configFile}:/romm/config/config.yml:ro"
|
|
||||||
"/mnt/media/public/games:/romm/library"
|
|
||||||
"/var/lib/romm/resources:/romm/resources"
|
|
||||||
"/var/lib/romm/assets:/romm/assets"
|
|
||||||
];
|
|
||||||
|
|
||||||
extraOptions = [
|
|
||||||
"--network=romm-net"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nginx = lib.mkIf nginxEnabled {
|
|
||||||
virtualHosts."romm-local" = {
|
|
||||||
listen = [
|
|
||||||
{
|
|
||||||
addr = "0.0.0.0";
|
|
||||||
port = 8085;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
extraConfig = ''
|
|
||||||
client_max_body_size 0;
|
|
||||||
'';
|
|
||||||
|
|
||||||
locations."/" = {
|
|
||||||
proxyPass = "http://127.0.0.1:8086";
|
|
||||||
proxyWebsockets = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
virtualHosts."romm.ppp.pm" = {
|
|
||||||
forceSSL = true;
|
|
||||||
useACMEHost = "romm.ppp.pm";
|
|
||||||
|
|
||||||
extraConfig = ''
|
|
||||||
client_max_body_size 0;
|
|
||||||
'';
|
|
||||||
|
|
||||||
locations."/" = {
|
|
||||||
proxyPass = "http://127.0.0.1:8086";
|
|
||||||
proxyWebsockets = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
|
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ 8085 ];
|
|
||||||
|
|
||||||
age.secrets = {
|
|
||||||
"romm-auth-secret-key" = {
|
|
||||||
file = ../../../../secrets/manatee/romm-auth-secret-key.age;
|
|
||||||
owner = "root";
|
|
||||||
group = "root";
|
|
||||||
};
|
|
||||||
|
|
||||||
"romm-db-password" = {
|
|
||||||
file = ../../../../secrets/manatee/romm-db-password.age;
|
|
||||||
owner = "root";
|
|
||||||
group = "root";
|
|
||||||
};
|
|
||||||
|
|
||||||
"romm-metadata-api-keys" = {
|
|
||||||
file = ../../../../secrets/manatee/romm-metadata-api-keys.age;
|
|
||||||
owner = "root";
|
|
||||||
group = "root";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -21,9 +21,8 @@ in
|
|||||||
home-manager.users.alex = {
|
home-manager.users.alex = {
|
||||||
programs.ssh = {
|
programs.ssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableDefaultConfig = false;
|
|
||||||
|
|
||||||
settings = {
|
matchBlocks = {
|
||||||
"git.ppp.pm" = {
|
"git.ppp.pm" = {
|
||||||
hostname = "git.ppp.pm";
|
hostname = "git.ppp.pm";
|
||||||
identityFile = "/home/alex/.ssh/alex.manatee-git.ppp.pm";
|
identityFile = "/home/alex/.ssh/alex.manatee-git.ppp.pm";
|
||||||
|
|||||||
@@ -588,6 +588,9 @@ Setup prefix for keybindings.
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
(use-package eglot-booster
|
||||||
|
:after eglot
|
||||||
|
:config (eglot-booster-mode))
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
** Go
|
** Go
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
|||||||
@@ -12,6 +12,18 @@ let
|
|||||||
epkgs.flymake-go-staticcheck
|
epkgs.flymake-go-staticcheck
|
||||||
epkgs.tree-sitter-langs
|
epkgs.tree-sitter-langs
|
||||||
epkgs.treesit-grammars.with-all-grammars
|
epkgs.treesit-grammars.with-all-grammars
|
||||||
|
|
||||||
|
(epkgs.trivialBuild {
|
||||||
|
pname = "eglot-booster";
|
||||||
|
version = "main-2024-04-11";
|
||||||
|
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
owner = "jdtsmith";
|
||||||
|
repo = "eglot-booster";
|
||||||
|
rev = "e19dd7ea81bada84c66e8bdd121408d9c0761fe6";
|
||||||
|
hash = "sha256-vF34ZoUUj8RENyH9OeKGSPk34G6KXZhEZozQKEcRNhs=";
|
||||||
|
};
|
||||||
|
})
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -38,6 +50,7 @@ in
|
|||||||
ec
|
ec
|
||||||
emacs
|
emacs
|
||||||
pkgs.wl-clipboard
|
pkgs.wl-clipboard
|
||||||
|
pkgs.emacs-lsp-booster
|
||||||
pkgs.nixd
|
pkgs.nixd
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf enabled {
|
config = lib.mkIf enabled {
|
||||||
home-manager.users.alex = { lib, ... }: {
|
home-manager.users.alex = {
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
@@ -36,13 +36,6 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
home.file.".ssh/config".target = ".ssh/config_source";
|
|
||||||
|
|
||||||
home.activation.sshConfig = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
|
|
||||||
run cat ~/.ssh/config_source > ~/.ssh/config
|
|
||||||
run chmod 600 ~/.ssh/config
|
|
||||||
'';
|
|
||||||
|
|
||||||
home.packages = [ pkgs.tig ];
|
home.packages = [ pkgs.tig ];
|
||||||
|
|
||||||
home.file.".tigrc".text = ''
|
home.file.".tigrc".text = ''
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ in
|
|||||||
valign = "center";
|
valign = "center";
|
||||||
outline_thickness = 2;
|
outline_thickness = 2;
|
||||||
dots_center = true;
|
dots_center = true;
|
||||||
fade_on_empty = false;
|
fade_on_empty = true;
|
||||||
placeholder_text = "";
|
placeholder_text = "";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
home-manager.users.alex = {
|
home-manager.users.alex = {
|
||||||
home.packages = [ pkgs.typescript-language-server ];
|
home.packages = [ pkgs.nodePackages.typescript-language-server ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,14 +3,10 @@
|
|||||||
# Enable gnome-keyring at system level for PAM integration
|
# Enable gnome-keyring at system level for PAM integration
|
||||||
services.gnome.gnome-keyring.enable = true;
|
services.gnome.gnome-keyring.enable = true;
|
||||||
|
|
||||||
# Use openssh's own ssh-agent — gcr's ssh-agent stalls signing RSA keys.
|
|
||||||
services.gnome.gcr-ssh-agent.enable = false;
|
|
||||||
programs.ssh.startAgent = true;
|
|
||||||
|
|
||||||
home-manager.users.alex = {
|
home-manager.users.alex = {
|
||||||
services.gnome-keyring = {
|
services.gnome-keyring = {
|
||||||
enable = true;
|
enable = true;
|
||||||
components = [ "secrets" ];
|
components = [ "secrets" "ssh" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.ssh = {
|
programs.ssh = {
|
||||||
@@ -135,19 +131,6 @@
|
|||||||
owner = "alex";
|
owner = "alex";
|
||||||
group = "users";
|
group = "users";
|
||||||
};
|
};
|
||||||
|
|
||||||
"alex.pinwheel-tadpole-ed25519" = {
|
|
||||||
file = ../../../../secrets/pinwheel/alex.pinwheel-tadpole-ed25519.age;
|
|
||||||
path = "/home/alex/.ssh/alex.pinwheel-tadpole-ed25519";
|
|
||||||
owner = "alex";
|
|
||||||
group = "users";
|
|
||||||
};
|
|
||||||
"alex.pinwheel-tadpole-ed25519.pub" = {
|
|
||||||
file = ../../../../secrets/pinwheel/alex.pinwheel-tadpole-ed25519.pub.age;
|
|
||||||
path = "/home/alex/.ssh/alex.pinwheel-tadpole-ed25519.pub";
|
|
||||||
owner = "alex";
|
|
||||||
group = "users";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
services.openssh = {
|
services.openssh = {
|
||||||
|
|||||||
@@ -1,23 +1,7 @@
|
|||||||
{ pkgs, ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
services.tailscale.enable = true;
|
services.tailscale.enable = true;
|
||||||
|
|
||||||
# Pinned to 1.96.5. 1.98.0 regressed split-DNS handling under work-vpn: the
|
|
||||||
# netmap's "resolve <tailnet>.ts.net locally via MagicDNS" hint is dropped
|
|
||||||
# when translated into systemd-resolved config, so *.ts.net queries get sent
|
|
||||||
# to a public resolver (199.247.155.53) that the corporate VPN's port-53
|
|
||||||
# egress filter blocks.
|
|
||||||
services.tailscale.package = pkgs.tailscale.overrideAttrs (_: rec {
|
|
||||||
version = "1.96.5";
|
|
||||||
src = pkgs.fetchFromGitHub {
|
|
||||||
owner = "tailscale";
|
|
||||||
repo = "tailscale";
|
|
||||||
tag = "v${version}";
|
|
||||||
hash = "sha256-vYYb+2OtuXftjGGG0zWJesHccrClB8YZpclv9KzNN/c=";
|
|
||||||
};
|
|
||||||
vendorHash = "sha256-rhuWEEN+CtumVxOw6Dy/IRxWIrZ2x6RJb6ULYwXCQc4=";
|
|
||||||
});
|
|
||||||
|
|
||||||
networking.firewall = {
|
networking.firewall = {
|
||||||
checkReversePath = "loose";
|
checkReversePath = "loose";
|
||||||
allowedUDPPorts = [ 41641 ];
|
allowedUDPPorts = [ 41641 ];
|
||||||
|
|||||||
@@ -22,24 +22,6 @@ in
|
|||||||
[[ "$PATH" == "${pkgs.bashInteractive}/bin:"* ]] || export PATH="${pkgs.bashInteractive}/bin:$PATH"
|
[[ "$PATH" == "${pkgs.bashInteractive}/bin:"* ]] || export PATH="${pkgs.bashInteractive}/bin:$PATH"
|
||||||
}
|
}
|
||||||
precmd_functions+=(_ensure_bash_interactive)
|
precmd_functions+=(_ensure_bash_interactive)
|
||||||
|
|
||||||
# Source the zsh-specific rc file that nix-direnv emits ($DIRENV_ZSH_RC)
|
|
||||||
# so devshell completions and zsh setup are picked up. direnv itself only
|
|
||||||
# exports env vars, so without this hook the zsh side of the devshell is
|
|
||||||
# never loaded. Guarded by LAST_LOADED_DIRENV_ZSH_RC so we don't re-source
|
|
||||||
# it on every precmd.
|
|
||||||
_nix_direnv_bridge_hook() {
|
|
||||||
if [[ -n "$DIRENV_ZSH_RC" && "$LAST_LOADED_DIRENV_ZSH_RC" != "$DIRENV_ZSH_RC" ]]; then
|
|
||||||
if [[ -f "$DIRENV_ZSH_RC" ]]; then
|
|
||||||
source "$DIRENV_ZSH_RC"
|
|
||||||
export LAST_LOADED_DIRENV_ZSH_RC="$DIRENV_ZSH_RC"
|
|
||||||
echo "❄️ direnv zsh loaded..."
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
autoload -Uz add-zsh-hook
|
|
||||||
add-zsh-hook precmd _nix_direnv_bridge_hook
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Configure IntelliJ to exclude .direnv from indexing
|
# Configure IntelliJ to exclude .direnv from indexing
|
||||||
|
|||||||
@@ -48,7 +48,6 @@ in
|
|||||||
mode = "0755";
|
mode = "0755";
|
||||||
text = ''
|
text = ''
|
||||||
#!${pkgs.bash}/bin/bash
|
#!${pkgs.bash}/bin/bash
|
||||||
[ "$1" = "alex" ] || exit 0
|
|
||||||
for file in ${authorizedKeysPath}/*; do
|
for file in ${authorizedKeysPath}/*; do
|
||||||
${pkgs.coreutils}/bin/cat "$file"
|
${pkgs.coreutils}/bin/cat "$file"
|
||||||
done
|
done
|
||||||
@@ -72,7 +71,7 @@ in
|
|||||||
KbdInteractiveAuthentication = false;
|
KbdInteractiveAuthentication = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
authorizedKeysCommand = "/etc/ssh/authorized_keys_command %u";
|
authorizedKeysCommand = "/etc/ssh/authorized_keys_command";
|
||||||
authorizedKeysCommandUser = "root";
|
authorizedKeysCommandUser = "root";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -98,11 +97,6 @@ in
|
|||||||
path = "${authorizedKeysPath}/alex.pinwheel-tadpole.pub";
|
path = "${authorizedKeysPath}/alex.pinwheel-tadpole.pub";
|
||||||
};
|
};
|
||||||
|
|
||||||
"alex.pinwheel-tadpole-ed25519.pub" = {
|
|
||||||
file = ../../../../secrets/pinwheel/alex.pinwheel-tadpole-ed25519.pub.age;
|
|
||||||
path = "${authorizedKeysPath}/alex.pinwheel-tadpole-ed25519.pub";
|
|
||||||
};
|
|
||||||
|
|
||||||
"alex.tadpole-git.ppp.pm" = {
|
"alex.tadpole-git.ppp.pm" = {
|
||||||
file = ../../../../secrets/tadpole/alex.tadpole-git.ppp.pm.age;
|
file = ../../../../secrets/tadpole/alex.tadpole-git.ppp.pm.age;
|
||||||
path = "/home/alex/.ssh/alex.tadpole-git.ppp.pm";
|
path = "/home/alex/.ssh/alex.tadpole-git.ppp.pm";
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -1,8 +0,0 @@
|
|||||||
age-encryption.org/v1
|
|
||||||
-> ssh-ed25519 wkRvNA 5d22LU+2Mn6fq8SHOCwDht/ebnI2uOk6WKf+t1kwwCM
|
|
||||||
hCGnLoCy1PX5PJx2IjQnyESmtKM6wVQmyS6aHNhkb1g
|
|
||||||
-> ssh-ed25519 +oNaHQ gPUMsavbGVPOuvTtNgoDuzrT+q0I7Wbkd6QK5z4oUGc
|
|
||||||
M3HhrugFlNQkL7WxF1qrW+ocGRqOXid32AVVYLSSxPI
|
|
||||||
--- TGURCDEIuSFCfXBHxzFHA2svHES7Ubagy1uYjbWCO7g
|
|
||||||
gá¿Ó†Ò™±£Qâö
|
|
||||||
oF[H:t aÆr3úZ0ßx�@:˜0Ó´¡µÂI[Õ\í=º@eâPí�W€Ã†§rX,¶âÈÇ*sš$c:�FlÎÙ±z|B#
|
|
||||||
Binary file not shown.
Binary file not shown.
@@ -1,7 +1,8 @@
|
|||||||
age-encryption.org/v1
|
age-encryption.org/v1
|
||||||
-> ssh-ed25519 vxPbZg GMTnaun91WNPRFQYkN7xPqdALyMQpXCOq6jj4Q4O1Q0
|
-> ssh-ed25519 vxPbZg bCF+MdTMA8jH26XEosgyd5N0RsTa9WT/VAIZGsVemHg
|
||||||
OyA/Zk7KQlbSyJlXETFh4JZ57S92oXULa9/mgC019PE
|
1DNCO2mpsJ68osmFZIzAlY6kjoxCbThpSI4XNEyUNjY
|
||||||
-> ssh-ed25519 +oNaHQ C0K34MjLZDIKv6ci2efBxv1nfvuHKn9OCj26DxjtmBo
|
-> ssh-ed25519 +oNaHQ L91QfGk0r81Df5fHWHdrvXJ54FJ+3S30vus/h4v/H2k
|
||||||
tMG+KxpFX2K8F34iNxDBpb2epd94QPFWo8X/mY67LEI
|
Vi/5VdJhl72cwLiD2qxbmQiKD0RPb4vv6VddGWrPvF4
|
||||||
--- FBMSSr82MYSwER9O8dEs3o2vy/+rc29DxUuziFZqYzw
|
--- F8ff4nu9K9cXId34L2RMBzH4vE3efIuzISN1spbvDHo
|
||||||
l'c(êˆ6ônnxgA7j"%ÎIÂ'¢{úH¯˜@Þ™vä°ÔêyŸåJûT°©ˆ¼)ÇÃ…¿nSÝ&ìÉš¦e;õ 4zNº½„KU¤Á€,d”�Cñæ®®U;Dc«.�x`
|
KÙŒ¬�Ëâey¾z’ÛŸ%Œ]Ÿ…˜m®s÷«¥úb°U×qX{¸±‹!©(�u‹|ø!œ_‘}˜íÿ<ùÓ#ù–ÞºˆžXU^¸üs”W�´wñNÐÆU×ù¥D
|
||||||
|
ú˜
|
||||||
@@ -15,8 +15,6 @@ in {
|
|||||||
"pinwheel/alex.pinwheel-backwards.pub.age".publicKeys = [ pinwheel backwards alex ];
|
"pinwheel/alex.pinwheel-backwards.pub.age".publicKeys = [ pinwheel backwards alex ];
|
||||||
"pinwheel/alex.pinwheel-tadpole.age".publicKeys = [ pinwheel alex ];
|
"pinwheel/alex.pinwheel-tadpole.age".publicKeys = [ pinwheel alex ];
|
||||||
"pinwheel/alex.pinwheel-tadpole.pub.age".publicKeys = [ pinwheel tadpole alex ];
|
"pinwheel/alex.pinwheel-tadpole.pub.age".publicKeys = [ pinwheel tadpole alex ];
|
||||||
"pinwheel/alex.pinwheel-tadpole-ed25519.age".publicKeys = [ pinwheel alex ];
|
|
||||||
"pinwheel/alex.pinwheel-tadpole-ed25519.pub.age".publicKeys = [ pinwheel tadpole alex ];
|
|
||||||
"pinwheel/alex.pinwheel-github.com.age".publicKeys = [ pinwheel alex ];
|
"pinwheel/alex.pinwheel-github.com.age".publicKeys = [ pinwheel alex ];
|
||||||
"pinwheel/alex.pinwheel-github.com.pub.age".publicKeys = [ pinwheel alex ];
|
"pinwheel/alex.pinwheel-github.com.pub.age".publicKeys = [ pinwheel alex ];
|
||||||
"pinwheel/alex.pinwheel-github.com-signing.age".publicKeys = [ pinwheel alex ];
|
"pinwheel/alex.pinwheel-github.com-signing.age".publicKeys = [ pinwheel alex ];
|
||||||
@@ -41,9 +39,6 @@ in {
|
|||||||
"manatee/komga-bookmanager-credentials.age".publicKeys = [ manatee alex];
|
"manatee/komga-bookmanager-credentials.age".publicKeys = [ manatee alex];
|
||||||
"manatee/komga-reading-stats-claude-api-key.age".publicKeys = [ manatee alex];
|
"manatee/komga-reading-stats-claude-api-key.age".publicKeys = [ manatee alex];
|
||||||
"manatee/komga-reading-stats-komga-api-key.age".publicKeys = [ manatee alex];
|
"manatee/komga-reading-stats-komga-api-key.age".publicKeys = [ manatee alex];
|
||||||
"manatee/romm-auth-secret-key.age".publicKeys = [ manatee alex ];
|
|
||||||
"manatee/romm-db-password.age".publicKeys = [ manatee alex ];
|
|
||||||
"manatee/romm-metadata-api-keys.age".publicKeys = [ manatee alex ];
|
|
||||||
|
|
||||||
"backwards/root.backwards.age".publicKeys = [ backwards alex ];
|
"backwards/root.backwards.age".publicKeys = [ backwards alex ];
|
||||||
"backwards/root.backwards.pub.age".publicKeys = [ backwards alex ];
|
"backwards/root.backwards.pub.age".publicKeys = [ backwards alex ];
|
||||||
|
|||||||
Reference in New Issue
Block a user