From e868b5913f27c53e03ebcffd1b46f5cc4a4fdc3f Mon Sep 17 00:00:00 2001 From: uku Date: Fri, 19 Jan 2024 12:24:48 +0100 Subject: [PATCH] move stuff to parts dir --- .envrc | 2 +- flake.nix | 4 +--- ci.nix => parts/ci.nix | 2 +- parts/default.nix | 7 +++++++ deploy.nix => parts/deploy.nix | 0 dev.nix => parts/dev.nix | 0 6 files changed, 10 insertions(+), 5 deletions(-) rename ci.nix => parts/ci.nix (93%) create mode 100644 parts/default.nix rename deploy.nix => parts/deploy.nix (100%) rename dev.nix => parts/dev.nix (100%) diff --git a/.envrc b/.envrc index 59dfc5d..d208603 100644 --- a/.envrc +++ b/.envrc @@ -1,2 +1,2 @@ use flake -watch_file dev.nix +watch_file parts/dev.nix diff --git a/flake.nix b/flake.nix index 96ad4f9..4d6aa06 100644 --- a/flake.nix +++ b/flake.nix @@ -55,9 +55,7 @@ systems = ["x86_64-linux"]; imports = [ - ./ci.nix - ./dev.nix - ./deploy.nix + ./parts ./systems ]; }; diff --git a/ci.nix b/parts/ci.nix similarity index 93% rename from ci.nix rename to parts/ci.nix index 64525f2..cc90dc2 100644 --- a/ci.nix +++ b/parts/ci.nix @@ -10,7 +10,7 @@ ... }: { packages = let - overlay = lib.fix (final: (import ./exprs/overlay.nix final pkgs)); + overlay = lib.fix (final: (import ../exprs/overlay.nix final pkgs)); # do not include a package if it's not available on the system or if it's broken isValid = _: v: diff --git a/parts/default.nix b/parts/default.nix new file mode 100644 index 0000000..710279c --- /dev/null +++ b/parts/default.nix @@ -0,0 +1,7 @@ +{ + imports = [ + ./ci.nix + ./deploy.nix + ./dev.nix + ]; +} diff --git a/deploy.nix b/parts/deploy.nix similarity index 100% rename from deploy.nix rename to parts/deploy.nix diff --git a/dev.nix b/parts/dev.nix similarity index 100% rename from dev.nix rename to parts/dev.nix