diff --git a/flake.nix b/flake.nix index 76dd665..d66b514 100644 --- a/flake.nix +++ b/flake.nix @@ -82,7 +82,8 @@ rec { outputs = { self, nixpkgs, nixpkgs-unstable, ... }@inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } { systems = [ "x86_64-linux" "aarch64-linux" ]; - imports = [ ./pkgs/flake-module.nix ./lib ./overlays.nix ]; + imports = + [ ./pkgs/flake-module.nix ./lib/flake-module.nix ./overlays.nix ]; flake = { inherit nixConfig; diff --git a/lib/default.nix b/lib/default.nix deleted file mode 100644 index 834b34c..0000000 --- a/lib/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ inputs, ... }: - -let createUser' = import ./createUser.nix; -in { - flake = { - lib = { - createSystem = hostName: - { hardwareConfig, config }: - ({ pkgs, lib, ... }: { - networking.hostName = hostName; - - imports = [ ../modules/common.nix hardwareConfig config ]; - }); - createUser = name: args: - ({ pkgs, ... }@args2: - (createUser' name args) - ({ inherit (inputs) home-manager; } // args2)); - createMediaGroup = _: { users.groups.media.gid = 600; }; - }; - }; -} diff --git a/lib/flake-module.nix b/lib/flake-module.nix new file mode 100644 index 0000000..9eede9f --- /dev/null +++ b/lib/flake-module.nix @@ -0,0 +1,18 @@ +{ inputs, ... }: + +let createUser' = import ./createUser.nix; +in { + flake.lib = { + createSystem = hostName: + { hardwareConfig, config }: + ({ pkgs, lib, ... }: { + networking.hostName = hostName; + + imports = [ ../modules/common.nix hardwareConfig config ]; + }); + createUser = name: args: + ({ pkgs, ... }@args2: + (createUser' name args) ({ inherit (inputs) home-manager; } // args2)); + createMediaGroup = _: { users.groups.media.gid = 600; }; + }; +}