Add envrc

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

flake.nix

@@ -10,23 +10,20 @@
 
   outputs =
     inputs:
-    {
-      overlays.default = import ./overlays;
-    }
-    // (
+    (
       let
         system = "x86_64-linux";
 
         pkgs = import inputs.nixpkgs {
           inherit system;
           config.allowUnfree = true;
-          overlays = [ inputs.self.overlays.default ];
         };
 
         treefmt = inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix;
       in
       {
-        packages.${system} = import ./packages { inherit pkgs; };
+        lib.${system} = import ./lib { inherit pkgs; };
+
         formatter.${system} = treefmt.config.build.wrapper;
         checks.${system}.formatting = treefmt.config.build.check inputs.self;
       }

lib/default.nix

@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+let
+  callPackage = pkgs.lib.callPackageWith { inherit pkgs; };
+in
+{
+  fetchers = callPackage ./fetchers { };
+  runtime = callPackage ./runtime { };
+}

lib/fetchers/default.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+let
+  callPackage = pkgs.lib.callPackageWith { inherit pkgs; };
+in
+{
+  sshKnownHosts = callPackage ./sshKnownHosts { };
+}

lib/fetchers/sshKnownHosts/default.nix

@@ -1,5 +1,5 @@
-final: prev:
-prev.lib.fetchers.withNormalizedHash { } (
+{ pkgs, ... }:
+pkgs.lib.fetchers.withNormalizedHash { } (
   {
     host,
     name ? "ssh-known-hosts-${host}",
@@ -13,15 +13,15 @@ prev.lib.fetchers.withNormalizedHash { } (
     ],
   }:
   let
-    keyTypeArgs = prev.lib.concatStringsSep "," keyTypes;
+    keyTypeArgs = pkgs.lib.concatStringsSep "," keyTypes;
   in
-  prev.runCommandLocal name
+  pkgs.runCommandLocal name
     {
       inherit outputHash outputHashAlgo;
       outputHashMode = "flat";
       preferLocalBuild = true;
 
-      nativeBuildInputs = with final; [
+      nativeBuildInputs = with pkgs; [
         openssh
         gnugrep
         coreutils

lib/runtime/default.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+let
+  callPackage = pkgs.lib.callPackageWith { inherit pkgs; };
+in
+{
+  merge = callPackage ./merge { };
+}

lib/runtime/merge/default.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+let
+  callPackage = pkgs.lib.callPackageWith { inherit pkgs; };
+in
+{
+  keyValue = callPackage ./keyValue { };
+}

lib/runtime/merge/keyValue/default.nix

@@ -1,8 +1,8 @@
-final: prev:
+{ pkgs, ... }:
 "${
-  prev.writeShellApplication {
+  pkgs.writeShellApplication {
     name = "merge-key-value";
-    runtimeInputs = with final; [
+    runtimeInputs = with pkgs; [
       coreutils
       gawk
     ];

overlays/default.nix

@@ -1,20 +0,0 @@
-final: prev:
-{
-  lib = prev.lib.recursiveUpdate prev.lib {
-    fetchers = {
-      sshKnownHosts = import ./fetchers/sshKnownHosts final prev;
-    };
-
-    runtime = {
-      merge = {
-        keyValue = import ./runtime/merge/keyValue final prev;
-      };
-    };
-  };
-}
-// (import ../packages { pkgs = final; })
-// {
-  dockerImages = prev.dockerImages or { } // {
-    base = final.docker-image-base;
-  };
-}

packages/default.nix

@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  docker-image-base = import ./docker/base { inherit pkgs; };
-}

packages/docker/base/default.nix

@@ -1,27 +0,0 @@
-{ pkgs, ... }:
-pkgs.dockerTools.buildImage {
-  name = "base";
-
-  copyToRoot = pkgs.buildEnv {
-    name = "root";
-    paths = with pkgs; [
-      dockerTools.usrBinEnv
-      dockerTools.binSh
-      dockerTools.caCertificates
-      bashInteractive
-      busybox
-    ];
-    pathsToLink = [
-      "/bin"
-      "/lib"
-      "/share"
-      "/etc"
-      "/usr"
-    ];
-  };
-
-  runAsRoot = ''
-    ${pkgs.dockerTools.shadowSetup}
-    mkdir -p /tmp
-  '';
-}