From 29d96e90a436fe7d3bacde80cda7b1466832034e Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Sun, 14 Sep 2025 12:37:29 +0200 Subject: [PATCH] lib, fix homeManagerModules name --- flake.nix | 27 ++++++++++--------- .../adwaita.nix | 0 modules/intel-graphics.nix | 4 ++- 3 files changed, 18 insertions(+), 13 deletions(-) rename {homeModules => homeManagerModules}/adwaita.nix (100%) diff --git a/flake.nix b/flake.nix index 852eae2..8a35273 100644 --- a/flake.nix +++ b/flake.nix @@ -89,14 +89,17 @@ pkgs = nixpkgs.legacyPackages.${system}; } ); - importDir = - dir: - (lib.attrsets.mapAttrs' ( - m: _: - lib.attrsets.nameValuePair (lib.strings.removeSuffix ".nix" m) { imports = [ "${dir}/${m}" ]; } - ) (builtins.readDir dir)); in - rec { + { + lib = { + importDir = + dir: + (lib.attrsets.mapAttrs' ( + m: _: + lib.attrsets.nameValuePair (lib.strings.removeSuffix ".nix" m) { imports = [ "${dir}/${m}" ]; } + ) (builtins.readDir dir)); + }; + nixosConfigurations = forDevice ( device: system: let @@ -116,8 +119,8 @@ }; nixpkgs.overlays = [ - overlays.unstable-packages - overlays.zerforschen + self.overlays.unstable-packages + self.overlays.zerforschen ]; nix.settings.experimental-features = [ @@ -146,7 +149,7 @@ time.timeZone = "Europe/Berlin"; home-manager.sharedModules = [ - self.homeModules.adwaita + self.homeManagerModules.adwaita ]; } @@ -177,7 +180,7 @@ }; }; - nixosModules = (importDir ./nixosModules) // { + nixosModules = (self.lib.importDir ./nixosModules) // { niri = { imports = [ niri.nixosModules.niri ]; nixpkgs.overlays = [ niri.overlays.niri ]; @@ -187,7 +190,7 @@ }; }; - homeModules = importDir ./homeModules; + homeManagerModules = self.lib.importDir ./homeManagerModules; formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-tree); }; diff --git a/homeModules/adwaita.nix b/homeManagerModules/adwaita.nix similarity index 100% rename from homeModules/adwaita.nix rename to homeManagerModules/adwaita.nix diff --git a/modules/intel-graphics.nix b/modules/intel-graphics.nix index 74c6e67..d7cae18 100644 --- a/modules/intel-graphics.nix +++ b/modules/intel-graphics.nix @@ -1,5 +1,7 @@ -{ pkgs, ... }: +{ pkgs, nixosModules, ... }: { + imports = [ nixosModules.allowed-unfree-list ]; + config = { hardware.graphics = { extraPackages = with pkgs; [