diff --git a/default.nix b/default.nix index 351b49a..c9f17ef 100644 --- a/default.nix +++ b/default.nix @@ -11,7 +11,7 @@ in inputs.stylix.nixosModules.stylix (mkAliasOptionModule ["hm"] ["home-manager" "users" config.user.name]) ] - ++ (mapModulesRec' (toString ./modules) import); + ++ (mapModulesRec' (toString ./modules) import); environments.variables = { KAAS = config.kaas.dir; diff --git a/flake.nix b/flake.nix index 8ddaac4..4268984 100644 --- a/flake.nix +++ b/flake.nix @@ -13,19 +13,19 @@ stylix.url = "github:danth/stylix"; }; - outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, ... }: let + outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, ... }: + let inherit (lib.my) mapModules mapModulesRec mapHosts; - system = "x84_64-linux"; + system = "x86_64-linux"; - mkPkgs = pkgs: extraOverlays: + mkPkgs = pkgs: import pkgs { inherit system; config.allowUnfree = true; - overlays = extraOverlays; }; - pkgs = mkPkgs nixpkgs []; - pkgs-unstable = mkPkgs nixpkgs-unstable []; + pkgs = mkPkgs nixpkgs; + pkgs-unstable = mkPkgs nixpkgs-unstable; lib = nixpkgs.lib.extend (final: prev: { my = import ./lib { @@ -34,7 +34,8 @@ lib = final; }; }); - in { + in + { lib = lib.my; packages."${system}" = mapModules ./packages (p: pkgs.callPackage p {}); diff --git a/packages/default.nix b/packages/default.nix new file mode 100644 index 0000000..e69de29