Use harmonia flake
This commit is contained in:
parent
1cb36aeab9
commit
ddd9f1a371
GPG Key ID:
3AF5A43A3EECC2E5
98
flake.lock
98
flake.lock
|
|
@ -216,11 +216,11 @@
|
|||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1675146246,
|
||||
"narHash": "sha256-upQtcca/sThA5Jkmn5pDaYFoCmPLMyv7bGFCZFcVhqM=",
|
||||
"lastModified": 1675837392,
|
||||
"narHash": "sha256-+QAYahdgiAKehHnWxRp/Nz+uUzydDBMoaIuU4YpbOpQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "97deb5c86b238c2a000ef4eb92fb40465f086706",
|
||||
"rev": "9d9adba756844591b170db22412059bfe1e4ca87",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -229,6 +229,26 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nixos"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1675295133,
|
||||
"narHash": "sha256-dU8fuLL98WFXG0VnRgM00bqKX6CEPBLybhiIDIgO45o=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "bf53492df08f3178ce85e0c9df8ed8d03c030c9f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1667395993,
|
||||
|
|
@ -245,7 +265,14 @@
|
|||
}
|
||||
},
|
||||
"harmonia": {
|
||||
"flake": false,
|
||||
"inputs": {
|
||||
"flake-parts": [
|
||||
"flake-parts"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixos"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1674897981,
|
||||
"narHash": "sha256-2idIxPPPDc8/0gqrSAM8Wdc6xYoVw6rMIamoxBkB2qk=",
|
||||
|
|
@ -299,11 +326,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1674747738,
|
||||
"narHash": "sha256-FSaBkfXiKo6jdvjUx/SJhM/+h+QQIxFu7cCXs8uxZ6Q=",
|
||||
"lastModified": 1675713315,
|
||||
"narHash": "sha256-hik0FD6PW5iPxpHvYsVVC4d180KH8qHR1c4ceuMrhkw=",
|
||||
"owner": "astro",
|
||||
"repo": "microvm.nix",
|
||||
"rev": "0a3d48e06b8c04beb3de0a3283bd1ef29fe4a47d",
|
||||
"rev": "301abed387f9157cae5a6f72b5f96521c43a3dcc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -356,11 +383,11 @@
|
|||
},
|
||||
"nixos": {
|
||||
"locked": {
|
||||
"lastModified": 1675200355,
|
||||
"narHash": "sha256-TJWs5sOwfqK+9Yq15RBIeozVMRnqYSqCRBhfnn+w30M=",
|
||||
"lastModified": 1675890058,
|
||||
"narHash": "sha256-IBQw21MB+LzRh3+bx2Q79GEqMQWuQgtkUPeB5x0Hd4M=",
|
||||
"owner": "SuperSandro2000",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "09e91f75f780359921c20c3cee408123db79fb97",
|
||||
"rev": "ec4649735580e6cadec9427e79eb2cf7f5543917",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -372,11 +399,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1674550793,
|
||||
"narHash": "sha256-ljJlIFQZwtBbzWqWTmmw2O5BFmQf1A/DspwMOQtGXHk=",
|
||||
"lastModified": 1675785029,
|
||||
"narHash": "sha256-EoD3Wgqc0XWkBCwUrAxCIZett64jN/SEPPpXX2mCmrE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "b7ac0a56029e4f9e6743b9993037a5aaafd57103",
|
||||
"rev": "16b6928ec622fd2356a80c0a9359eb350a94227d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -408,11 +435,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1675210774,
|
||||
"narHash": "sha256-qhrDfDV/D0VsOHGskqOAhUxCTwPFIPgWIG/ASGLZMws=",
|
||||
"lastModified": 1675356566,
|
||||
"narHash": "sha256-SSi2iQpaoLeOn4A/5UqdzoDm5Xy2rVuUSlikTzXNt6A=",
|
||||
"owner": "SuperSandro2000",
|
||||
"repo": "nixos-modules",
|
||||
"rev": "f0501fae1643407e2344a952055c61831c204030",
|
||||
"rev": "47969984613be67e7cb51bf01ee095c994b9f63e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -441,11 +468,11 @@
|
|||
"openwrt": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1674930407,
|
||||
"narHash": "sha256-Zefg6iLZS7Ewy76Bjfgrr2r/CZv2DwO6XeYLFP4nqPc=",
|
||||
"lastModified": 1675845605,
|
||||
"narHash": "sha256-KWVNXgvT7P2ghZAt6Kr0PNrBaIskCcB1zXFO67Uhuqw=",
|
||||
"ref": "openwrt-21.02",
|
||||
"rev": "4292832a6a836aa89bf39675193c9c60870ed862",
|
||||
"revCount": 51284,
|
||||
"rev": "0d4a0250df17a9f7b0fff720fa3224b45d5b0841",
|
||||
"revCount": 51285,
|
||||
"type": "git",
|
||||
"url": "https://git.openwrt.org/openwrt/openwrt.git"
|
||||
},
|
||||
|
|
@ -462,11 +489,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1675156946,
|
||||
"narHash": "sha256-1d/xxo37+FiCDziGvlRHTiRxhIGOq8zPqvuJXxeaj/I=",
|
||||
"lastModified": 1675849922,
|
||||
"narHash": "sha256-ibLxXwjUUyFZ9VYZbIicCXbebzLBk0wQ/yjM6ZGnZEc=",
|
||||
"owner": "astro",
|
||||
"repo": "nix-openwrt-imagebuilder",
|
||||
"rev": "5e6917f2ba7a410b8a4223cdaa55374b4c0f75de",
|
||||
"rev": "f78609e5c423f1123eb9c261488583e2b7a19c2e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -486,6 +513,7 @@
|
|||
"c3d2-user-module": "c3d2-user-module",
|
||||
"caveman": "caveman",
|
||||
"fenix": "fenix",
|
||||
"flake-parts": "flake-parts",
|
||||
"flake-utils": "flake-utils",
|
||||
"harmonia": "harmonia",
|
||||
"heliwatch": "heliwatch",
|
||||
|
|
@ -515,11 +543,11 @@
|
|||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1675097868,
|
||||
"narHash": "sha256-BKFLjEzdoFWso7Artln7djf8RbtBynj9wZKIj22LV5g=",
|
||||
"lastModified": 1675790731,
|
||||
"narHash": "sha256-2Va2m+9GL+VTP2IRXVgxGmLG1JDFW/5osxqJeEBfISs=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "b75803ad31772d105d86f8ebee0cbc8844a4fa29",
|
||||
"rev": "7f1234492e3164f9688027278df7e915bc1d919c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -539,11 +567,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1675132198,
|
||||
"narHash": "sha256-izOVjdIfdv0OzcfO9rXX0lfGkQn4tdJ0eNm3P3LYo/o=",
|
||||
"lastModified": 1675823425,
|
||||
"narHash": "sha256-o/uLXQdq3OrRAv4BZVVY0VmhMmQBLWw6Y4o+p6ZiaR4=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "48b1403150c3f5a9aeee8bc4c77c8926f29c6501",
|
||||
"rev": "02e1abbdcbc2d516193ff8a7add71f44cd976ba0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -593,11 +621,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1673666885,
|
||||
"narHash": "sha256-k5kbU95PZ1uTNy8533VRrH2PBHykr/9q5+3SarZmKVw=",
|
||||
"lastModified": 1675377940,
|
||||
"narHash": "sha256-wId6QBrqmdFtzqtSSVSRSVopXaKVDAntPfc3/Z10DZ8=",
|
||||
"owner": "astro",
|
||||
"repo": "skyflake",
|
||||
"rev": "ae6fe97243268bf066855e1354b27cc39ac785a8",
|
||||
"rev": "17fb4397cc055e35bcf9d17370a94161f347c9ea",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -616,11 +644,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1674546403,
|
||||
"narHash": "sha256-vkyNv0xzXuEnu9v52TUtRugNmQWIti8c2RhYnbLG71w=",
|
||||
"lastModified": 1675872570,
|
||||
"narHash": "sha256-RPH3CeTv7ixC2WcYiKyhmIgoH/9tur4Kr+3Vg/pleQk=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "b6ab3c61e2ca5e07d1f4eb1b67304e2670ea230c",
|
||||
"rev": "8fec29b009c19538e68d5d814ec74e04f662fbd1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
19
flake.nix
19
flake.nix
|
|
@ -85,11 +85,17 @@
|
|||
url = "github:nix-community/fenix";
|
||||
inputs.nixpkgs.follows = "nixos";
|
||||
};
|
||||
flake-parts = {
|
||||
url = "github:hercules-ci/flake-parts";
|
||||
inputs.nixpkgs-lib.follows = "nixos";
|
||||
};
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
harmonia = {
|
||||
# url = "github:helsinki-systems/harmonia";
|
||||
url = "github:nix-community/harmonia";
|
||||
flake = false;
|
||||
inputs = {
|
||||
flake-parts.follows = "flake-parts";
|
||||
nixpkgs.follows = "nixos";
|
||||
};
|
||||
};
|
||||
heliwatch = {
|
||||
url = "git+https://gitea.c3d2.de/astro/heliwatch.git";
|
||||
|
|
@ -263,6 +269,7 @@
|
|||
|
||||
self.nixosModules.c3d2
|
||||
c3d2-user-module.nixosModule
|
||||
harmonia.nixosModules.harmonia
|
||||
nixos-modules.nixosModule
|
||||
./config
|
||||
./modules/audio-server.nix
|
||||
|
|
@ -436,14 +443,8 @@
|
|||
modules = [
|
||||
self.nixosModules.cluster
|
||||
skyflake.nixosModules.default
|
||||
(harmonia + "/module.nix")
|
||||
harmonia.nixosModules.harmonia
|
||||
./hosts/hydra
|
||||
{
|
||||
_module.args = {
|
||||
inherit self;
|
||||
inherit (inputs) hydra-ca;
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue