diff --git a/flake.lock b/flake.lock index 4258fb2..0de0dd2 100644 --- a/flake.lock +++ b/flake.lock @@ -29,7 +29,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-Ipzclc1pig7KeyiRl2JegcsXdLoANQAEl1KtZMrWUwM=", + "narHash": "sha256-FhENMA/zHvdxdkq1OQ27RoZ/AAIFKLMEFMSgA+/L4pA=", "path": "modules/", "type": "path" }, diff --git a/modules/flake.nix b/modules/flake.nix index a9c54c8..a6d27f7 100644 --- a/modules/flake.nix +++ b/modules/flake.nix @@ -14,8 +14,7 @@ }; }; outputs = { self, home-manager, nix-darwin, nixpkgs }: { - default - lib = { + lib = { makeImports = { ... }@attrs: [ (import ./main.nix attrs) ]; makeNixOsModule = { system, configuration ? null, ... }@attrs: nixpkgs.lib.nixosSystem { diff --git a/configs/gitconfigs/alias.conf b/modules/gitconfigs/alias.conf similarity index 100% rename from configs/gitconfigs/alias.conf rename to modules/gitconfigs/alias.conf diff --git a/modules/home-manager-config.nix b/modules/home-manager-config.nix index 73531a9..68b1ff9 100644 --- a/modules/home-manager-config.nix +++ b/modules/home-manager-config.nix @@ -2,7 +2,7 @@ { pkgs, ... }: let gitconfigs = - (builtins.filterSource (path: type: type != "directory") ../configs/gitconfigs); + (builtins.filterSource (path: type: type != "directory") ./gitconfigs); gitconfigFiles = builtins.attrNames (builtins.readDir gitconfigs); in { diff --git a/modules/main.nix b/modules/main.nix index 1b5ef3f..24b6931 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -14,6 +14,7 @@ , home-manager ? { enable = false; } +, ... }: { ... }: {