maybe I'm overthinking things?
parent
e0adf8c39f
commit
c368007abd
|
@ -1,33 +1,12 @@
|
||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"home-manager": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"utils": "utils"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1669071065,
|
|
||||||
"narHash": "sha256-KBpgj3JkvlPsJ3duOZqFJe6tgr+wc75t8sFmgRbBSbw=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"rev": "f7641a3ff398ccce952e19a199d775934e518c1d",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1669140675,
|
"lastModified": 1671200928,
|
||||||
"narHash": "sha256-npzfyfLECsJWgzK/M4gWhykP2DNAJTYjgY2BWkz/oEQ=",
|
"narHash": "sha256-mZfzDyzojwj6I0wyooIjGIn81WtGVnx6+avU5Wv+VKU=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2788904d26dda6cfa1921c5abb7a2466ffe3cb8c",
|
"rev": "757b82211463dd5ba1475b6851d3731dfe14d377",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -38,24 +17,8 @@
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"home-manager": "home-manager",
|
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"utils": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1667395993,
|
|
||||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
# An example on how this would be imported (along with test cases)
|
||||||
let
|
let
|
||||||
pkgs = import <nixpkgs> { };
|
pkgs = import <nixpkgs> { };
|
||||||
inherit (pkgs) lib;
|
inherit (pkgs) lib;
|
|
@ -32,7 +32,7 @@
|
||||||
# fundamental functions that should only take 2 keystrokes instead of builtins (8)
|
# fundamental functions that should only take 2 keystrokes instead of builtins (8)
|
||||||
c_ = import ./calculus;
|
c_ = import ./calculus;
|
||||||
overlays = [ rust-overlay.overlays.default nixgl.overlay ];
|
overlays = [ rust-overlay.overlays.default nixgl.overlay ];
|
||||||
in c_
|
in
|
||||||
{ };
|
{ };
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
# Each host will export optionally its nixosConfiguration, which also manages its
|
||||||
|
# own hardware-configuration
|
||||||
|
{ pkgs # nixpkgs imported
|
||||||
|
, lib # extended lib
|
||||||
|
, c_
|
||||||
|
, nixos_lib # nixpkgs/nixos/lib
|
||||||
|
, flake-utils-plus
|
||||||
|
, ...
|
||||||
|
}@inputs:
|
||||||
|
let
|
||||||
|
# ({sys: str} -> nixosConfiguration) -> nixosConfigurations-compatible-host for defaultSystems
|
||||||
|
mkHost = nixosConfigFn: c_.list2Attrs_ flake-utils-plus.lib.defaultSystems (sys: {
|
||||||
|
${sys} = nixos_lib.nixosSystem ({ system = sys; } // (nixosConfigFn { inherit sys; }));
|
||||||
|
});
|
||||||
|
in
|
||||||
|
{
|
||||||
|
Felia = mkHost { };
|
||||||
|
lizzi = mkHost { };
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
# Contains the wrapper modules for programs and services available to
|
|
@ -2,6 +2,4 @@
|
||||||
, lib ? inputs.pkgs.lib
|
, lib ? inputs.pkgs.lib
|
||||||
, ...
|
, ...
|
||||||
}@inputs:
|
}@inputs:
|
||||||
{
|
lib.recursiveUpdate lib.types { }
|
||||||
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue