This commit is contained in:
Lukas Wurzinger 2024-12-24 19:29:19 +01:00
parent aad0938d72
commit e347af34f0
No known key found for this signature in database
2 changed files with 22 additions and 22 deletions

View file

@ -111,11 +111,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1734605856,
"narHash": "sha256-RfNqLS5f9s3aiRZIOjSbM8Vz7x2dT/7zwJhyt9TLEmE=",
"lastModified": 1734951937,
"narHash": "sha256-oYitbnWHQIEmd5e/e8yvuy6T41zVVe/V8868nOnwNfk=",
"owner": "cachix",
"repo": "devenv",
"rev": "f81cf7dc4cbfa46de11618af94e5983c5e600d8c",
"rev": "4b8677f62022e6a235cc4e93a6bbc3d57b77817f",
"type": "github"
},
"original": {
@ -405,11 +405,11 @@
},
"hardware": {
"locked": {
"lastModified": 1734352517,
"narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=",
"lastModified": 1734954597,
"narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd",
"rev": "def1d472c832d77885f174089b0d34854b007198",
"type": "github"
},
"original": {
@ -570,11 +570,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1734745015,
"narHash": "sha256-HGl0yR/qfGTO99NfiB5bqTe2nPKmD57opzB/TwhJSW0=",
"lastModified": 1735004289,
"narHash": "sha256-cJmBhr59xQXwkvF+EZPhKTebgHyqXoei8u2Qq2QJYzE=",
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"rev": "1c922245aec471610533c7a225bf9c20e7002ff2",
"rev": "b9bfb93c7632a0e007a3a05fe77c0475d05e045a",
"type": "github"
},
"original": {
@ -625,11 +625,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1734600368,
"narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=",
"lastModified": 1734875076,
"narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca",
"rev": "1807c2b91223227ad5599d7067a61665c52d1295",
"type": "github"
},
"original": {
@ -753,11 +753,11 @@
},
"nixpkgs_9": {
"locked": {
"lastModified": 1734424634,
"narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
"lastModified": 1734649271,
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
"rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
"type": "github"
},
"original": {
@ -790,11 +790,11 @@
]
},
"locked": {
"lastModified": 1734661750,
"narHash": "sha256-BI58NBdimxu1lnpOrG9XxBz7Cwqy+qIf99zunWofX5w=",
"lastModified": 1734834660,
"narHash": "sha256-bm8V+Cu8rWJA+vKQnc94mXTpSDgvedyoDKxTVi/uJfw=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "7d3d910d5fd575e6e8c5600d83d54e5c47273bfe",
"rev": "b070e6030118680977bc2388868c4b3963872134",
"type": "github"
},
"original": {

View file

@ -3,7 +3,7 @@ lib: _: {
builtins.concatMap (dir:
lib.pipe dir [
(lib.fileset.fileFilter (
file: file.hasExt "nix" && file.name != "default.nix"
file: file.hasExt "nix"
))
lib.fileset.toList
])
@ -48,8 +48,8 @@ lib: _: {
(lib.findModules [
commonDir
./classes/${class}
(classesDir + "/${class}")
(hostsDir + "/${class}/${name}")
(classesDir + /${class})
(hostsDir + /${class}/${name})
])
++ [
{networking.hostName = lib.mkDefault name;}
@ -66,7 +66,7 @@ lib: _: {
lib.pipe (dirsIn hostsDir) [
(classes:
builtins.concatMap (
class: map (name: {inherit class name;}) (dirsIn (hostsDir + "/${class}"))
class: map (name: {inherit class name;}) (dirsIn (hostsDir + /${class}))
)
classes)
(map (args: lib.nameValuePair args.name (commonNixosSystem args)))