feat(flake)!: convert everything to flake-parts-style flake modules
Use `agenix-rekey` flake module Add `NixOS` module for `agenix-rekey` - Default `masterIdentities` - Default `localStorageDir`
This commit is contained in:
parent
b3390f3565
commit
75ab40c7ca
GPG key ID:
675AA7EF13964ACB
14 changed files with 628 additions and 575 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,3 +1,4 @@
|
||||||
/.direnv/
|
/.direnv/
|
||||||
/secrets/*key*
|
/secrets/*key*
|
||||||
!/secrets/*.age
|
!/secrets/*.age
|
||||||
|
!/secrets/rekeyed
|
||||||
|
|
|
||||||
199
flake.lock
199
flake.lock
|
|
@ -14,11 +14,11 @@
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716561646,
|
"lastModified": 1720546205,
|
||||||
"narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=",
|
"narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=",
|
||||||
"owner": "ryantm",
|
"owner": "ryantm",
|
||||||
"repo": "agenix",
|
"repo": "agenix",
|
||||||
"rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9",
|
"rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -37,11 +37,11 @@
|
||||||
"pre-commit-hooks": "pre-commit-hooks"
|
"pre-commit-hooks": "pre-commit-hooks"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717022817,
|
"lastModified": 1721071152,
|
||||||
"narHash": "sha256-PHyHgQL5/b0+A/kmNCHVOM/WSJSGe1jZ+LFWfYNx31E=",
|
"narHash": "sha256-GoshD2O4dDNuGPPK4AiVCkM38j9/8OImYudY0zjFDcc=",
|
||||||
"owner": "oddlama",
|
"owner": "oddlama",
|
||||||
"repo": "agenix-rekey",
|
"repo": "agenix-rekey",
|
||||||
"rev": "c6c1ca5b9ceaaa40fd979fb25bb7043adf4554ad",
|
"rev": "d63898728266e3a30f5367a0efbbfaedf9cf8041",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -68,11 +68,11 @@
|
||||||
},
|
},
|
||||||
"cl-nix-lite": {
|
"cl-nix-lite": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1709357207,
|
"lastModified": 1717972076,
|
||||||
"narHash": "sha256-YZgXj6oL2Y/zDkSkGcoacpQPRLiYM8KeEB68CUs2irc=",
|
"narHash": "sha256-hnZEsDInTcsVSL5LBGDAZegAxVLBus/wiJh+sNM15zU=",
|
||||||
"owner": "hraban",
|
"owner": "hraban",
|
||||||
"repo": "cl-nix-lite",
|
"repo": "cl-nix-lite",
|
||||||
"rev": "f55d263b30a601b1b4dd61b7c8787e97510f4018",
|
"rev": "cc920bfb0a6402d3871f470c98d65266126973e4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -111,11 +111,11 @@
|
||||||
"utils": "utils"
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715699772,
|
"lastModified": 1718194053,
|
||||||
"narHash": "sha256-sKhqIgucN5sI/7UQgBwsonzR4fONjfMr9OcHK/vPits=",
|
"narHash": "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=",
|
||||||
"owner": "serokell",
|
"owner": "serokell",
|
||||||
"repo": "deploy-rs",
|
"repo": "deploy-rs",
|
||||||
"rev": "b3ea6f333f9057b77efd9091119ba67089399ced",
|
"rev": "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -153,11 +153,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717177033,
|
"lastModified": 1721266288,
|
||||||
"narHash": "sha256-G3CZJafCO8WDy3dyA2EhpUJEmzd5gMJ2IdItAg0Hijw=",
|
"narHash": "sha256-MsyTzXu9CJVcBr44ct8ILKF/Ro7VlF+tVZTylzAoXSs=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "0274af4c92531ebfba4a5bd493251a143bc51f3c",
|
"rev": "e8e8d9a3a9c1d0e654ccda7834bf0288a9d15c47",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -286,11 +286,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715865404,
|
"lastModified": 1719994518,
|
||||||
"narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
|
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
|
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -307,11 +307,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715865404,
|
"lastModified": 1719994518,
|
||||||
"narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
|
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
|
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -382,11 +382,11 @@
|
||||||
"systems": "systems_5"
|
"systems": "systems_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1709126324,
|
"lastModified": 1710146030,
|
||||||
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
|
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
|
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -498,11 +498,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716213921,
|
"lastModified": 1721042469,
|
||||||
"narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=",
|
"narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0",
|
"rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -578,11 +578,11 @@
|
||||||
},
|
},
|
||||||
"hardware": {
|
"hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716987116,
|
"lastModified": 1721331912,
|
||||||
"narHash": "sha256-uuEkErFVsFdg2K0cKbNQ9JlFSAm/xYqPr4rbPLI91Y8=",
|
"narHash": "sha256-h2yaU+QEU4pHxMySHPIsRV2T/pihDHnrXBca8BY6xgc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "8251761f93d6f5b91cee45ac09edb6e382641009",
|
"rev": "bb90787ea034c8b9035dfcfc9b4dc23898d414be",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -600,11 +600,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713898448,
|
"lastModified": 1719226092,
|
||||||
"narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=",
|
"narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "hercules-ci-effects",
|
"repo": "hercules-ci-effects",
|
||||||
"rev": "c0302ec12d569532a6b6bd218f698bc402e93adc",
|
"rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -620,11 +620,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717097707,
|
"lastModified": 1721135958,
|
||||||
"narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=",
|
"narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9",
|
"rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -635,11 +635,11 @@
|
||||||
},
|
},
|
||||||
"impermanence": {
|
"impermanence": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1708968331,
|
"lastModified": 1719091691,
|
||||||
"narHash": "sha256-VUXLaPusCBvwM3zhGbRIJVeYluh2uWuqtj4WirQ1L9Y=",
|
"narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "impermanence",
|
"repo": "impermanence",
|
||||||
"rev": "a33ef102a02ce77d3e39c25197664b7a636f9c30",
|
"rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -656,11 +656,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717012808,
|
"lastModified": 1721226562,
|
||||||
"narHash": "sha256-Wn0fbjqmpIiuPUWnvxu85a9sPYtSd/2tcPDhAYW54RM=",
|
"narHash": "sha256-KfdwusX12hhkzXKBmu2HhaU9EhaxVeWLDQw1Ll2A03o=",
|
||||||
"owner": "Jovian-Experiments",
|
"owner": "Jovian-Experiments",
|
||||||
"repo": "Jovian-NixOS",
|
"repo": "Jovian-NixOS",
|
||||||
"rev": "a8e6557f29fa0cbcc2c54d15f9664c14ae2a3e98",
|
"rev": "927eea31915468e06b94bedf678261dc7cf048c8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -672,13 +672,13 @@
|
||||||
"langref": {
|
"langref": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"narHash": "sha256-Kz+m9yeJgAsUfNwGG6ZDqZ3ElLZMeQmVYzgg0EEUzV4=",
|
"narHash": "sha256-O6p2tiKD8ZMhSX+DeA/o5hhAvcPkU2J9lFys/r11peY=",
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"url": "https://raw.githubusercontent.com/ziglang/zig/a685ab1499d6560c523f0dbce2890dc140671e43/doc/langref.html.in"
|
"url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"url": "https://raw.githubusercontent.com/ziglang/zig/a685ab1499d6560c523f0dbce2890dc140671e43/doc/langref.html.in"
|
"url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"lib-net": {
|
"lib-net": {
|
||||||
|
|
@ -702,11 +702,11 @@
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710104942,
|
"lastModified": 1719942949,
|
||||||
"narHash": "sha256-YrzF8P9Hi4CHky2z3hTKdPn/Zks+n4O4RkbSg75QhVc=",
|
"narHash": "sha256-srSQac7dhXtisqu4XwPGrK8qcmT2rflJJ1mRIV9j0Qk=",
|
||||||
"owner": "hraban",
|
"owner": "hraban",
|
||||||
"repo": "mac-app-util",
|
"repo": "mac-app-util",
|
||||||
"rev": "b2d3667f3b8d650310e55b38d3c4a5f35949e1f6",
|
"rev": "63f269f737cafb2219ba38780c1ecb1dc24bc4a2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -727,11 +727,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717214603,
|
"lastModified": 1721281012,
|
||||||
"narHash": "sha256-GHZpwwZe7LVYCQGp05oFQ653oiP3jgin+bgZSOgp3uE=",
|
"narHash": "sha256-km+EYinh23cAztAFDi2dX/Dqx9NN9jjmyFAII1CZB4Y=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "neovim-nightly-overlay",
|
"repo": "neovim-nightly-overlay",
|
||||||
"rev": "15fae73bcb20aad8fe2c88373d77a2b71dd13f5a",
|
"rev": "bc1d14af6c0834c68b09fdfd588b4e82bd8177d1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -743,11 +743,11 @@
|
||||||
"neovim-src": {
|
"neovim-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717166885,
|
"lastModified": 1721260040,
|
||||||
"narHash": "sha256-HcvLlqj4SaBEqjf1aVnH0Jig1oVwrX/LWNbAx0Sx5Jk=",
|
"narHash": "sha256-Aj1WC8RCOx000R97YPzocO3QGTaj0YVhGF1fDxWwqWo=",
|
||||||
"owner": "neovim",
|
"owner": "neovim",
|
||||||
"repo": "neovim",
|
"repo": "neovim",
|
||||||
"rev": "d62d181ce065556be51d5eda0425aa42f427cc27",
|
"rev": "185b22720de9156393ddc22c2c59dc3eb46b8d97",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -782,11 +782,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716993688,
|
"lastModified": 1721270582,
|
||||||
"narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=",
|
"narHash": "sha256-MdZmYPPExntE5rJu88IhJSy8Um4UyZCTXhOwvzbjDVI=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4",
|
"rev": "a3e4a7b8ffc08c7dc1973822a77ad432e1ec3dec",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -802,7 +802,10 @@
|
||||||
"nix-on-droid",
|
"nix-on-droid",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"nmd": "nmd",
|
"nmd": [
|
||||||
|
"nix-on-droid",
|
||||||
|
"nmd"
|
||||||
|
],
|
||||||
"nmt": "nmt"
|
"nmt": "nmt"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
@ -872,14 +875,14 @@
|
||||||
],
|
],
|
||||||
"nixpkgs-docs": "nixpkgs-docs",
|
"nixpkgs-docs": "nixpkgs-docs",
|
||||||
"nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap",
|
"nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap",
|
||||||
"nmd": "nmd_2"
|
"nmd": "nmd"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710434231,
|
"lastModified": 1720964831,
|
||||||
"narHash": "sha256-yrWnsG28518tbIapJWiluweHORuuIwAQrA8lga0Sqlw=",
|
"narHash": "sha256-UwVKfjrQ6FWTuqks6lF4+VlzPFDC/GR1Ti/iBKTEQco=",
|
||||||
"owner": "t184256",
|
"owner": "t184256",
|
||||||
"repo": "nix-on-droid",
|
"repo": "nix-on-droid",
|
||||||
"rev": "2d93311c4f3f300154d2085e4b4b1d550237da92",
|
"rev": "c00333ee42aa2b4d4825e0388a1049fdeeded6c6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -890,16 +893,18 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710066242,
|
"lastModified": 1717868076,
|
||||||
"narHash": "sha256-bO7kahLdawW7rBqUTfWgf9mdPYrnOo5DGvWRJa9N8Do=",
|
"narHash": "sha256-c83Y9t815Wa34khrux81j8K8ET94ESmCuwORSKm2bQY=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "db339f1706f555794b71aa4eb26a5a240fb6a599",
|
"rev": "cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"id": "nixpkgs",
|
"owner": "NixOS",
|
||||||
"type": "indirect"
|
"repo": "nixpkgs",
|
||||||
|
"rev": "cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9",
|
||||||
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-docs": {
|
"nixpkgs-docs": {
|
||||||
|
|
@ -920,17 +925,17 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-for-bootstrap": {
|
"nixpkgs-for-bootstrap": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1708105575,
|
"lastModified": 1720244366,
|
||||||
"narHash": "sha256-sS4AItZeUnAei6v8FqxNlm+/27MPlfoGym/TZP0rmH0=",
|
"narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26",
|
"rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26",
|
"rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -979,11 +984,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716948383,
|
"lastModified": 1721138476,
|
||||||
"narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
|
"narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
|
"rev": "ad0b5eed1b6031efaed382844806550c3dcb4206",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1042,22 +1047,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nmd": {
|
"nmd": {
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1666190571,
|
|
||||||
"narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=",
|
|
||||||
"owner": "rycee",
|
|
||||||
"repo": "nmd",
|
|
||||||
"rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169",
|
|
||||||
"type": "gitlab"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "rycee",
|
|
||||||
"repo": "nmd",
|
|
||||||
"type": "gitlab"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nmd_2": {
|
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nix-on-droid",
|
"nix-on-droid",
|
||||||
|
|
@ -1097,11 +1086,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717242279,
|
"lastModified": 1721335575,
|
||||||
"narHash": "sha256-ovx7RavkxxTXRokC5h1rmKtMZj8QautKLw9XhwGs8R4=",
|
"narHash": "sha256-dry8Y8MwACIdIBVFDOFQGpKd8PmEIPv9Ej0UdrdOlG8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "5b704d93015b0e73a5d528fc97598b33e71cda69",
|
"rev": "6e46867fdecc920a1de55dc1e553a16f54e2d2ee",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1149,11 +1138,11 @@
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1709831932,
|
"lastModified": 1718869541,
|
||||||
"narHash": "sha256-WsP8rOFa/SqYNbVtYJ/l2mWWOgyDTJFbITMV8tv0biI=",
|
"narHash": "sha256-smhpGh1x/8mNl+sFL8SbeWnx0bK4HWjmdRA3mIwGjPU=",
|
||||||
"owner": "yaxitech",
|
"owner": "yaxitech",
|
||||||
"repo": "ragenix",
|
"repo": "ragenix",
|
||||||
"rev": "06de099ef02840ec463419f12de73729d458e1eb",
|
"rev": "8a254bbaa93fbd38e16f70fa81af6782794e046e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1446,11 +1435,11 @@
|
||||||
"rust-overlay": "rust-overlay_2"
|
"rust-overlay": "rust-overlay_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715552757,
|
"lastModified": 1718525212,
|
||||||
"narHash": "sha256-ZOgCSIcdvG8+RcZCXSAEmb/LZ2Ap9wU4nvbxNDA+QN0=",
|
"narHash": "sha256-6IuZ2lf9KhvFUFBRKrpgzT9J70lqKZ8f5pdkITXzKZE=",
|
||||||
"owner": "Toqozz",
|
"owner": "Toqozz",
|
||||||
"repo": "wired-notify",
|
"repo": "wired-notify",
|
||||||
"rev": "18b44306b2636fc7f238a9d946c7b8aac217122d",
|
"rev": "9e4bbd5873b11de6547cf787618a708fad076557",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1468,11 +1457,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717201580,
|
"lastModified": 1721304636,
|
||||||
"narHash": "sha256-ZIg+6mVZouGoBXuoFO8/hnTwKHkFFSXoBV9xbqSrA0c=",
|
"narHash": "sha256-vpincauiWXBtlQLzGQNjAGlOjfOuh+nb30AUAsnMhWs=",
|
||||||
"owner": "mitchellh",
|
"owner": "mitchellh",
|
||||||
"repo": "zig-overlay",
|
"repo": "zig-overlay",
|
||||||
"rev": "a2933e55d939d4ce54dd1b2592b2d7e52f995943",
|
"rev": "a88326d1947156a6ad22b00d44fb3f1bf0a98673",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1494,11 +1483,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717102432,
|
"lastModified": 1721153775,
|
||||||
"narHash": "sha256-+mx8Mye0RO0wAuLEyZTuoyANK54XErDLDp5SVfkhE3E=",
|
"narHash": "sha256-kReih1LP5I9J0P+ByAOKNv/d4re0P/bH2AD6InGjN1U=",
|
||||||
"owner": "zigtools",
|
"owner": "zigtools",
|
||||||
"repo": "zls",
|
"repo": "zls",
|
||||||
"rev": "d2d5f43017e54e036df3c9cac365541ea5cabce9",
|
"rev": "41dae221fab979b3764e9191d8126e09625b0bb2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
51
flake.nix
51
flake.nix
|
|
@ -133,7 +133,6 @@
|
||||||
let
|
let
|
||||||
inherit (inputs) self;
|
inherit (inputs) self;
|
||||||
inherit (self) outputs;
|
inherit (self) outputs;
|
||||||
util = import ./util { inherit inputs outputs; };
|
|
||||||
in
|
in
|
||||||
inputs.flake-parts.lib.mkFlake { inherit inputs; } ({ withSystem, flake-parts-lib, ... }: {
|
inputs.flake-parts.lib.mkFlake { inherit inputs; } ({ withSystem, flake-parts-lib, ... }: {
|
||||||
systems = [
|
systems = [
|
||||||
|
|
@ -144,7 +143,15 @@
|
||||||
"x86_64-darwin"
|
"x86_64-darwin"
|
||||||
];
|
];
|
||||||
|
|
||||||
perSystem = { pkgs, lib, system, ... }: {
|
imports = [
|
||||||
|
inputs.agenix-rekey.flakeModule
|
||||||
|
./nix/machines.nix
|
||||||
|
./nix/modules.nix
|
||||||
|
./nix/configurations.nix
|
||||||
|
./nix/deploy.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
perSystem = { lib, pkgs, system, ... }: {
|
||||||
_module.args.pkgs = import inputs.nixpkgs {
|
_module.args.pkgs = import inputs.nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
overlays = lib.attrValues outputs.overlays;
|
overlays = lib.attrValues outputs.overlays;
|
||||||
|
|
@ -163,7 +170,11 @@
|
||||||
# Formatter (`nix fmt`)
|
# Formatter (`nix fmt`)
|
||||||
formatter = pkgs.nixpkgs-fmt;
|
formatter = pkgs.nixpkgs-fmt;
|
||||||
|
|
||||||
# TODO: reseach `agenix-shell` <https://flake.parts/options/agenix-shell>
|
agenix-rekey = {
|
||||||
|
nodes = {
|
||||||
|
inherit (self.nixosConfigurations) jeeves;
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
flake = {
|
flake = {
|
||||||
|
|
@ -178,40 +189,6 @@
|
||||||
overlays = import ./overlays {
|
overlays = import ./overlays {
|
||||||
inherit inputs outputs;
|
inherit inputs outputs;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Machines
|
|
||||||
inherit (util)
|
|
||||||
machines
|
|
||||||
homeManagerMachines
|
|
||||||
nixDarwinMachines
|
|
||||||
nixOnDroidMachines
|
|
||||||
nixosMachines;
|
|
||||||
|
|
||||||
# Modules
|
|
||||||
inherit (util)
|
|
||||||
nixosModules
|
|
||||||
nixOnDroidModules
|
|
||||||
nixDarwinModules
|
|
||||||
homeManagerModules
|
|
||||||
flakeModules;
|
|
||||||
|
|
||||||
# Configurations
|
|
||||||
nixosConfigurations = util.autoNixosConfigurations;
|
|
||||||
nixOnDroidConfigurations = util.autoNixOnDroidConfigurations;
|
|
||||||
darwinConfigurations = util.autoDarwinConfigurations;
|
|
||||||
homeConfigurations = util.autoHomeConfigurations;
|
|
||||||
|
|
||||||
# Secrets
|
|
||||||
agenix-rekey = inputs.agenix-rekey.configure {
|
|
||||||
userFlake = self;
|
|
||||||
nodes = {
|
|
||||||
inherit (self.nixosConfigurations) jeeves;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Deploy.rs nodes
|
|
||||||
deploy.nodes = util.deploy.autoNodes;
|
|
||||||
checks = util.autoChecks;
|
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
14
modules/nixos/agenix-rekey-default/default.nix
Normal file
14
modules/nixos/agenix-rekey-default/default.nix
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
{ inputs, outputs, lib, pkgs, config, options, ... }:
|
||||||
|
let
|
||||||
|
# NOTE: synced with <https://github.com/oddlama/agenix-rekey/blob/c071067f7d972552f5170cf8665643ed0ec19a6d/modules/agenix-rekey.nix#L38>
|
||||||
|
dummyPubkey = "age1qyqszqgpqyqszqgpqyqszqgpqyqszqgpqyqszqgpqyqszqgpqyqs3290gq";
|
||||||
|
in {
|
||||||
|
# TODO: cleaner deep check
|
||||||
|
config = lib.mkIf (lib.all lib.id [(builtins.hasAttr "age" options) (builtins.hasAttr "rekey" options.age)]) {
|
||||||
|
age.rekey = lib.mkIf (config.age.rekey.hostPubkey != dummyPubkey) {
|
||||||
|
masterIdentities = [ "${inputs.self}/secrets/privkey.age" ];
|
||||||
|
storageMode = "local";
|
||||||
|
localStorageDir = "${inputs.self}/secrets/rekeyed/${config.networking.hostName}";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
237
nix/configurations.nix
Normal file
237
nix/configurations.nix
Normal file
|
|
@ -0,0 +1,237 @@
|
||||||
|
{ lib, config, self, inputs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
inherit (inputs)
|
||||||
|
nixpkgs;
|
||||||
|
# TODO: works?
|
||||||
|
outputs = self;
|
||||||
|
inherit (import ./utils.nix { inherit lib self; })
|
||||||
|
and
|
||||||
|
hasFiles
|
||||||
|
hasDirectories;
|
||||||
|
in
|
||||||
|
let
|
||||||
|
# Configuration helpers
|
||||||
|
mkNixosHost = root: system: hostname: users: lib.nixosSystem {
|
||||||
|
inherit system;
|
||||||
|
|
||||||
|
modules = [
|
||||||
|
(lib.path.append root "configuration.nix")
|
||||||
|
inputs.home-manager.nixosModules.home-manager
|
||||||
|
{
|
||||||
|
nixpkgs.overlays = builtins.attrValues self.overlays;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
home-manager = {
|
||||||
|
useGlobalPkgs = false;
|
||||||
|
useUserPackages = true;
|
||||||
|
users = lib.attrsets.genAttrs
|
||||||
|
users
|
||||||
|
(user: import (lib.path.append root "home/${user}.nix"));
|
||||||
|
sharedModules = builtins.attrValues config.flake.homeManagerModules;
|
||||||
|
extraSpecialArgs = {
|
||||||
|
inherit inputs outputs;
|
||||||
|
inherit hostname;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
{
|
||||||
|
networking.hostName = lib.mkDefault hostname;
|
||||||
|
}
|
||||||
|
] ++ (builtins.attrValues config.flake.nixosModules);
|
||||||
|
|
||||||
|
specialArgs = {
|
||||||
|
inherit inputs outputs;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
mkNixOnDroidHost = root: system: hostname: inputs.nix-on-droid.lib.nixOnDroidConfiguration {
|
||||||
|
pkgs = import nixpkgs {
|
||||||
|
inherit system;
|
||||||
|
|
||||||
|
overlays = builtins.attrValues self.overlays ++ [
|
||||||
|
inputs.nix-on-droid.overlays.default
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
modules = [
|
||||||
|
(lib.path.append root "configuration.nix")
|
||||||
|
{
|
||||||
|
home-manager = {
|
||||||
|
config = (lib.path.append root "home.nix");
|
||||||
|
backupFileExtension = "hm-bak";
|
||||||
|
useGlobalPkgs = false;
|
||||||
|
useUserPackages = true;
|
||||||
|
sharedModules = builtins.attrValues config.flake.homeManagerModules ++ [
|
||||||
|
{
|
||||||
|
nixpkgs.overlays = builtins.attrValues self.overlays;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
extraSpecialArgs = {
|
||||||
|
inherit inputs outputs;
|
||||||
|
inherit hostname;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
] ++ (builtins.attrValues config.flake.nixOnDroidModules);
|
||||||
|
|
||||||
|
extraSpecialArgs = {
|
||||||
|
inherit inputs outputs;
|
||||||
|
inherit hostname;
|
||||||
|
# rootPath = ./.;
|
||||||
|
};
|
||||||
|
|
||||||
|
home-manager-path = inputs.home-manager.outPath;
|
||||||
|
};
|
||||||
|
|
||||||
|
mkNixDarwinHost = root: system: hostname: users: inputs.nix-darwin.lib.darwinSystem {
|
||||||
|
inherit system;
|
||||||
|
|
||||||
|
modules = [
|
||||||
|
(lib.path.append root "configuration.nix")
|
||||||
|
{
|
||||||
|
nixpkgs.hostPlatform = system;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
nixpkgs.overlays = builtins.attrValues self.overlays;
|
||||||
|
}
|
||||||
|
inputs.home-manager.darwinModules.home-manager
|
||||||
|
{
|
||||||
|
home-manager = {
|
||||||
|
useGlobalPkgs = false;
|
||||||
|
useUserPackages = true;
|
||||||
|
users = lib.attrsets.genAttrs
|
||||||
|
users
|
||||||
|
(user: import (lib.path.append root "home/${user}.nix"));
|
||||||
|
sharedModules = builtins.attrValues config.flake.homeManagerModules;
|
||||||
|
extraSpecialArgs = {
|
||||||
|
inherit inputs outputs;
|
||||||
|
inherit hostname;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
] ++ (builtins.attrValues config.flake.nixDarwinModules);
|
||||||
|
|
||||||
|
specialArgs = {
|
||||||
|
inherit inputs outputs;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
mkHomeManagerHost = root: system: hostname: inputs.home-manager.lib.homeManagerConfiguration {
|
||||||
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
|
|
||||||
|
modules = [
|
||||||
|
(lib.path.append root "home.nix")
|
||||||
|
{
|
||||||
|
nixpkgs.overlays = builtins.attrValues self.overlays;
|
||||||
|
}
|
||||||
|
] ++ (builtins.attrValues config.flake.homeManagerModules);
|
||||||
|
|
||||||
|
extraSpecialArgs = {
|
||||||
|
inherit inputs outputs;
|
||||||
|
inherit hostname;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
createConfigurations =
|
||||||
|
pred: mkHost: machines:
|
||||||
|
lib.foldAttrs
|
||||||
|
lib.const
|
||||||
|
[ ]
|
||||||
|
(builtins.attrValues
|
||||||
|
(builtins.mapAttrs
|
||||||
|
(system: hosts:
|
||||||
|
lib.concatMapAttrs
|
||||||
|
(host: config:
|
||||||
|
lib.optionalAttrs
|
||||||
|
(and [
|
||||||
|
(host != "__template__")
|
||||||
|
(pred system host config)
|
||||||
|
])
|
||||||
|
{
|
||||||
|
${host} = mkHost system host config;
|
||||||
|
})
|
||||||
|
hosts)
|
||||||
|
machines));
|
||||||
|
|
||||||
|
in
|
||||||
|
{
|
||||||
|
flake = {
|
||||||
|
# Configurations
|
||||||
|
nixosConfigurations =
|
||||||
|
createConfigurations
|
||||||
|
(system: host: config:
|
||||||
|
and
|
||||||
|
[
|
||||||
|
(hasFiles
|
||||||
|
[ "configuration.nix" ]
|
||||||
|
config)
|
||||||
|
# (hasDirectories
|
||||||
|
# [ "home" ]
|
||||||
|
# config)
|
||||||
|
])
|
||||||
|
(system: host: config:
|
||||||
|
mkNixosHost
|
||||||
|
../machines/nixos/${system}/${host}
|
||||||
|
system
|
||||||
|
host
|
||||||
|
(builtins.map
|
||||||
|
(lib.strings.removeSuffix ".nix")
|
||||||
|
(builtins.attrNames (config."home" or { }))))
|
||||||
|
config.flake.nixosMachines;
|
||||||
|
|
||||||
|
nixOnDroidConfigurations =
|
||||||
|
createConfigurations
|
||||||
|
(system: host: config:
|
||||||
|
and
|
||||||
|
[
|
||||||
|
(hasFiles
|
||||||
|
[ "configuration.nix" "home.nix" ]
|
||||||
|
config)
|
||||||
|
])
|
||||||
|
(system: host: config:
|
||||||
|
mkNixOnDroidHost
|
||||||
|
../machines/nix-on-droid/${system}/${host}
|
||||||
|
system
|
||||||
|
host)
|
||||||
|
config.flake.nixOnDroidMachines;
|
||||||
|
|
||||||
|
darwinConfigurations =
|
||||||
|
createConfigurations
|
||||||
|
(system: host: config:
|
||||||
|
and
|
||||||
|
[
|
||||||
|
(hasFiles
|
||||||
|
[ "configuration.nix" ]
|
||||||
|
config)
|
||||||
|
(hasDirectories
|
||||||
|
[ "home" ]
|
||||||
|
config)
|
||||||
|
])
|
||||||
|
(system: host: config:
|
||||||
|
mkNixDarwinHost
|
||||||
|
../machines/nix-darwin/${system}/${host}
|
||||||
|
system
|
||||||
|
host
|
||||||
|
(builtins.map
|
||||||
|
(lib.strings.removeSuffix ".nix")
|
||||||
|
(builtins.attrNames (config."home" or { }))))
|
||||||
|
config.flake.nixDarwinMachines;
|
||||||
|
|
||||||
|
homeConfigurations =
|
||||||
|
createConfigurations
|
||||||
|
(system: host: config:
|
||||||
|
and
|
||||||
|
[
|
||||||
|
(hasFiles
|
||||||
|
[ "home.nix" ]
|
||||||
|
config)
|
||||||
|
])
|
||||||
|
(system: host: config:
|
||||||
|
mkHomeManagerHost
|
||||||
|
../machines/home-manager/${system}/${host}
|
||||||
|
system
|
||||||
|
host)
|
||||||
|
config.flake.homeManagerMachines;
|
||||||
|
};
|
||||||
|
}
|
||||||
45
nix/deploy.nix
Normal file
45
nix/deploy.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
||||||
|
{ lib, config, self, inputs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
inherit (import ./utils.nix { inherit lib self; })
|
||||||
|
accumulateMachines
|
||||||
|
config-type-to-deploy-type;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
flake = {
|
||||||
|
deploy.nodes =
|
||||||
|
accumulateMachines
|
||||||
|
# TODO: nix-on-droid
|
||||||
|
["nixos" "nix-darwin"]
|
||||||
|
({ host, system, config-type, config }:
|
||||||
|
let
|
||||||
|
deploy-config-path =
|
||||||
|
../machines/${config-type}/${system}/${host}/deploy.nix;
|
||||||
|
deploy-config =
|
||||||
|
import deploy-config-path;
|
||||||
|
in
|
||||||
|
lib.optionalAttrs
|
||||||
|
(builtins.pathExists deploy-config-path)
|
||||||
|
{
|
||||||
|
${host} = {
|
||||||
|
inherit (deploy-config)
|
||||||
|
hostname;
|
||||||
|
profiles.system = deploy-config // {
|
||||||
|
path =
|
||||||
|
let
|
||||||
|
deploy-type = config-type-to-deploy-type config-type;
|
||||||
|
in
|
||||||
|
inputs.deploy-rs.lib.${system}.activate.${deploy-type} config;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
checks =
|
||||||
|
lib.mapAttrs
|
||||||
|
(system: deployLib:
|
||||||
|
deployLib.deployChecks
|
||||||
|
self.deploy)
|
||||||
|
inputs.deploy-rs.lib;
|
||||||
|
};
|
||||||
|
}
|
||||||
18
nix/machines.nix
Normal file
18
nix/machines.nix
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
{ lib, config, self, inputs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
inherit (import ./utils.nix { inherit lib self; })
|
||||||
|
recurseDir;
|
||||||
|
in
|
||||||
|
let
|
||||||
|
machines = recurseDir ../machines;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
flake = {
|
||||||
|
# Machines
|
||||||
|
nixosMachines = machines.nixos or { };
|
||||||
|
nixDarwinMachines = machines.nix-darwin or { };
|
||||||
|
nixOnDroidMachines = machines.nix-on-droid or { };
|
||||||
|
homeManagerMachines = machines.home-manager or { };
|
||||||
|
};
|
||||||
|
}
|
||||||
70
nix/modules.nix
Normal file
70
nix/modules.nix
Normal file
|
|
@ -0,0 +1,70 @@
|
||||||
|
{ lib, config, self, inputs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
outputs = self;
|
||||||
|
inherit (import ./utils.nix { inherit lib self; })
|
||||||
|
eq
|
||||||
|
and
|
||||||
|
hasFiles;
|
||||||
|
in
|
||||||
|
let
|
||||||
|
# Modules helpers
|
||||||
|
createModules = baseDir: { passthru ? { inherit inputs outputs; }, ... }:
|
||||||
|
lib.pipe baseDir [
|
||||||
|
# Read given directory
|
||||||
|
builtins.readDir
|
||||||
|
# Map each entry to a module
|
||||||
|
(lib.mapAttrs'
|
||||||
|
(name: type:
|
||||||
|
let
|
||||||
|
moduleDir = lib.path.append baseDir "${name}";
|
||||||
|
in
|
||||||
|
if and [
|
||||||
|
(type == "directory")
|
||||||
|
(hasFiles [ "default.nix" ] (builtins.readDir moduleDir))
|
||||||
|
] then
|
||||||
|
# Classic module in a directory
|
||||||
|
lib.nameValuePair
|
||||||
|
name
|
||||||
|
(import moduleDir)
|
||||||
|
else if and [
|
||||||
|
(type == "regular")
|
||||||
|
(lib.hasSuffix ".nix" name)
|
||||||
|
] then
|
||||||
|
# Classic module in a file
|
||||||
|
lib.nameValuePair
|
||||||
|
(lib.removeSuffix ".nix" name)
|
||||||
|
(import moduleDir)
|
||||||
|
else
|
||||||
|
# Invalid module
|
||||||
|
lib.nameValuePair
|
||||||
|
name
|
||||||
|
null))
|
||||||
|
# Filter invalid modules
|
||||||
|
(lib.filterAttrs
|
||||||
|
(moduleName: module:
|
||||||
|
module != null))
|
||||||
|
# Passthru if needed
|
||||||
|
(lib.mapAttrs
|
||||||
|
(moduleName: module:
|
||||||
|
if and [
|
||||||
|
(builtins.isFunction
|
||||||
|
module)
|
||||||
|
(eq
|
||||||
|
(lib.pipe module [ builtins.functionArgs builtins.attrNames ])
|
||||||
|
(lib.pipe passthru [ builtins.attrNames ]))
|
||||||
|
]
|
||||||
|
then module passthru
|
||||||
|
else module))
|
||||||
|
];
|
||||||
|
in
|
||||||
|
{
|
||||||
|
flake = {
|
||||||
|
# Modules
|
||||||
|
nixosModules = createModules ../modules/nixos { };
|
||||||
|
nixOnDroidModules = createModules ../modules/nix-on-droid { };
|
||||||
|
nixDarwinModules = createModules ../modules/nix-darwin { };
|
||||||
|
homeManagerModules = createModules ../modules/home-manager { };
|
||||||
|
flakeModules = createModules ../modules/flake { };
|
||||||
|
};
|
||||||
|
}
|
||||||
112
nix/utils.nix
Normal file
112
nix/utils.nix
Normal file
|
|
@ -0,0 +1,112 @@
|
||||||
|
{ lib, self, ... }:
|
||||||
|
|
||||||
|
rec {
|
||||||
|
# Boolean helpers
|
||||||
|
and = lib.all lib.id;
|
||||||
|
or = lib.any lib.id;
|
||||||
|
eq = x: y: x == y;
|
||||||
|
|
||||||
|
# Directory walking helpers
|
||||||
|
recurseDir = dir:
|
||||||
|
lib.mapAttrs
|
||||||
|
(file: type:
|
||||||
|
if type == "directory"
|
||||||
|
then recurseDir "${dir}/${file}"
|
||||||
|
else type)
|
||||||
|
(builtins.readDir dir);
|
||||||
|
|
||||||
|
allSatisfy = predicate: attrs: attrset:
|
||||||
|
lib.all
|
||||||
|
(attr:
|
||||||
|
and [
|
||||||
|
(builtins.hasAttr attr attrset)
|
||||||
|
(predicate (builtins.getAttr attr attrset))
|
||||||
|
])
|
||||||
|
attrs;
|
||||||
|
|
||||||
|
# NOTE: Implying last argument is the output of `recurseDir`
|
||||||
|
hasFiles = allSatisfy (eq "regular");
|
||||||
|
|
||||||
|
# NOTE: Implying last argument is the output of `recurseDir`
|
||||||
|
hasDirectories = allSatisfy lib.isAttrs;
|
||||||
|
|
||||||
|
gen-config-type-to = mappings: mkError: config-type:
|
||||||
|
mappings.${config-type} or
|
||||||
|
(builtins.throw
|
||||||
|
(mkError config-type));
|
||||||
|
|
||||||
|
config-type-to-outputs-machines =
|
||||||
|
gen-config-type-to
|
||||||
|
{
|
||||||
|
nixos = "nixosMachines";
|
||||||
|
nix-on-droid = "nixOnDroidMachines";
|
||||||
|
nix-darwin = "nixDarwinMachines";
|
||||||
|
home-manager = "homeMachines";
|
||||||
|
}
|
||||||
|
(config-type:
|
||||||
|
builtins.throw
|
||||||
|
"Invaild config-type \"${config-type}\" for flake outputs' machines");
|
||||||
|
|
||||||
|
config-type-to-outputs-configurations =
|
||||||
|
gen-config-type-to
|
||||||
|
{
|
||||||
|
nixos = "nixosConfigurations";
|
||||||
|
nix-on-droid = "nixOnDroidConfigurations";
|
||||||
|
nix-darwin = "darwinConfigurations";
|
||||||
|
home-manager = "homeConfigurations";
|
||||||
|
}
|
||||||
|
(config-type:
|
||||||
|
builtins.throw
|
||||||
|
"Invaild config-type \"${config-type}\" for flake outputs' configurations");
|
||||||
|
|
||||||
|
config-type-to-deploy-type =
|
||||||
|
gen-config-type-to
|
||||||
|
{
|
||||||
|
nixos = "nixos";
|
||||||
|
nix-darwin = "darwin";
|
||||||
|
}
|
||||||
|
(config-type:
|
||||||
|
builtins.throw
|
||||||
|
"Invaild config-type \"${config-type}\" for deploy-rs deployment");
|
||||||
|
|
||||||
|
accumulateMachines = config-types: host-system-config-type-config-fn:
|
||||||
|
lib.flip lib.concatMapAttrs
|
||||||
|
(lib.genAttrs
|
||||||
|
config-types
|
||||||
|
(config-type:
|
||||||
|
let
|
||||||
|
machines = config-type-to-outputs-machines config-type;
|
||||||
|
in
|
||||||
|
self.${machines}))
|
||||||
|
(config-type: machines:
|
||||||
|
lib.pipe
|
||||||
|
machines
|
||||||
|
[
|
||||||
|
# Filter out nondirectories
|
||||||
|
(lib.filterAttrs
|
||||||
|
(system: configs:
|
||||||
|
builtins.isAttrs configs))
|
||||||
|
# Convert non-template configs into `system-and-config` pairs
|
||||||
|
(lib.concatMapAttrs
|
||||||
|
(system: configs:
|
||||||
|
(lib.concatMapAttrs
|
||||||
|
(host: config:
|
||||||
|
lib.optionalAttrs
|
||||||
|
(host != "__template__")
|
||||||
|
{
|
||||||
|
${host} = {
|
||||||
|
inherit system;
|
||||||
|
config =
|
||||||
|
let
|
||||||
|
configurations = config-type-to-outputs-configurations config-type;
|
||||||
|
in
|
||||||
|
self.${configurations}.${host};
|
||||||
|
};
|
||||||
|
})
|
||||||
|
configs)))
|
||||||
|
# Convert each `system-and-config` pair into a deploy-rs node
|
||||||
|
(lib.concatMapAttrs
|
||||||
|
(host: { system, config }:
|
||||||
|
host-system-config-type-config-fn { inherit host system config-type config; }))
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
age-encryption.org/v1
|
||||||
|
-> ssh-ed25519 vMnblg gHW2W1sQQr+QByiUSyEghScmMmu6UI6rAXbQNjpoBhA
|
||||||
|
xXPVHDNZDjUZ3GSLOP3EDoao+GNa3a+seSC1YZShauc
|
||||||
|
-> <n2-grease @ T/Yh#%V0 % ./^|H
|
||||||
|
hGUgkseGEsh7i0DALN0pf1h4IrjsYqkDc9gsk93c/WNvAvsB5aLGV5vascK7sHz+
|
||||||
|
G5QTeoRjtcwAklRy0swuNZqOgFw344ssEq14b97XxdwAGTI
|
||||||
|
--- Tit/+3FPYExNKp9oLR0Oe4aO5dL50CG2qk55XMLB1m4
|
||||||
|
R.¦z‡n<@bIl¾Ÿ)!J)q«O‘³eøÍ@ï&󫿧`¸¶“ü´“<<3C>ÀCTu<54>Ò…WÄï×v 3À«Èû¨cC%
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
age-encryption.org/v1
|
||||||
|
-> ssh-ed25519 vMnblg io1ovjOPj67EqZUD9gb8PdJOe04MDtvVk/0gxxNLpz0
|
||||||
|
zR3JNHCKEYdudWwekToN8osSr+5yfLSfU5ErINCaUBo
|
||||||
|
-> 1To^`-grease hf^(
|
||||||
|
viCo
|
||||||
|
--- HR02X1joPivzEo6NsI8jr65NnUF9zmuh2RMvoGrsezc
|
||||||
|
TBf
p›tp6€ž“€Ó¸ð>Çõ£ƒb!<21>ÄÑ´<C391>PFmsøTÔ뎕<C5BD>c”Ã8 =¢@¬2ÒÙÜkñ\âx\
fÁýb\v <76>† —9n<39>µ7pU ÜAÓÚVE°7‘P>>yl}W…vU2—‡Ê¯e™j %4z8ˆ?L¸Î":tçz5½ÔŠ
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
age-encryption.org/v1
|
||||||
|
-> ssh-ed25519 vMnblg vAbvVS3hmYNZsOCA740G8nbXDjMTBtDUd+WiSbY3WRU
|
||||||
|
ktnqu2Iw6nPFW/K7yWpP1SEPBguhVgV7QXvs0ykKjQU
|
||||||
|
-> O>#~PW-grease V*zH
|
||||||
|
PtWg8bdQweiozYPpvJ7KJ1VounffOEM78iNKSnA2+rxmWkAxfyFTd8GoAI5b16DF
|
||||||
|
2Q
|
||||||
|
--- +MooDUyfXflGR2hPXlS5j7Twn4YZ1Xnhp/7v9lpbOQM
|
||||||
|
Ľ sď;(Á¨N 2ę9Ld7ô<37>PĂúZZŘ´fĚRnä0’vso$Ň·Ëúśg¸±j¦Şp@NeAŠ€Ď<ý¦ŞÝţ9´Žô»Đ[ŰĽĘ@0¬<30>m_ęp_R
|
||||||
433
util/default.nix
433
util/default.nix
|
|
@ -1,433 +0,0 @@
|
||||||
{ inputs, outputs, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
inherit (inputs) nixpkgs;
|
|
||||||
inherit (nixpkgs) lib;
|
|
||||||
in
|
|
||||||
rec {
|
|
||||||
# Boolean helpers
|
|
||||||
and = lib.all lib.id;
|
|
||||||
or = lib.any lib.id;
|
|
||||||
eq = x: y: x == y;
|
|
||||||
|
|
||||||
# Directory walking helpers
|
|
||||||
recurseDir = dir:
|
|
||||||
lib.mapAttrs
|
|
||||||
(file: type:
|
|
||||||
if type == "directory"
|
|
||||||
then recurseDir "${dir}/${file}"
|
|
||||||
else type)
|
|
||||||
(builtins.readDir dir);
|
|
||||||
|
|
||||||
allSatisfy = predicate: attrs: attrset:
|
|
||||||
lib.all
|
|
||||||
(attr:
|
|
||||||
and [
|
|
||||||
(builtins.hasAttr attr attrset)
|
|
||||||
(predicate (builtins.getAttr attr attrset))
|
|
||||||
])
|
|
||||||
attrs;
|
|
||||||
|
|
||||||
# NOTE: Implying last argument is the output of `recurseDir`
|
|
||||||
hasFiles = allSatisfy (eq "regular");
|
|
||||||
|
|
||||||
# NOTE: Implying last argument is the output of `recurseDir`
|
|
||||||
hasDirectories = allSatisfy lib.isAttrs;
|
|
||||||
|
|
||||||
# Modules helpers
|
|
||||||
createModules = baseDir: { passthru ? { inherit inputs outputs; }, ... }:
|
|
||||||
lib.pipe baseDir [
|
|
||||||
# Read given directory
|
|
||||||
builtins.readDir
|
|
||||||
# Map each entry to a module
|
|
||||||
(lib.mapAttrs'
|
|
||||||
(name: type:
|
|
||||||
let
|
|
||||||
moduleDir = lib.path.append baseDir "${name}";
|
|
||||||
in
|
|
||||||
if and [
|
|
||||||
(type == "directory")
|
|
||||||
(hasFiles [ "default.nix" ] (builtins.readDir moduleDir))
|
|
||||||
] then
|
|
||||||
# Classic module in a directory
|
|
||||||
lib.nameValuePair
|
|
||||||
name
|
|
||||||
(import moduleDir)
|
|
||||||
else if and [
|
|
||||||
(type == "regular")
|
|
||||||
(lib.hasSuffix ".nix" name)
|
|
||||||
] then
|
|
||||||
# Classic module in a file
|
|
||||||
lib.nameValuePair
|
|
||||||
(lib.removeSuffix ".nix" name)
|
|
||||||
(import moduleDir)
|
|
||||||
else
|
|
||||||
# Invalid module
|
|
||||||
lib.nameValuePair
|
|
||||||
name
|
|
||||||
null))
|
|
||||||
# Filter invalid modules
|
|
||||||
(lib.filterAttrs
|
|
||||||
(moduleName: module:
|
|
||||||
module != null))
|
|
||||||
# Passthru if needed
|
|
||||||
(lib.mapAttrs
|
|
||||||
(moduleName: module:
|
|
||||||
if and [
|
|
||||||
(builtins.isFunction
|
|
||||||
module)
|
|
||||||
(eq
|
|
||||||
(lib.pipe module [ builtins.functionArgs builtins.attrNames ])
|
|
||||||
(lib.pipe passthru [ builtins.attrNames ]))
|
|
||||||
]
|
|
||||||
then module passthru
|
|
||||||
else module))
|
|
||||||
];
|
|
||||||
|
|
||||||
# Modules
|
|
||||||
nixosModules = createModules ../modules/nixos { };
|
|
||||||
nixOnDroidModules = createModules ../modules/nix-on-droid { };
|
|
||||||
nixDarwinModules = createModules ../modules/nix-darwin { };
|
|
||||||
homeManagerModules = createModules ../modules/home-manager { };
|
|
||||||
flakeModules = createModules ../modules/flake { };
|
|
||||||
|
|
||||||
# Machines
|
|
||||||
machines = recurseDir ../machines;
|
|
||||||
homeManagerMachines = machines.home-manager or { };
|
|
||||||
nixDarwinMachines = machines.nix-darwin or { };
|
|
||||||
nixOnDroidMachines = machines.nix-on-droid or { };
|
|
||||||
nixosMachines = machines.nixos or { };
|
|
||||||
|
|
||||||
# Configuration helpers
|
|
||||||
mkNixosHost = root: system: hostname: users: lib.nixosSystem {
|
|
||||||
inherit system;
|
|
||||||
|
|
||||||
modules = [
|
|
||||||
(lib.path.append root "configuration.nix")
|
|
||||||
inputs.home-manager.nixosModules.home-manager
|
|
||||||
{
|
|
||||||
nixpkgs.overlays = builtins.attrValues outputs.overlays;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
home-manager = {
|
|
||||||
useGlobalPkgs = false;
|
|
||||||
useUserPackages = true;
|
|
||||||
users = lib.attrsets.genAttrs
|
|
||||||
users
|
|
||||||
(user: import (lib.path.append root "home/${user}.nix"));
|
|
||||||
sharedModules = builtins.attrValues homeManagerModules;
|
|
||||||
extraSpecialArgs = {
|
|
||||||
inherit inputs outputs;
|
|
||||||
inherit hostname;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
networking.hostName = lib.mkDefault hostname;
|
|
||||||
}
|
|
||||||
] ++ (builtins.attrValues nixosModules);
|
|
||||||
|
|
||||||
specialArgs = {
|
|
||||||
inherit inputs outputs;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
mkNixOnDroidHost = root: system: hostname: inputs.nix-on-droid.lib.nixOnDroidConfiguration {
|
|
||||||
pkgs = import nixpkgs {
|
|
||||||
inherit system;
|
|
||||||
|
|
||||||
overlays = builtins.attrValues outputs.overlays ++ [
|
|
||||||
inputs.nix-on-droid.overlays.default
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
modules = [
|
|
||||||
(lib.path.append root "configuration.nix")
|
|
||||||
{ nix.registry.nixpkgs.flake = nixpkgs; }
|
|
||||||
{
|
|
||||||
home-manager = {
|
|
||||||
config = (lib.path.append root "home.nix");
|
|
||||||
backupFileExtension = "hm-bak";
|
|
||||||
useGlobalPkgs = false;
|
|
||||||
useUserPackages = true;
|
|
||||||
sharedModules = builtins.attrValues homeManagerModules ++ [
|
|
||||||
{
|
|
||||||
nixpkgs.overlays = builtins.attrValues outputs.overlays;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
extraSpecialArgs = {
|
|
||||||
inherit inputs outputs;
|
|
||||||
inherit hostname;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
] ++ (builtins.attrValues nixOnDroidModules);
|
|
||||||
|
|
||||||
extraSpecialArgs = {
|
|
||||||
inherit inputs outputs;
|
|
||||||
inherit hostname;
|
|
||||||
# rootPath = ./.;
|
|
||||||
};
|
|
||||||
|
|
||||||
home-manager-path = inputs.home-manager.outPath;
|
|
||||||
};
|
|
||||||
|
|
||||||
mkNixDarwinHost = root: system: hostname: users: inputs.nix-darwin.lib.darwinSystem {
|
|
||||||
inherit system;
|
|
||||||
|
|
||||||
modules = [
|
|
||||||
(lib.path.append root "configuration.nix")
|
|
||||||
{
|
|
||||||
nixpkgs.hostPlatform = system;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
nixpkgs.overlays = builtins.attrValues outputs.overlays;
|
|
||||||
}
|
|
||||||
inputs.home-manager.darwinModules.home-manager
|
|
||||||
{
|
|
||||||
home-manager = {
|
|
||||||
useGlobalPkgs = false;
|
|
||||||
useUserPackages = true;
|
|
||||||
users = lib.attrsets.genAttrs
|
|
||||||
users
|
|
||||||
(user: import (lib.path.append root "home/${user}.nix"));
|
|
||||||
sharedModules = builtins.attrValues homeManagerModules;
|
|
||||||
extraSpecialArgs = {
|
|
||||||
inherit inputs outputs;
|
|
||||||
inherit hostname;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
] ++ (builtins.attrValues nixDarwinModules);
|
|
||||||
|
|
||||||
specialArgs = {
|
|
||||||
inherit inputs outputs;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
mkHomeManagerHost = root: system: hostname: inputs.home-manager.lib.homeManagerConfiguration {
|
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
|
||||||
|
|
||||||
modules = [
|
|
||||||
(lib.path.append root "home.nix")
|
|
||||||
{
|
|
||||||
nixpkgs.overlays = builtins.attrValues outputs.overlays;
|
|
||||||
}
|
|
||||||
] ++ (builtins.attrValues homeManagerModules);
|
|
||||||
|
|
||||||
extraSpecialArgs = {
|
|
||||||
inherit inputs outputs;
|
|
||||||
inherit hostname;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
createConfigurations =
|
|
||||||
pred: mkHost: machines:
|
|
||||||
lib.foldAttrs
|
|
||||||
lib.const
|
|
||||||
[ ]
|
|
||||||
(builtins.attrValues
|
|
||||||
(builtins.mapAttrs
|
|
||||||
(system: hosts:
|
|
||||||
lib.concatMapAttrs
|
|
||||||
(host: config:
|
|
||||||
lib.optionalAttrs
|
|
||||||
(and [
|
|
||||||
(host != "__template__")
|
|
||||||
(pred system host config)
|
|
||||||
])
|
|
||||||
{
|
|
||||||
${host} = mkHost system host config;
|
|
||||||
})
|
|
||||||
hosts)
|
|
||||||
machines));
|
|
||||||
|
|
||||||
# Configurations
|
|
||||||
autoNixosConfigurations =
|
|
||||||
createConfigurations
|
|
||||||
(system: host: config:
|
|
||||||
and
|
|
||||||
[
|
|
||||||
(hasFiles
|
|
||||||
[ "configuration.nix" ]
|
|
||||||
config)
|
|
||||||
# (hasDirectories
|
|
||||||
# [ "home" ]
|
|
||||||
# config)
|
|
||||||
])
|
|
||||||
(system: host: config:
|
|
||||||
mkNixosHost
|
|
||||||
../machines/nixos/${system}/${host}
|
|
||||||
system
|
|
||||||
host
|
|
||||||
(builtins.map
|
|
||||||
(lib.strings.removeSuffix ".nix")
|
|
||||||
(builtins.attrNames (config."home" or { }))))
|
|
||||||
nixosMachines;
|
|
||||||
|
|
||||||
autoNixOnDroidConfigurations =
|
|
||||||
createConfigurations
|
|
||||||
(system: host: config:
|
|
||||||
and
|
|
||||||
[
|
|
||||||
(hasFiles
|
|
||||||
[ "configuration.nix" "home.nix" ]
|
|
||||||
config)
|
|
||||||
])
|
|
||||||
(system: host: config:
|
|
||||||
mkNixOnDroidHost
|
|
||||||
../machines/nix-on-droid/${system}/${host}
|
|
||||||
system
|
|
||||||
host)
|
|
||||||
nixOnDroidMachines;
|
|
||||||
|
|
||||||
autoDarwinConfigurations =
|
|
||||||
createConfigurations
|
|
||||||
(system: host: config:
|
|
||||||
and
|
|
||||||
[
|
|
||||||
(hasFiles
|
|
||||||
[ "configuration.nix" ]
|
|
||||||
config)
|
|
||||||
(hasDirectories
|
|
||||||
[ "home" ]
|
|
||||||
config)
|
|
||||||
])
|
|
||||||
(system: host: config:
|
|
||||||
mkNixDarwinHost
|
|
||||||
../machines/nix-darwin/${system}/${host}
|
|
||||||
system
|
|
||||||
host
|
|
||||||
(builtins.map
|
|
||||||
(lib.strings.removeSuffix ".nix")
|
|
||||||
(builtins.attrNames (config."home" or { }))))
|
|
||||||
nixDarwinMachines;
|
|
||||||
|
|
||||||
autoHomeConfigurations =
|
|
||||||
createConfigurations
|
|
||||||
(system: host: config:
|
|
||||||
and
|
|
||||||
[
|
|
||||||
(hasFiles
|
|
||||||
[ "home.nix" ]
|
|
||||||
config)
|
|
||||||
])
|
|
||||||
(system: host: config:
|
|
||||||
mkHomeManagerHost
|
|
||||||
../machines/home-manager/${system}/${host}
|
|
||||||
system
|
|
||||||
host)
|
|
||||||
homeManagerMachines;
|
|
||||||
|
|
||||||
# Automatic deploy.rs nodes (for NixOS and nix-darwin)
|
|
||||||
|
|
||||||
gen-config-type-to = mappings: mkError: config-type:
|
|
||||||
mappings.${config-type} or
|
|
||||||
(builtins.throw
|
|
||||||
(mkError config-type));
|
|
||||||
|
|
||||||
config-type-to-outputs-machines =
|
|
||||||
gen-config-type-to
|
|
||||||
{
|
|
||||||
nixos = "nixosMachines";
|
|
||||||
nix-on-droid = "nixOnDroidMachines";
|
|
||||||
nix-darwin = "nixDarwinMachines";
|
|
||||||
home-manager = "homeMachines";
|
|
||||||
}
|
|
||||||
(config-type:
|
|
||||||
builtins.throw
|
|
||||||
"Invaild config-type \"${config-type}\" for flake outputs' machines");
|
|
||||||
|
|
||||||
config-type-to-outputs-configurations =
|
|
||||||
gen-config-type-to
|
|
||||||
{
|
|
||||||
nixos = "nixosConfigurations";
|
|
||||||
nix-on-droid = "nixOnDroidConfigurations";
|
|
||||||
nix-darwin = "darwinConfigurations";
|
|
||||||
home-manager = "homeConfigurations";
|
|
||||||
}
|
|
||||||
(config-type:
|
|
||||||
builtins.throw
|
|
||||||
"Invaild config-type \"${config-type}\" for flake outputs' configurations");
|
|
||||||
|
|
||||||
config-type-to-deploy-type =
|
|
||||||
gen-config-type-to
|
|
||||||
{
|
|
||||||
nixos = "nixos";
|
|
||||||
nix-darwin = "darwin";
|
|
||||||
}
|
|
||||||
(config-type:
|
|
||||||
builtins.throw
|
|
||||||
"Invaild config-type \"${config-type}\" for deploy-rs deployment");
|
|
||||||
|
|
||||||
deploy.autoNodes =
|
|
||||||
lib.flip lib.concatMapAttrs
|
|
||||||
(lib.genAttrs
|
|
||||||
[
|
|
||||||
"nixos"
|
|
||||||
"nix-darwin"
|
|
||||||
]
|
|
||||||
(config-type:
|
|
||||||
let
|
|
||||||
machines = config-type-to-outputs-machines config-type;
|
|
||||||
in
|
|
||||||
outputs.${machines}))
|
|
||||||
(config-type: machines:
|
|
||||||
lib.pipe
|
|
||||||
machines
|
|
||||||
[
|
|
||||||
# Filter out nondirectories
|
|
||||||
(lib.filterAttrs
|
|
||||||
(system: configs:
|
|
||||||
builtins.isAttrs configs))
|
|
||||||
# Convert non-template configs into `system-and-config` pairs
|
|
||||||
(lib.concatMapAttrs
|
|
||||||
(system: configs:
|
|
||||||
(lib.concatMapAttrs
|
|
||||||
(host: config:
|
|
||||||
lib.optionalAttrs
|
|
||||||
(host != "__template__")
|
|
||||||
{
|
|
||||||
${host} = {
|
|
||||||
inherit system;
|
|
||||||
config =
|
|
||||||
let
|
|
||||||
configurations = config-type-to-outputs-configurations config-type;
|
|
||||||
in
|
|
||||||
outputs.${configurations}.${host};
|
|
||||||
};
|
|
||||||
})
|
|
||||||
configs)))
|
|
||||||
# Convert each `system-and-config` pair into a deploy-rs node
|
|
||||||
(lib.concatMapAttrs
|
|
||||||
(host: { system, config }:
|
|
||||||
let
|
|
||||||
deploy-config-path =
|
|
||||||
../machines/${config-type}/${system}/${host}/deploy.nix;
|
|
||||||
deploy-config =
|
|
||||||
import deploy-config-path;
|
|
||||||
in
|
|
||||||
lib.optionalAttrs
|
|
||||||
(builtins.pathExists deploy-config-path)
|
|
||||||
{
|
|
||||||
${host} = {
|
|
||||||
inherit (deploy-config)
|
|
||||||
hostname;
|
|
||||||
profiles.system = deploy-config // {
|
|
||||||
path =
|
|
||||||
let
|
|
||||||
deploy-type = config-type-to-deploy-type config-type;
|
|
||||||
in
|
|
||||||
inputs.deploy-rs.lib.${system}.activate.${deploy-type} config;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}))
|
|
||||||
]);
|
|
||||||
|
|
||||||
autoChecks =
|
|
||||||
lib.mapAttrs
|
|
||||||
(system: deployLib:
|
|
||||||
deployLib.deployChecks
|
|
||||||
outputs.deploy)
|
|
||||||
inputs.deploy-rs.lib;
|
|
||||||
}
|
|
||||||
Loading…
Reference in a new issue