From 4148be6ec76e64338b5db4d1769afc8b03d47d72 Mon Sep 17 00:00:00 2001 From: thornAvery Date: Wed, 1 Dec 2021 03:03:04 +0000 Subject: [PATCH] cleanup --- flake.nix | 6 +++--- overlay.nix => nix/overlay.nix | 0 packages.nix => nix/packages.nix | 2 +- utils.nix => nix/utils.nix | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename overlay.nix => nix/overlay.nix (100%) rename packages.nix => nix/packages.nix (54%) rename utils.nix => nix/utils.nix (100%) diff --git a/flake.nix b/flake.nix index 92e1366..3da83ca 100644 --- a/flake.nix +++ b/flake.nix @@ -9,19 +9,19 @@ [ "x86_64-linux" ] (system: let pkgs = import inputs.nixpkgs { - overlays = [ ((import ./overlay.nix) inputs) ]; + overlays = [ ((import ./nix/overlay.nix) inputs) ]; inherit system; }; in rec { defaultPackage = packages.aoc2021; packages = inputs.flake-utils.lib.flattenTree - ((import ./utils.nix) { inherit pkgs; inherit inputs; }); + ((import ./nix/utils.nix) { inherit pkgs; inherit inputs; }); hydraJobs = builtins.listToAttrs (map (s: { name = s; value = { ${system} = packages.${s}; }; }) (builtins.attrNames packages)); }) // { - overlay = (import ./overlay.nix) inputs; + overlay = (import ./nix/overlay.nix) inputs; }; } diff --git a/overlay.nix b/nix/overlay.nix similarity index 100% rename from overlay.nix rename to nix/overlay.nix diff --git a/packages.nix b/nix/packages.nix similarity index 54% rename from packages.nix rename to nix/packages.nix index 312cf59..ff46ee2 100644 --- a/packages.nix +++ b/nix/packages.nix @@ -1,3 +1,3 @@ inputs: [ - ./code + ../code ] diff --git a/utils.nix b/nix/utils.nix similarity index 100% rename from utils.nix rename to nix/utils.nix