Compare commits
1 Commits
main
..
f7e18a0978
| Author | SHA1 | Date | |
|---|---|---|---|
 Alexander Heldt
|
f7e18a0978 |
Generated
+87
-166
@@ -43,11 +43,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1778620495,
|
||||
"narHash": "sha256-Gu7UhWjwKCgSiVC3Qz/Rc7cYi9DNuDTBxYzg3kfLvfM=",
|
||||
"lastModified": 1770895474,
|
||||
"narHash": "sha256-JBcrq1Y0uw87VZdYsByVbv+GBuT6ECaCNb9txLX9UuU=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "aquamarine",
|
||||
"rev": "be35f75ac305f430f5f9d89b5f5a4af59ca7567e",
|
||||
"rev": "a494d50d32b5567956b558437ceaa58a380712f7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -85,11 +85,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1779226674,
|
||||
"narHash": "sha256-wuOkjI6pRiN4sEn/EPBRnNW5cmcpvd7xtIM8y5LooAs=",
|
||||
"lastModified": 1769524058,
|
||||
"narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "65fb947964bd44fc0008faf77d1fcb7a9f40bb32",
|
||||
"rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -106,11 +106,11 @@
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1779250628,
|
||||
"narHash": "sha256-QrHi1w+g7p58wMxcK9jOXr3oi2PRWQ+i4Sw38sL3dB4=",
|
||||
"lastModified": 1771057865,
|
||||
"narHash": "sha256-Suny75DfQS3Mqd8ihiDZNsRs4CfRC3GiQDMmaFPj2qM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "5f8f3a12b25e29c1dd0a6363b61eba7d2f9944fe",
|
||||
"rev": "56690eb79372e49054b0c2b87780fe3f86be7616",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -169,24 +169,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gitignore": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@@ -237,11 +219,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1779213149,
|
||||
"narHash": "sha256-Cf+p/T4Z3n9Sw0TiR3kQaIwQI+/hfvLJcoTzeq6yS3E=",
|
||||
"lastModified": 1771037579,
|
||||
"narHash": "sha256-NX5XuhGcsmk0oEII2PEtMRgvh2KaAv3/WWQsOpxAgR4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "bd868f769a69d3b6091a1da68a75cb83a181033c",
|
||||
"rev": "05e6dc0f6ed936f918cb6f0f21f1dad1e4c53150",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -266,11 +248,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1776511930,
|
||||
"narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=",
|
||||
"lastModified": 1753964049,
|
||||
"narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprcursor",
|
||||
"rev": "39435900785d0c560c6ae8777d29f28617d031ef",
|
||||
"rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -295,11 +277,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1776426399,
|
||||
"narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=",
|
||||
"lastModified": 1770511807,
|
||||
"narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprgraphics",
|
||||
"rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84",
|
||||
"rev": "7c75487edd43a71b61adb01cae8326d277aab683",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -327,11 +309,11 @@
|
||||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1779190425,
|
||||
"narHash": "sha256-C0hPhLeo3ztBXYSnpYarYjw6HDvlgZRnNyFfG5PoaVI=",
|
||||
"lastModified": 1771026735,
|
||||
"narHash": "sha256-vIzZ1Pb1o9xOXwGTdr09vRwGFgD/II6ZnGpnCfl8zz8=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "203a121537d0868bd4d8258b58861ca970483157",
|
||||
"rev": "e80f705d76d4dbe836e0f57aadea994a624ac63e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -347,11 +329,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1778488488,
|
||||
"narHash": "sha256-6Vvr0qMRdccvJqwzrXJkqoK6lWsdyC1nMrLjoHKqoGM=",
|
||||
"lastModified": 1770889987,
|
||||
"narHash": "sha256-JPbwE1Yg5t9zrMcOyDQwl1Pd8e0J1dtZf3kGnC7udwQ=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "contrib",
|
||||
"rev": "55b1393a23d6e4968ce6da704c8095f7e5e9fa3c",
|
||||
"rev": "8fdd69edefed16c9ab395b433a1c3323d5633f30",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -393,11 +375,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1776426575,
|
||||
"narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=",
|
||||
"lastModified": 1767023960,
|
||||
"narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-guiutils",
|
||||
"rev": "a968d211048e3ed538e47b84cb3649299578f19d",
|
||||
"rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -418,11 +400,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772460177,
|
||||
"narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=",
|
||||
"lastModified": 1765214753,
|
||||
"narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-protocols",
|
||||
"rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917",
|
||||
"rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -447,11 +429,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1777320127,
|
||||
"narHash": "sha256-Qu+Wf2Bp5qUjyn2YpZNq8a7JyzTGowhT1knrwE38a9U=",
|
||||
"lastModified": 1767983607,
|
||||
"narHash": "sha256-8C2co8NYfR4oMOUEsPROOJ9JHrv9/ktbJJ6X1WsTbXc=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlang",
|
||||
"rev": "090117506ddc3d7f26e650ff344d378c2ec329cc",
|
||||
"rev": "d4037379e6057246b408bbcf796cf3e9838af5b2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -499,11 +481,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772462885,
|
||||
"narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=",
|
||||
"lastModified": 1764592794,
|
||||
"narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprtoolkit",
|
||||
"rev": "9af245a69fa6b286b88ddfc340afd288e00a6998",
|
||||
"rev": "5cfe0743f0e608e1462972303778d8a0859ee63e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -524,11 +506,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1778234770,
|
||||
"narHash": "sha256-jAcsogZwWMfXT9MfXxZzkwliAqIuZUV0p71h6Ba9ReE=",
|
||||
"lastModified": 1770139857,
|
||||
"narHash": "sha256-bCqxcXjavgz5KBJ/1CBLqnagMMf9JvU1m9HmYVASKoc=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"rev": "a2dbd8a4cc51f7cbe4224732668392bb1aa79df2",
|
||||
"rev": "9038eec033843c289b06b83557a381a2648d8fa5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -549,11 +531,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1777159683,
|
||||
"narHash": "sha256-Jxixw6wZphUp+nHYxOKUYSckL17QMBx2d5Zp0rJHr1g=",
|
||||
"lastModified": 1770501770,
|
||||
"narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprwayland-scanner",
|
||||
"rev": "b8632713a6beaf28b56f2a7b0ab2fb7088dbb404",
|
||||
"rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -578,11 +560,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1778410714,
|
||||
"narHash": "sha256-o6RzFj4nJXaPRY7EM01siuCQeT41RfwwmcmFQqwFJJg=",
|
||||
"lastModified": 1770203293,
|
||||
"narHash": "sha256-PR/KER+yiHabFC/h1Wjb+9fR2Uy0lWM3Qld7jPVaWkk=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprwire",
|
||||
"rev": "85148a8e612808cf5ddb25d0b3c5840f3498a7dc",
|
||||
"rev": "37bc90eed02b0c8b5a77a0b00867baf3005cfb98",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -591,27 +573,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"komga-bookmanager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772988002,
|
||||
"narHash": "sha256-42Arpp+ShJorA9uR1nNlKuMoDx3y+cHg2BxQUW1fo7U=",
|
||||
"ref": "main",
|
||||
"rev": "bd5ae71978bb60eda28a010956825983dd931e2a",
|
||||
"revCount": 18,
|
||||
"type": "git",
|
||||
"url": "ssh://gitea@git.ppp.pm:1122/alex/komga-bookmanager.git"
|
||||
},
|
||||
"original": {
|
||||
"ref": "main",
|
||||
"type": "git",
|
||||
"url": "ssh://gitea@git.ppp.pm:1122/alex/komga-bookmanager.git"
|
||||
}
|
||||
},
|
||||
"komga-comictracker": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@@ -619,11 +580,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773858923,
|
||||
"narHash": "sha256-JOm+qe+loPxpjpTn2fN5QuqeGLDqYc1QevNeZZuEkdE=",
|
||||
"lastModified": 1771079752,
|
||||
"narHash": "sha256-4Pw8MhQUVWcTH3fg31sP19k+qgHDxqSKtSoDU/CYf/Y=",
|
||||
"ref": "main",
|
||||
"rev": "2ab63ae85af1e2009e4bce10940e8db56827d942",
|
||||
"revCount": 67,
|
||||
"rev": "2b5cc59e3d4dba439a9a5f0d1fc2c30d9bdf45e1",
|
||||
"revCount": 32,
|
||||
"type": "git",
|
||||
"url": "ssh://gitea@git.ppp.pm:1122/alex/komga-comictracker.git"
|
||||
},
|
||||
@@ -633,7 +594,7 @@
|
||||
"url": "ssh://gitea@git.ppp.pm:1122/alex/komga-comictracker.git"
|
||||
}
|
||||
},
|
||||
"komga-reading-stats": {
|
||||
"naviterm": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": [
|
||||
@@ -641,33 +602,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1774185820,
|
||||
"narHash": "sha256-ASExCDbdujwneZ/tZeNXxzKPbUFLroBnmPBJ5jEniCI=",
|
||||
"ref": "main",
|
||||
"rev": "769bd540e8975050b2778025fdebc6fdd5c5e2b5",
|
||||
"revCount": 42,
|
||||
"type": "git",
|
||||
"url": "ssh://gitea@git.ppp.pm:1122/alex/komga-reading-stats.git"
|
||||
},
|
||||
"original": {
|
||||
"ref": "main",
|
||||
"type": "git",
|
||||
"url": "ssh://gitea@git.ppp.pm:1122/alex/komga-reading-stats.git"
|
||||
}
|
||||
},
|
||||
"naviterm": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773476909,
|
||||
"narHash": "sha256-hSg/7xFO+3G3wWFq1480OecREqTY+fu06L06rM2UBmQ=",
|
||||
"lastModified": 1770485744,
|
||||
"narHash": "sha256-ZJGHKtEWhpXyONjy6/popJz0uL2MXmknGr9Vr1B6BAk=",
|
||||
"owner": "detoxify92",
|
||||
"repo": "naviterm",
|
||||
"rev": "f89dbde00222fb1e4f611419d05583d8edee4c25",
|
||||
"rev": "b311af7ae0ab095657264b5fe4a43b9118207584",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
@@ -681,17 +620,16 @@
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773920367,
|
||||
"narHash": "sha256-ADGQjlsFzT9POglBkBJZcFqg3go4d+J3E4GS4WlxENY=",
|
||||
"lastModified": 1770930949,
|
||||
"narHash": "sha256-ulX/6yOI9fmiiDqNjn59oLsVkABRo0M2Wkr2w8Ric64=",
|
||||
"owner": "viperML",
|
||||
"repo": "nh",
|
||||
"rev": "b00a24b39944efd4ec7944f02e0bd9113d991767",
|
||||
"rev": "b37b9a6ca31741282873dd8e335f66aad54f6326",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "viperML",
|
||||
"repo": "nh",
|
||||
"rev": "b00a24b39944efd4ec7944f02e0bd9113d991767",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
@@ -716,14 +654,14 @@
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems_5"
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1778951860,
|
||||
"narHash": "sha256-aFjBC3AVLh/bsgcsoI6Z/yQmh/NABffwHJIqQOTj+Tg=",
|
||||
"lastModified": 1771059595,
|
||||
"narHash": "sha256-avvMQpGX/erjzPI10bN5uHDD08er5QC+pBypQisUNHs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-jetbrains-plugins",
|
||||
"rev": "68930eefa5e77fc6bb7977635c83a003683c2f11",
|
||||
"rev": "fb4b27d169c7fbfc92c9dfec971e9c87506cb8f0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -734,11 +672,11 @@
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1779099457,
|
||||
"narHash": "sha256-u73aVD/lUmmT3JV+kPDztl7zPwQKd0eobD1AbJltaGs=",
|
||||
"lastModified": 1770882871,
|
||||
"narHash": "sha256-nw5g+xl3veea+maxJ2/81tMEA/rPq9aF1H5XF35X+OE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "8792fab9d4a6454a9201675f01326f827ce35ead",
|
||||
"rev": "af04cb78aa85b2a4d1c15fc7270347e0d0eda97b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -750,11 +688,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1772822230,
|
||||
"narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=",
|
||||
"lastModified": 1770770419,
|
||||
"narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "71caefce12ba78d84fe618cf61644dce01cf3a96",
|
||||
"rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -766,27 +704,27 @@
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1779102034,
|
||||
"narHash": "sha256-vZJZjLo513IeI8hjzHFc6TDezUd4uCE2Eq4SNO3DNNg=",
|
||||
"lastModified": 1767313136,
|
||||
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "687f05a9184cad4eaf905c48b63649e3a86f5433",
|
||||
"rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.11",
|
||||
"ref": "nixos-25.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1778869304,
|
||||
"narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
|
||||
"lastModified": 1771008912,
|
||||
"narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
|
||||
"rev": "a82ccc39b39b621151d6732718e3e250109076fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -827,11 +765,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1778507602,
|
||||
"narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=",
|
||||
"lastModified": 1770726378,
|
||||
"narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a",
|
||||
"rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -848,9 +786,7 @@
|
||||
"home-manager": "home-manager_2",
|
||||
"hyprland": "hyprland",
|
||||
"hyprland-contrib": "hyprland-contrib",
|
||||
"komga-bookmanager": "komga-bookmanager",
|
||||
"komga-comictracker": "komga-comictracker",
|
||||
"komga-reading-stats": "komga-reading-stats",
|
||||
"naviterm": "naviterm",
|
||||
"nh": "nh",
|
||||
"nix-gc-env": "nix-gc-env",
|
||||
@@ -922,21 +858,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_5": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"whib-backend": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@@ -944,11 +865,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1780482259,
|
||||
"narHash": "sha256-buOczAkw78U+g7DYcB7nMabTGzQoN15HtVE3y0kIt3I=",
|
||||
"lastModified": 1739029248,
|
||||
"narHash": "sha256-ux/Udy0Mhs66P/EQQ8S+xIuXRm9UHEYwSy12IZtlbnA=",
|
||||
"ref": "master",
|
||||
"rev": "b9ee418d14d6cb500506f9ef0cb9d54a8e78afa9",
|
||||
"revCount": 373,
|
||||
"rev": "222a8f6dde2e9270f6390b5e1e83c7ae1ea48290",
|
||||
"revCount": 371,
|
||||
"type": "git",
|
||||
"url": "ssh://gitea@git.ppp.pm:1122/alex/whib.git"
|
||||
},
|
||||
@@ -965,11 +886,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1780483645,
|
||||
"narHash": "sha256-Nr0WTh72uBCSO5jCcvHPE+4dqAPn07HZ5U1lAE4/3II=",
|
||||
"lastModified": 1761508816,
|
||||
"narHash": "sha256-adV/lyxcmuopyuzZ49v46Yt0gft+ioEL4yl1S+vUbus=",
|
||||
"ref": "master",
|
||||
"rev": "14f98eced1ccf1e62493ad65eb38502b38db5cba",
|
||||
"revCount": 224,
|
||||
"rev": "ab10bf50cb6b023a1b99f91c7e8d550231135eef",
|
||||
"revCount": 223,
|
||||
"type": "git",
|
||||
"url": "ssh://gitea@git.ppp.pm:1122/alex/whib-react.git"
|
||||
},
|
||||
@@ -1007,11 +928,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1778265244,
|
||||
"narHash": "sha256-8jlPtGSsv/CQY6tVVyLF4Jjd0gnS+Zbn9yk/V13A9nM=",
|
||||
"lastModified": 1761431178,
|
||||
"narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "xdg-desktop-portal-hyprland",
|
||||
"rev": "813ea5ca9a1702a9a2d1f5836bc00172ef698968",
|
||||
"rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
};
|
||||
|
||||
nh = {
|
||||
url = "github:viperML/nh/b00a24b39944efd4ec7944f02e0bd9113d991767";
|
||||
url = "github:viperML/nh";
|
||||
};
|
||||
|
||||
nix-gc-env.url = "github:Julow/nix-gc-env";
|
||||
@@ -74,18 +74,6 @@
|
||||
# url = "path:/home/alex/code/own/komga-comictracker";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
komga-bookmanager = {
|
||||
url = "git+ssh://gitea@git.ppp.pm:1122/alex/komga-bookmanager.git?ref=main";
|
||||
# url = "path:/home/alex/code/own/komga-bookmanager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
komga-reading-stats = {
|
||||
url = "git+ssh://gitea@git.ppp.pm:1122/alex/komga-reading-stats.git?ref=main";
|
||||
# url = "path:/home/alex/code/own/komga-reading-stats";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
|
||||
@@ -79,16 +79,11 @@
|
||||
{ device = config.disko.devices.disk.root.device; }
|
||||
{ device = config.disko.devices.disk.disk1.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;
|
||||
|
||||
# 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
|
||||
disko.devices = {
|
||||
disk = {
|
||||
|
||||
@@ -10,13 +10,11 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf enabled {
|
||||
mod.homepage.services = [
|
||||
{
|
||||
name = "Audiobookshelf";
|
||||
port = 8000;
|
||||
description = "Audiobooks & podcasts";
|
||||
}
|
||||
];
|
||||
mod.homepage.services = [{
|
||||
name = "Audiobookshelf";
|
||||
port = 8000;
|
||||
description = "Audiobooks & podcasts";
|
||||
}];
|
||||
|
||||
users.users.audiobookshelf = {
|
||||
isSystemUser = true;
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
{ lib, config, ... }:
|
||||
let
|
||||
enabled = config.mod.calibre-web.enable;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
mod.calibre-web = {
|
||||
enable = lib.mkEnableOption "add calibre-web module";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf enabled {
|
||||
mod.homepage.services = [{
|
||||
name = "Calibre-Web";
|
||||
port = 8083;
|
||||
description = "E-book library";
|
||||
}];
|
||||
|
||||
services = {
|
||||
calibre-web = {
|
||||
enable = true;
|
||||
|
||||
user = "storage";
|
||||
group = "storage";
|
||||
|
||||
listen = {
|
||||
ip = "0.0.0.0";
|
||||
port = 8083;
|
||||
};
|
||||
|
||||
dataDir = "/mnt/media/public/books";
|
||||
|
||||
options = {
|
||||
calibreLibrary = "/mnt/media/public/books";
|
||||
enableBookUploading = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -20,32 +20,6 @@
|
||||
"--http-timeout=60"
|
||||
];
|
||||
};
|
||||
|
||||
"komga.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"
|
||||
];
|
||||
};
|
||||
|
||||
"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"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -16,14 +16,13 @@ in
|
||||
nginx.enable = true;
|
||||
syncthing.enable = true;
|
||||
transmission.enable = true;
|
||||
calibre-web.enable = true;
|
||||
audiobookshelf.enable = true;
|
||||
jellyfin.enable = true;
|
||||
immich.enable = false;
|
||||
immich.enable = true;
|
||||
navidrome.enable = true;
|
||||
komga.enable = true;
|
||||
romm.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
|
||||
nginxEnabled = config.mod.nginx.enable;
|
||||
cfg = config.mod.home-assistant;
|
||||
|
||||
configFile = pkgs.writeText "ha-configuration.yaml" ''
|
||||
# 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" ''
|
||||
script = pkgs.writeShellScript "bt-reset" ''
|
||||
set -euo pipefail
|
||||
export PATH="${
|
||||
lib.makeBinPath [
|
||||
@@ -96,194 +62,170 @@ ${cfg.extraConfig}'';
|
||||
'';
|
||||
in
|
||||
{
|
||||
options = {
|
||||
mod.home-assistant = {
|
||||
extraConfig = lib.mkOption {
|
||||
type = lib.types.lines;
|
||||
default = "";
|
||||
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-ha-dns" = {
|
||||
unitConfig = {
|
||||
Description = "updates Hetzner DNS for home-assistant";
|
||||
};
|
||||
|
||||
timerConfig = {
|
||||
Unit = "update-hetzner-ha-dns.service";
|
||||
OnCalendar = "*-*-* *:00/30:00";
|
||||
Persistent = true;
|
||||
};
|
||||
|
||||
wantedBy = [ "timers.target" ];
|
||||
};
|
||||
};
|
||||
|
||||
services = {
|
||||
"update-hetzner-ha-dns" = {
|
||||
unitConfig = {
|
||||
Description = "updates Hetzner DNS for home-assistant";
|
||||
};
|
||||
|
||||
serviceConfig = {
|
||||
Type = "exec";
|
||||
EnvironmentFile = config.age.secrets.hetzner-dns.path;
|
||||
};
|
||||
|
||||
path = [
|
||||
pkgs.curl
|
||||
pkgs.coreutils # For `cat`
|
||||
pkgs.jq
|
||||
];
|
||||
|
||||
script = ''
|
||||
LAST_IP_FILE="/tmp/hetzner-dns-ha-ip"
|
||||
INTERFACE="enp3s0"
|
||||
|
||||
CURRENT_IP=$(curl -s --fail --interface "$INTERFACE" ifconfig.me)
|
||||
|
||||
LAST_IP=""
|
||||
if [[ -f "$LAST_IP_FILE" ]]; then
|
||||
LAST_IP=$(cat "$LAST_IP_FILE")
|
||||
fi
|
||||
|
||||
if [[ "$CURRENT_IP" == "$LAST_IP" ]]; then
|
||||
echo "IP unchanged, NOOP update."
|
||||
exit 0
|
||||
else
|
||||
echo "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/ha/A/actions/set_records" \
|
||||
&& echo $CURRENT_IP > $LAST_IP_FILE
|
||||
fi
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
mod.homepage.services = [
|
||||
{
|
||||
name = "Home Assistant";
|
||||
port = 8123;
|
||||
description = "Home automation";
|
||||
}
|
||||
];
|
||||
|
||||
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";
|
||||
};
|
||||
age = {
|
||||
secrets = {
|
||||
"hetzner-dns" = {
|
||||
file = ../../../../secrets/manatee/hetzner-dns.age;
|
||||
owner = "alex";
|
||||
group = "users";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -77,15 +77,13 @@ in
|
||||
mod.homepage = {
|
||||
enable = lib.mkEnableOption "Enable homepage module";
|
||||
services = lib.mkOption {
|
||||
type = lib.types.listOf (
|
||||
lib.types.submodule {
|
||||
options = {
|
||||
name = lib.mkOption { type = lib.types.str; };
|
||||
port = lib.mkOption { type = lib.types.port; };
|
||||
description = lib.mkOption { type = lib.types.str; };
|
||||
};
|
||||
}
|
||||
);
|
||||
type = lib.types.listOf (lib.types.submodule {
|
||||
options = {
|
||||
name = lib.mkOption { type = lib.types.str; };
|
||||
port = lib.mkOption { type = lib.types.port; };
|
||||
description = lib.mkOption { type = lib.types.str; };
|
||||
};
|
||||
});
|
||||
default = [ ];
|
||||
description = "Services to display on the homepage";
|
||||
};
|
||||
@@ -97,7 +95,7 @@ in
|
||||
listen = [
|
||||
{
|
||||
addr = "0.0.0.0";
|
||||
port = 9999;
|
||||
port = 80;
|
||||
}
|
||||
];
|
||||
root = page;
|
||||
@@ -106,6 +104,6 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ 9999 ];
|
||||
networking.firewall.allowedTCPPorts = [ 80 ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -10,13 +10,11 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf enabled {
|
||||
mod.homepage.services = [
|
||||
{
|
||||
name = "Immich";
|
||||
port = 2283;
|
||||
description = "Photo library";
|
||||
}
|
||||
];
|
||||
mod.homepage.services = [{
|
||||
name = "Immich";
|
||||
port = 2283;
|
||||
description = "Photo library";
|
||||
}];
|
||||
|
||||
users.users.immich = {
|
||||
isSystemUser = true;
|
||||
|
||||
@@ -47,13 +47,11 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
mod.homepage.services = [
|
||||
{
|
||||
name = "Jellyfin";
|
||||
port = 8096;
|
||||
description = "Media streaming";
|
||||
}
|
||||
];
|
||||
mod.homepage.services = [{
|
||||
name = "Jellyfin";
|
||||
port = 8096;
|
||||
description = "Media streaming";
|
||||
}];
|
||||
|
||||
networking = {
|
||||
firewall.allowedTCPPorts = [ 8096 ];
|
||||
|
||||
@@ -16,11 +16,7 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
imports = [
|
||||
inputs.komga-comictracker.nixosModules.default
|
||||
inputs.komga-bookmanager.nixosModules.default
|
||||
inputs.komga-reading-stats.nixosModules.default
|
||||
];
|
||||
imports = [ inputs.komga-comictracker.nixosModules.default ];
|
||||
|
||||
config = lib.mkIf enabled {
|
||||
mod.homepage.services = [
|
||||
@@ -34,16 +30,6 @@ in
|
||||
port = 8888;
|
||||
description = "Comic reader";
|
||||
}
|
||||
{
|
||||
name = "Komga Book Manager";
|
||||
port = 8686;
|
||||
description = "Book manager";
|
||||
}
|
||||
{
|
||||
name = "Komga Reading Stats";
|
||||
port = 8787;
|
||||
description = "Reading stats";
|
||||
}
|
||||
];
|
||||
|
||||
users.users.komga = {
|
||||
@@ -61,7 +47,6 @@ in
|
||||
server.port = 8002;
|
||||
komga."cors.allowed-origins" = [
|
||||
"http://manatee:8888"
|
||||
"https://komga.ppp.pm"
|
||||
];
|
||||
};
|
||||
|
||||
@@ -83,75 +68,22 @@ in
|
||||
tryFiles = "$uri $uri/ /komga-reader.html";
|
||||
};
|
||||
};
|
||||
|
||||
virtualHosts."komga.ppp.pm" = {
|
||||
forceSSL = true;
|
||||
useACMEHost = "komga.ppp.pm";
|
||||
|
||||
locations."/" = {
|
||||
proxyPass = "http://127.0.0.1:8002";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ 8888 ];
|
||||
|
||||
programs.comictracker = {
|
||||
enable = true;
|
||||
komgaUrl = "http://127.0.0.1:8002";
|
||||
komgaLibraryId = "0NVZH5AK3RPE1";
|
||||
komgaUrl = "http://manatee:8002";
|
||||
secretsFile = config.age.secrets.komga-comicbooktracker-credentials.path;
|
||||
};
|
||||
|
||||
services.komga-book-manager = {
|
||||
enable = true;
|
||||
port = 8686;
|
||||
group = "storage";
|
||||
komgaUrl = "http://127.0.0.1:8002";
|
||||
credentialsFile = config.age.secrets.komga-bookmanager-credentials.path;
|
||||
libraryRoot = "/mnt/media/public/books";
|
||||
libraryId = "0PNE1NEPY6995";
|
||||
};
|
||||
|
||||
services.komga-reading-stats = {
|
||||
enable = true;
|
||||
host = "0.0.0.0";
|
||||
port = 8787;
|
||||
origin = "http://manatee:8787";
|
||||
|
||||
anthropicApiKeyFile = config.age.secrets.komga-reading-stats-claude-api-key.path;
|
||||
claudeModel = "claude-sonnet-4-6";
|
||||
komga = {
|
||||
url = "http://127.0.0.1:8002";
|
||||
apiKeyFile = config.age.secrets.komga-reading-stats-komga-api-key.path;
|
||||
};
|
||||
};
|
||||
|
||||
age.secrets = {
|
||||
"komga-comicbooktracker-credentials" = {
|
||||
file = ../../../../secrets/manatee/komga-comicbooktracker-credentials.age;
|
||||
owner = "alex";
|
||||
group = "users";
|
||||
};
|
||||
|
||||
"komga-bookmanager-credentials" = {
|
||||
file = ../../../../secrets/manatee/komga-bookmanager-credentials.age;
|
||||
owner = "alex";
|
||||
group = "users";
|
||||
};
|
||||
|
||||
"komga-reading-stats-claude-api-key" = {
|
||||
file = ../../../../secrets/manatee/komga-reading-stats-claude-api-key.age;
|
||||
mode = "0440";
|
||||
group = "komga-reading-stats";
|
||||
};
|
||||
|
||||
"komga-reading-stats-komga-api-key" = {
|
||||
file = ../../../../secrets/manatee/komga-reading-stats-komga-api-key.age;
|
||||
mode = "0440";
|
||||
group = "komga-reading-stats";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -15,13 +15,11 @@ in
|
||||
};
|
||||
|
||||
config = {
|
||||
mod.homepage.services = lib.mkIf navidromeEnabled [
|
||||
{
|
||||
name = "Navidrome";
|
||||
port = 4533;
|
||||
description = "Music streaming";
|
||||
}
|
||||
];
|
||||
mod.homepage.services = lib.mkIf navidromeEnabled [{
|
||||
name = "Navidrome";
|
||||
port = 4533;
|
||||
description = "Music streaming";
|
||||
}];
|
||||
|
||||
services = lib.mkIf navidromeEnabled {
|
||||
navidrome = {
|
||||
|
||||
@@ -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 = {
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
enableDefaultConfig = false;
|
||||
|
||||
settings = {
|
||||
matchBlocks = {
|
||||
"git.ppp.pm" = {
|
||||
hostname = "git.ppp.pm";
|
||||
identityFile = "/home/alex/.ssh/alex.manatee-git.ppp.pm";
|
||||
|
||||
@@ -10,13 +10,11 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf enabled {
|
||||
mod.homepage.services = [
|
||||
{
|
||||
name = "Syncthing";
|
||||
port = 8384;
|
||||
description = "File sync";
|
||||
}
|
||||
];
|
||||
mod.homepage.services = [{
|
||||
name = "Syncthing";
|
||||
port = 8384;
|
||||
description = "File sync";
|
||||
}];
|
||||
|
||||
services.syncthing = {
|
||||
enable = true;
|
||||
|
||||
@@ -15,13 +15,11 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf enabled {
|
||||
mod.homepage.services = [
|
||||
{
|
||||
name = "Transmission";
|
||||
port = 9091;
|
||||
description = "Torrent client";
|
||||
}
|
||||
];
|
||||
mod.homepage.services = [{
|
||||
name = "Transmission";
|
||||
port = 9091;
|
||||
description = "Torrent client";
|
||||
}];
|
||||
|
||||
services = {
|
||||
transmission = {
|
||||
|
||||
@@ -27,8 +27,6 @@
|
||||
pkgs.onlyoffice-desktopeditors
|
||||
pkgs.wdisplays
|
||||
pkgs.vlc
|
||||
pkgs.claude-code
|
||||
pkgs.opencode
|
||||
];
|
||||
|
||||
home.stateVersion = "23.05";
|
||||
|
||||
@@ -14,7 +14,7 @@ in
|
||||
nix-index.enable = false;
|
||||
greetd.enable = true;
|
||||
hyprland.enable = true;
|
||||
hyprlock.enable = true;
|
||||
swaylock.enable = true;
|
||||
physlock.enable = false;
|
||||
|
||||
power.enable = true;
|
||||
|
||||
@@ -588,6 +588,9 @@ Setup prefix for keybindings.
|
||||
)
|
||||
)
|
||||
|
||||
(use-package eglot-booster
|
||||
:after eglot
|
||||
:config (eglot-booster-mode))
|
||||
#+END_SRC
|
||||
** Go
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
|
||||
@@ -12,6 +12,18 @@ let
|
||||
epkgs.flymake-go-staticcheck
|
||||
epkgs.tree-sitter-langs
|
||||
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
|
||||
emacs
|
||||
pkgs.wl-clipboard
|
||||
pkgs.emacs-lsp-booster
|
||||
pkgs.nixd
|
||||
];
|
||||
};
|
||||
|
||||
@@ -15,7 +15,7 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf enabled {
|
||||
home-manager.users.alex = { lib, ... }: {
|
||||
home-manager.users.alex = {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
|
||||
@@ -23,26 +23,11 @@ in
|
||||
{ path = ./gitconfig; }
|
||||
];
|
||||
|
||||
signing = {
|
||||
key = config.age.secrets."alex.pinwheel-github.com-signing.pub".path;
|
||||
signByDefault = true;
|
||||
};
|
||||
|
||||
settings = {
|
||||
rerere.enable = true;
|
||||
|
||||
# Tells Git to use SSH instead of the default GPG
|
||||
gpg.format = "ssh";
|
||||
};
|
||||
};
|
||||
|
||||
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.file.".tigrc".text = ''
|
||||
@@ -50,20 +35,5 @@ in
|
||||
set main-view-line-number-interval = 1
|
||||
'';
|
||||
};
|
||||
|
||||
age.secrets = {
|
||||
"alex.pinwheel-github.com-signing" = {
|
||||
file = ../../../../secrets/pinwheel/alex.pinwheel-github.com-signing.age;
|
||||
path = "/home/alex/.ssh/alex.pinwheel-github.com-signing";
|
||||
owner = "alex";
|
||||
group = "users";
|
||||
};
|
||||
"alex.pinwheel-github.com-signing.pub" = {
|
||||
file = ../../../../secrets/pinwheel/alex.pinwheel-github.com-signing.pub.age;
|
||||
path = "/home/alex/.ssh/alex.pinwheel-github.com-signing.pub";
|
||||
owner = "alex";
|
||||
group = "users";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ in
|
||||
let
|
||||
session = {
|
||||
user = "alex";
|
||||
command = "uwsm start hyprland-uwsm.desktop";
|
||||
command = "${pkgs.hyprland}/bin/Hyprland";
|
||||
};
|
||||
in
|
||||
{
|
||||
|
||||
@@ -26,30 +26,28 @@ let
|
||||
}
|
||||
|
||||
bind_workspaces() {
|
||||
local external batch=""
|
||||
local external
|
||||
|
||||
if external=$(get_active_external); then
|
||||
# External monitor connected: move workspaces 1-5 to external, 6-10 to internal
|
||||
# External monitor connected: 1-5 on external, 6-10 on internal
|
||||
for ws in 1 2 3 4 5; do
|
||||
batch="$batch dispatch moveworkspacetomonitor $ws $external;"
|
||||
$HYPRCTL keyword workspace "$ws, monitor:$external, default:true"
|
||||
done
|
||||
for ws in 6 7 8 9 10; do
|
||||
batch="$batch dispatch moveworkspacetomonitor $ws $INTERNAL;"
|
||||
$HYPRCTL keyword workspace "$ws, monitor:$INTERNAL, default:true"
|
||||
done
|
||||
else
|
||||
# No external monitor: move all workspaces to internal
|
||||
# No external monitor: all workspaces on internal
|
||||
for ws in 1 2 3 4 5 6 7 8 9 10; do
|
||||
batch="$batch dispatch moveworkspacetomonitor $ws $INTERNAL;"
|
||||
$HYPRCTL keyword workspace "$ws, monitor:$INTERNAL, default:true"
|
||||
done
|
||||
fi
|
||||
|
||||
$HYPRCTL --batch "$batch"
|
||||
}
|
||||
|
||||
handle_event() {
|
||||
case $1 in
|
||||
monitoradded*|monitorremoved*)
|
||||
sleep 0.5
|
||||
sleep 0.5 # Give monitor time to initialize
|
||||
bind_workspaces
|
||||
;;
|
||||
esac
|
||||
@@ -73,7 +71,6 @@ in
|
||||
config = lib.mkIf enabled {
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
withUWSM = true;
|
||||
package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
|
||||
portalPackage =
|
||||
inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
|
||||
@@ -86,11 +83,10 @@ in
|
||||
home-manager.users.alex = {
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
systemd.enable = false;
|
||||
|
||||
extraConfig = ''
|
||||
exec-once = uwsm app -- waybar
|
||||
exec-once = uwsm app -- hyprctl setcursor Adwaita 24
|
||||
exec-once=waybar
|
||||
exec-once=hyprctl setcursor Adwaita 24
|
||||
|
||||
env = GDK_DPI_SCALE,1.5
|
||||
env = HYPRCURSOR_THEME,Adwaita
|
||||
@@ -100,25 +96,6 @@ in
|
||||
monitor=HDMI-A-1, 2560x1440@100, auto-center-up, 1
|
||||
monitor=DP-3, 2560x1440@60, auto-center-up, 1
|
||||
|
||||
# Workspaces 1-5 on external monitors (HDMI-A-1 or DP-3)
|
||||
workspace = 1, monitor:HDMI-A-1, default:true
|
||||
workspace = 2, monitor:HDMI-A-1
|
||||
workspace = 3, monitor:HDMI-A-1
|
||||
workspace = 4, monitor:HDMI-A-1
|
||||
workspace = 5, monitor:HDMI-A-1
|
||||
workspace = 1, monitor:DP-3, default:true
|
||||
workspace = 2, monitor:DP-3
|
||||
workspace = 3, monitor:DP-3
|
||||
workspace = 4, monitor:DP-3
|
||||
workspace = 5, monitor:DP-3
|
||||
|
||||
# Workspaces 6-10 on internal monitor
|
||||
workspace = 6, monitor:eDP-1, default:true
|
||||
workspace = 7, monitor:eDP-1
|
||||
workspace = 8, monitor:eDP-1
|
||||
workspace = 9, monitor:eDP-1
|
||||
workspace = 10, monitor:eDP-1
|
||||
|
||||
workspace = w[tv1], gapsout:0, gapsin:0
|
||||
workspace = f[1], gapsout:0, gapsin:0
|
||||
windowrule = border_size 0, match:float 0, match:workspace w[tv1]
|
||||
@@ -129,6 +106,7 @@ in
|
||||
# https://wiki.archlinux.org/title/Hyprland#Jetbrains_apps_focus_issues
|
||||
windowrule = match:xwayland true, no_initial_focus on
|
||||
|
||||
exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
|
||||
'';
|
||||
|
||||
settings = {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
home-manager.users.alex = {
|
||||
home.packages = [ pkgs.typescript-language-server ];
|
||||
home.packages = [ pkgs.nodePackages.typescript-language-server ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,13 +9,14 @@ let
|
||||
in
|
||||
{
|
||||
users.users.alex.extraGroups = [ "video" ];
|
||||
programs.light.enable = true;
|
||||
|
||||
home-manager.users.alex = {
|
||||
wayland.windowManager.hyprland = lib.mkIf hyprlandEnabled {
|
||||
settings = {
|
||||
bind = [
|
||||
", XF86MonBrightnessUp, exec, ${pkgs.brightnessctl}/bin/brightnessctl set +5%"
|
||||
", XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl set 5%-"
|
||||
", XF86MonBrightnessUp, exec, ${pkgs.light}/bin/light -A 5"
|
||||
", XF86MonBrightnessDown, exec, ${pkgs.light}/bin/light -U 5"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -80,12 +80,12 @@ in
|
||||
path = [
|
||||
pkgs.coreutils # For `cat`
|
||||
pkgs.libnotify
|
||||
pkgs.hyprlock
|
||||
pkgs.swaylock
|
||||
];
|
||||
|
||||
script =
|
||||
let
|
||||
pause-music = "${pkgs.playerctl}/bin/playerctl -a pause";
|
||||
pause-music = "${pkgs.playerctl}/bin/playerctl -p spotify pause";
|
||||
in
|
||||
''
|
||||
BATTERY_CAPACITY=$(cat /sys/class/power_supply/${lowbat.battery}/capacity)
|
||||
@@ -103,7 +103,7 @@ in
|
||||
|
||||
BATTERY_STATUS=$(cat /sys/class/power_supply/${lowbat.battery}/status)
|
||||
if [[ $BATTERY_STATUS = "Discharging" ]]; then
|
||||
${pause-music}; ${pkgs.hyprlock}/bin/hyprlock & sleep 0.5; systemctl suspend
|
||||
${pause-music}; ${pkgs.swaylock}/bin/swaylock -f; systemctl suspend
|
||||
fi
|
||||
fi
|
||||
'';
|
||||
|
||||
@@ -1,18 +1,6 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
# Enable gnome-keyring at system level for PAM integration
|
||||
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 = {
|
||||
services.gnome-keyring = {
|
||||
enable = true;
|
||||
components = [ "secrets" ];
|
||||
};
|
||||
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
enableDefaultConfig = false;
|
||||
@@ -51,7 +39,7 @@
|
||||
|
||||
"*" = {
|
||||
forwardAgent = false;
|
||||
addKeysToAgent = "yes";
|
||||
addKeysToAgent = "no";
|
||||
compression = false;
|
||||
serverAliveInterval = 0;
|
||||
serverAliveCountMax = 3;
|
||||
@@ -64,10 +52,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
home.packages = [
|
||||
pkgs.sshfs
|
||||
pkgs.seahorse # GUI for managing gnome-keyring
|
||||
];
|
||||
home.packages = [ pkgs.sshfs ];
|
||||
};
|
||||
|
||||
age.secrets = {
|
||||
@@ -135,19 +120,6 @@
|
||||
owner = "alex";
|
||||
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 = {
|
||||
|
||||
+16
-31
@@ -5,13 +5,13 @@
|
||||
...
|
||||
}:
|
||||
let
|
||||
enabled = config.mod.hyprlock.enable;
|
||||
enabled = config.mod.swaylock.enable;
|
||||
hyprlandEnabled = config.mod.hyprland.enable;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
mod.hyprlock = {
|
||||
enable = lib.mkEnableOption "enable hyprlock module";
|
||||
mod.swaylock = {
|
||||
enable = lib.mkEnableOption "enable swaylock module";
|
||||
|
||||
dpmsTimeout = lib.mkOption {
|
||||
description = "timeout in seconds before DPMS is turned on";
|
||||
@@ -23,32 +23,13 @@ in
|
||||
|
||||
config = lib.mkIf enabled {
|
||||
home-manager.users.alex = {
|
||||
programs.hyprlock = {
|
||||
programs.swaylock = {
|
||||
enable = true;
|
||||
|
||||
settings = {
|
||||
general = {
|
||||
hide_cursor = true;
|
||||
};
|
||||
|
||||
background = [
|
||||
{
|
||||
color = "rgb(000000)";
|
||||
}
|
||||
];
|
||||
|
||||
input-field = [
|
||||
{
|
||||
size = "250, 50";
|
||||
position = "0, 0";
|
||||
halign = "center";
|
||||
valign = "center";
|
||||
outline_thickness = 2;
|
||||
dots_center = true;
|
||||
fade_on_empty = false;
|
||||
placeholder_text = "";
|
||||
}
|
||||
];
|
||||
color = "000000";
|
||||
indicator-idle-visible = false;
|
||||
show-failed-attempts = true;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -56,20 +37,20 @@ in
|
||||
settings = {
|
||||
bind =
|
||||
let
|
||||
pause-music = "${pkgs.playerctl}/bin/playerctl -a pause";
|
||||
pause-music = "${pkgs.playerctl}/bin/playerctl -p spotify pause";
|
||||
|
||||
dpmsTimeout = config.mod.hyprlock.dpmsTimeout;
|
||||
dpmsTimeout = config.mod.swaylock.dpmsTimeout;
|
||||
dpms-lock = pkgs.writeShellScript "dpms-lock" ''
|
||||
${pkgs.swayidle}/bin/swayidle \
|
||||
timeout ${dpmsTimeout} "${pkgs.hyprland}/bin/hyprctl dispatch dpms off" \
|
||||
resume "${pkgs.hyprland}/bin/hyprctl dispatch dpms on" &
|
||||
|
||||
${pkgs.hyprlock}/bin/hyprlock; ${pkgs.procps}/bin/pkill swayidle
|
||||
${pkgs.swaylock}/bin/swaylock && ${pkgs.procps}/bin/pkill swayidle
|
||||
'';
|
||||
in
|
||||
[
|
||||
"$mod, x, exec, ${pause-music}; ${dpms-lock}"
|
||||
"$mod SHIFT, x, exec, ${pause-music}; ${pkgs.hyprlock}/bin/hyprlock & sleep 0.5; systemctl suspend"
|
||||
"$mod SHIFT, x, exec, ${pause-music}; ${pkgs.swaylock}/bin/swaylock -f; systemctl suspend"
|
||||
];
|
||||
};
|
||||
};
|
||||
@@ -78,7 +59,11 @@ in
|
||||
security = {
|
||||
polkit.enable = true;
|
||||
|
||||
pam.services.hyprlock = {};
|
||||
pam.services.swaylock.text = ''
|
||||
# PAM configuration file for the swaylock screen locker. By default, it includes
|
||||
# the 'login' configuration file (see /etc/pam.d/login)
|
||||
auth include login
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,23 +1,7 @@
|
||||
{ pkgs, ... }:
|
||||
{ ... }:
|
||||
{
|
||||
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 = {
|
||||
checkReversePath = "loose";
|
||||
allowedUDPPorts = [ 41641 ];
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
# https://old.reddit.com/r/tmux/comments/mesrci/tmux_2_doesnt_seem_to_use_256_colors/
|
||||
set -g default-terminal "xterm-256color"
|
||||
set -ga terminal-overrides ",*256col*:Tc"
|
||||
set -ga terminal-overrides ',*:Ss=\E[%p1%d q:Se=\E[ q'
|
||||
set -ga terminal-overrides "*:Ss=\E[%p1%d q:Se=\E[ q"
|
||||
set-environment -g COLORTERM "truecolor"
|
||||
|
||||
set-option -g allow-rename off
|
||||
|
||||
@@ -12,52 +12,6 @@ let
|
||||
in
|
||||
{
|
||||
home-manager.users.alex = {
|
||||
# Ensure bashInteractive is first in PATH inside nix devshells.
|
||||
# stdenv provides a non-interactive bash that breaks Copilot shell commands.
|
||||
# Adding bashInteractive to home.packages alone isn't enough because devshell
|
||||
# packages are prepended to PATH. This precmd hook runs after direnv's hook
|
||||
# and re-prepends bashInteractive so it takes priority.
|
||||
programs.zsh.initContent = ''
|
||||
_ensure_bash_interactive() {
|
||||
[[ "$PATH" == "${pkgs.bashInteractive}/bin:"* ]] || export PATH="${pkgs.bashInteractive}/bin:$PATH"
|
||||
}
|
||||
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
|
||||
home.activation.intellijIgnoreDirenv = ''
|
||||
for idea_config in $HOME/.config/JetBrains/IntelliJIdea*; do
|
||||
if [ -d "$idea_config" ]; then
|
||||
$DRY_RUN_CMD mkdir -p "$idea_config/options"
|
||||
$DRY_RUN_CMD tee "$idea_config/options/filetypes.xml" > /dev/null <<'EOF'
|
||||
<application>
|
||||
<component name="FileTypeManager" version="18">
|
||||
<ignoreFiles list="*.pyc;*.pyo;*.rbc;*.yarb;*~;.DS_Store;.git;.hg;.svn;CVS;__pycache__;_svn;vssver.scc;vssver2.scc;.direnv" />
|
||||
</component>
|
||||
</application>
|
||||
EOF
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
home.sessionVariables = {
|
||||
GITHUB_ACTOR = "Alexander Heldt";
|
||||
GITHUB_TOKEN = "$(${pkgs.coreutils}/bin/cat ${config.age.secrets.work-github-token.path})";
|
||||
@@ -71,7 +25,6 @@ EOF
|
||||
"IdeaVIM"
|
||||
"com.github.copilot"
|
||||
])
|
||||
pkgs.bashInteractive
|
||||
|
||||
(pkgs.google-cloud-sdk.withExtraComponents [
|
||||
pkgs.google-cloud-sdk.components.gke-gcloud-auth-plugin
|
||||
@@ -82,8 +35,6 @@ EOF
|
||||
pkgs.postman
|
||||
pkgs.grpcurl
|
||||
|
||||
pkgs.slack
|
||||
|
||||
# for `radio`
|
||||
pkgs.go-mockery
|
||||
pkgs.golangci-lint
|
||||
|
||||
@@ -48,7 +48,6 @@ in
|
||||
mode = "0755";
|
||||
text = ''
|
||||
#!${pkgs.bash}/bin/bash
|
||||
[ "$1" = "alex" ] || exit 0
|
||||
for file in ${authorizedKeysPath}/*; do
|
||||
${pkgs.coreutils}/bin/cat "$file"
|
||||
done
|
||||
@@ -72,7 +71,7 @@ in
|
||||
KbdInteractiveAuthentication = false;
|
||||
};
|
||||
|
||||
authorizedKeysCommand = "/etc/ssh/authorized_keys_command %u";
|
||||
authorizedKeysCommand = "/etc/ssh/authorized_keys_command";
|
||||
authorizedKeysCommandUser = "root";
|
||||
};
|
||||
};
|
||||
@@ -98,11 +97,6 @@ in
|
||||
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" = {
|
||||
file = ../../../../secrets/tadpole/alex.tadpole-git.ppp.pm.age;
|
||||
path = "/home/alex/.ssh/alex.tadpole-git.ppp.pm";
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-ed25519 wkRvNA GW8mvnaXpspxr78xV0fKhXwHVvReyjvDc0v7uPwhuBI
|
||||
Rne8JZYVhrTTesSFpRQ/IOZlFIMoX9Wmv5n1Ed7Ehv8
|
||||
-> ssh-ed25519 +oNaHQ d7utzodGQ7LsD2Uht1rbT8Qq9BZp3PkJS9EDhajCjnk
|
||||
qd2Vj+1TQrjEKkSVAf0cXcCdkgeN/Jbp4UrBSp3cKYQ
|
||||
--- JQr5UQlutONqnTeoT/mIVZL8ME7ipUDK8zDfNcN3uhU
|
||||
ø5-V ŸÌ²Â òÀ-®ªÁÅ'^žô5kú.t(d1‡)É'<u%
|
||||
@@ -1,7 +0,0 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-ed25519 wkRvNA 5bEWAlzS34w3tMqMCTRqFoni4MKyQCcaBdEQ96BccVk
|
||||
85rIfjpzL/cNx5SlpKeOUzsMl0rwvCdPgrZ0jlXE1nQ
|
||||
-> ssh-ed25519 +oNaHQ d2ZZ/XQ5fgT8FMwhyfWHB5FESXM0Y9tlE1KcWwQV7HY
|
||||
bCj5fLqN2zfPBcnXaJAYJYA+PXTPAdLZVy2FinZvUTM
|
||||
--- vxopGi8/YrgI/VceX807yk7edWrdYgjmGYG9Zp/cuQA
|
||||
žFc˜ÖÂ|ª67Ñ~uðáúÉ€Wê–ÿ’eïó‰ÍVMj5‹Ü G?³JâË_pîcf57^ƒŒ¥r@g&�?„¬4ŠþÎðˆÉ‘@ƒN…œ sjZ¡Šé^-âyB{\ºÔñ3«ˆýT)³ž¯uÝ\Wa\àìB)@d ™vrì8q.kÚ™˜
|
||||
@@ -1,7 +0,0 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-ed25519 wkRvNA ykXbxHlehL+AucBCiS7NKNOWjHm51ZTbfgM7fPU+QDo
|
||||
FtPBWg91yWq90n4PkzdwpIq+DnwL+nwUNzH3mQP4lgg
|
||||
-> ssh-ed25519 +oNaHQ fCNig/NdBmbZqicNhSnYKz7Rmc7S2JpN+sQ50o+QFg0
|
||||
AQiKSjZMsjuJGsnZWjSNePrbXBQ/f1zhNCXLznbZk1w
|
||||
--- zjW49MAgjerHuHqMrSSDpgkWLD40eMSr+ZkKZ0Y9pJo
|
||||
•Ø‡¯O¹Þ °�}Œ/¨ïd°°
|
||||
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.
Binary file not shown.
Binary file not shown.
@@ -1,7 +1,8 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-ed25519 vxPbZg GMTnaun91WNPRFQYkN7xPqdALyMQpXCOq6jj4Q4O1Q0
|
||||
OyA/Zk7KQlbSyJlXETFh4JZ57S92oXULa9/mgC019PE
|
||||
-> ssh-ed25519 +oNaHQ C0K34MjLZDIKv6ci2efBxv1nfvuHKn9OCj26DxjtmBo
|
||||
tMG+KxpFX2K8F34iNxDBpb2epd94QPFWo8X/mY67LEI
|
||||
--- FBMSSr82MYSwER9O8dEs3o2vy/+rc29DxUuziFZqYzw
|
||||
l'c(êˆ6 ônnxgA7j"%ÎIÂ'¢{úH¯˜@Þ™vä°ÔêyŸåJûT°©ˆ¼)ÇÃ…¿nSÝ&ìÉš¦e;õ 4zNº½„K U¤Á€,d”�Cñæ®®U ;Dc«.�x`
|
||||
-> ssh-ed25519 vxPbZg bCF+MdTMA8jH26XEosgyd5N0RsTa9WT/VAIZGsVemHg
|
||||
1DNCO2mpsJ68osmFZIzAlY6kjoxCbThpSI4XNEyUNjY
|
||||
-> ssh-ed25519 +oNaHQ L91QfGk0r81Df5fHWHdrvXJ54FJ+3S30vus/h4v/H2k
|
||||
Vi/5VdJhl72cwLiD2qxbmQiKD0RPb4vv6VddGWrPvF4
|
||||
--- F8ff4nu9K9cXId34L2RMBzH4vE3efIuzISN1spbvDHo
|
||||
KÙŒ¬�Ëâey¾z’ÛŸ%Œ]Ÿ…˜m®s÷«¥úb°U×qX{¸±‹!©(�u‹|ø!œ_‘}˜íÿ<ùÓ#ù–ÞºˆžXU^¸üs”W�´wñ NÐÆU×ù¥D
|
||||
ú˜
|
||||
@@ -15,12 +15,8 @@ in {
|
||||
"pinwheel/alex.pinwheel-backwards.pub.age".publicKeys = [ pinwheel backwards alex ];
|
||||
"pinwheel/alex.pinwheel-tadpole.age".publicKeys = [ pinwheel 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.pub.age".publicKeys = [ pinwheel alex ];
|
||||
"pinwheel/alex.pinwheel-github.com-signing.age".publicKeys = [ pinwheel alex ];
|
||||
"pinwheel/alex.pinwheel-github.com-signing.pub.age".publicKeys = [ pinwheel alex ];
|
||||
"pinwheel/alex.pinwheel-git.ppp.pm.age".publicKeys = [ pinwheel alex ];
|
||||
"pinwheel/alex.pinwheel-git.ppp.pm.pub.age".publicKeys = [ pinwheel alex ];
|
||||
|
||||
@@ -38,12 +34,6 @@ in {
|
||||
"manatee/syncthing-key.age".publicKeys = [ manatee alex ];
|
||||
"manatee/hetzner-dns.age".publicKeys = [ manatee alex ];
|
||||
"manatee/komga-comicbooktracker-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-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.pub.age".publicKeys = [ backwards alex ];
|
||||
|
||||
Reference in New Issue
Block a user