diff options
| -rw-r--r-- | configs/hw/winmax2.nix | 2 | ||||
| -rw-r--r-- | legacy.nix | 66 |
2 files changed, 31 insertions, 37 deletions
diff --git a/configs/hw/winmax2.nix b/configs/hw/winmax2.nix index 7edad5a..af7fa3c 100644 --- a/configs/hw/winmax2.nix +++ b/configs/hw/winmax2.nix @@ -36,5 +36,5 @@ HandlePowerKey = "ignore"; }; - tv.lidControl.enable = true; + hrm.lid-handler.enable = true; } @@ -16,6 +16,33 @@ (name: name != "default.nix" && !lib.hasPrefix "." name) (lib.attrNames (builtins.readDir <stockholm/krebs/3modules>)))); } +, mylib ? (import ./. { inherit (inputs.nixpkgs) lib; }).mylib +, overlays ? [ + (import (inputs.stockholm.inputs.nix-writers + "/pkgs")) + (self: super: { + stockholm.lib.types = self.lib.types // { + inherit (self.mylib.types) + hostname + secret-file + ; + }; + inherit (inputs.stockholm.overlays.default self super) + brain + cgit-clear-cache + git-hooks + htgen + htgen-imgur + htgen-paste + irc-announce + painload + repo-sync + ; + }) + (self: super: { + inherit mylib; + }) + (import ./pkgs) + ] , extraModules ? [] }: { nixosConfigurations = @@ -28,7 +55,7 @@ in inputs.nixpkgs.lib.nixosSystem { inherit system; - specialArgs = rec { + specialArgs = { inherit inputs; lib = inputs.nixpkgs.lib // { @@ -38,7 +65,7 @@ slib = mylib; }; - mylib = (import ./. { inherit lib; }).mylib // { + mylib = mylib // { importSecret = p: _: {}; }; @@ -85,44 +112,11 @@ inputs.stockholm.nixosModules.users inputs.stockholm.nixosModules.zones ]; - nixpkgs.overlays = [ - (import (inputs.stockholm.inputs.nix-writers + "/pkgs")) - (self: super: { - stockholm.lib.types = lib.types // { - inherit (mylib.types) - hostname - secret-file - ; - }; - inherit (inputs.stockholm.overlays.default self super) - brain - cgit-clear-cache - git-hooks - htgen - htgen-imgur - htgen-paste - irc-announce - painload - repo-sync - ; - }) - ]; + nixpkgs.overlays = overlays; } ./configs ./modules { imports = extraModules; } - # This must come before <stockholm/krebs>. And before means after, `imports`-wise. - ({ inputs, mylib, ... }: { - nixpkgs.overlays = [ - (self: super: { - inherit mylib; - }) - - (import (inputs.stockholm.inputs.nix-writers + "/pkgs")) - - (import ./pkgs) - ]; - }) ]; }) ]; |