diff options
| author | seth <[email protected]> | 2023-11-01 00:35:21 -0400 |
|---|---|---|
| committer | seth <[email protected]> | 2023-11-01 00:35:21 -0400 |
| commit | f4d97c3f32353b072d5d748f9c6af6d8ea9fe158 (patch) | |
| tree | c211cbe13ba1ead5c4ab432d1fdb00303cdb0a6b | |
| parent | d415a8c0481c4d13371f343e1c802bf29135082f (diff) | |
flake: tidy up parts module args
| -rw-r--r-- | dev.nix | 9 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | overlays/default.nix | 15 |
3 files changed, 12 insertions, 14 deletions
@@ -1,13 +1,6 @@ { - lib, - inputs, - ... -}: { - imports = [ - inputs.pre-commit.flakeModule - ]; - perSystem = { + lib, pkgs, config, inputs', @@ -137,6 +137,8 @@ outputs = {parts, ...} @ inputs: parts.lib.mkFlake {inherit inputs;} { imports = [ + inputs.pre-commit.flakeModule + ./modules ./overlays ./systems diff --git a/overlays/default.nix b/overlays/default.nix index 66869c4..6a2acff 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,7 +1,10 @@ -{lib, ...}: { - flake.overlays.default = lib.composeManyExtensions [ - (import ./btop.nix) - (import ./discord.nix) - (import ./fish.nix) - ]; +{ + flake.overlays.default = final: prev: + prev.lib.composeManyExtensions [ + (import ./btop.nix) + (import ./discord.nix) + (import ./fish.nix) + ] + final + prev; } |
