Use . if no flake reference is specified

.gitignore

@@ -1,2 +1,4 @@
 _build/
-_coverage/
+_coverage/
+result
+/.pre-commit-config.yaml

bin/flake_env.re

@@ -12,7 +12,14 @@ let main = () => {
       switch (Lib.Watches.get()) {
       | Ok(watches) =>
         let paths = Array.map(~f=watch => watch.path, watches);
-        let hash = Util.hash_files(paths);
+        let hash =
+          switch (Util.hash_files(paths)) {
+          | Ok(hsh) => hsh
+          | Error(msg) =>
+            Printf.eprintf("%s\n", e);
+            exit(1);
+          };
+
         let profile = layout_directory ++ "/flake-profile-" ++ hash;
         let profile_rc = profile ++ ".rc";
 

default.nix

@@ -13,6 +13,7 @@
 , re
 , reason
 , sha
+,
 }:
 buildDunePackage {
   pname = "flake_env";
@@ -41,23 +42,9 @@ buildDunePackage {
   postInstall = ''
     install -m400 -D direnvrc $out/share/flake_env/direnvrc
   '';
-  checkInputs = [
-    alcotest
-    bisect_ppx
-  ];
-  nativeBuildInputs = [
-    reason
-  ];
-  propagatedBuildInputs = [
-    core
-    core_unix
-    findlib
-    ocaml
-    ppx_yojson_conv
-    ppx_yojson_conv_lib
-    re
-    sha
-  ];
+  checkInputs = [ alcotest bisect_ppx ];
+  nativeBuildInputs = [ reason ];
+  propagatedBuildInputs = [ core core_unix findlib ocaml ppx_yojson_conv ppx_yojson_conv_lib re sha ];
 
   meta = with lib; {
     description = "Yet another flake plugin for direnv";

direnvrc

@@ -41,7 +41,7 @@ use_flake_env() {
   local ld=$(direnv_layout_dir)
   export direnv
 
-  eval "$(@flake_env@ "$ld" "$@")"
+  eval "$(@flake_env@ "${1:-"."}" "$ld")"
 
   export -n direnv
 

dune-project

@@ -1,4 +1,4 @@
-(lang dune 3.12)
+(lang dune 3.11)
 
 (name flake_env)
 (generate_opam_files true)

dune-workspace

@@ -1,2 +1,2 @@
-(lang dune 3.12)
+(lang dune 3.11)
 (instrument_with bisect_ppx)

flake.lock

@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -20,6 +36,45 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1703887061,
+        "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
     "nix-filter": {
       "locked": {
         "lastModified": 1701697642,
@@ -51,11 +106,81 @@
         "type": "github"
       }
     },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1704874635,
+        "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1704842529,
+        "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils",
+        "gitignore": "gitignore",
+        "nixpkgs": "nixpkgs_2",
+        "nixpkgs-stable": "nixpkgs-stable"
+      },
+      "locked": {
+        "lastModified": 1705229514,
+        "narHash": "sha256-itILy0zimR/iyUGq5Dgg0fiW8plRDyxF153LWGsg3Cw=",
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "ffa9a5b90b0acfaa03b1533b83eaf5dead819a05",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "flake-parts": "flake-parts",
         "nix-filter": "nix-filter",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "pre-commit-hooks": "pre-commit-hooks"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
       }
     }
   },

flake.nix

@@ -6,30 +6,43 @@
       url = "github:hercules-ci/flake-parts";
       inputs.nixpkgs-lib.follows = "nixpkgs";
     };
-    nix-filter = {
-      url = "github:numtide/nix-filter";
-    };
+    pre-commit-hooks = { url = "github:cachix/pre-commit-hooks.nix"; };
+    nix-filter = { url = "github:numtide/nix-filter"; };
   };
 
-  outputs = inputs @ { flake-parts, nix-filter, ... }:
-    flake-parts.lib.mkFlake { inherit inputs; }
-      ({ lib, ... }: {
-        systems = [
-          "aarch64-linux"
-          "x86_64-linux"
+  outputs =
+    inputs @ { flake-parts
+    , nix-filter
+    , pre-commit-hooks
+    , ...
+    }:
+    flake-parts.lib.mkFlake { inherit inputs; } ({ lib, ... }: {
+      systems = [
+        "aarch64-linux"
+        "x86_64-linux"
 
-          "x86_64-darwin"
-          "aarch64-darwin"
-        ];
-        perSystem = { config, pkgs, self', ... }: {
+        "x86_64-darwin"
+        "aarch64-darwin"
+      ];
+      imports = [ pre-commit-hooks.flakeModule ];
+      perSystem =
+        { config
+        , pkgs
+        , self'
+        , ...
+        }: {
           packages = {
-            flake_env = pkgs.ocamlPackages.callPackage ./default.nix { inherit nix-filter; };
+            flake_env = pkgs.ocamlPackages.callPackage ./default.nix {
+              inherit nix-filter;
+            };
             default = config.packages.flake_env;
           };
           devShells.default = pkgs.mkShell {
             inputsFrom = [ self'.packages.default ];
             packages = [
               pkgs.just
+              pkgs.rnix-lsp
+              pkgs.pre-commit
               pkgs.ocamlPackages.alcotest
               pkgs.ocamlPackages.bisect_ppx
               pkgs.ocamlPackages.dune_3
@@ -39,12 +52,22 @@
               pkgs.ocamlPackages.ocamlformat
               pkgs.ocamlPackages.ocamlformat-rpc-lib
             ];
+            shellHook = config.pre-commit.installationScript;
+          };
+          pre-commit = {
+            check.enable = true;
+            settings.hooks = {
+              nixpkgs-fmt.enable = true;
+              dune-fmt.enable = true;
+            };
           };
         };
-        flake = {
-          overlays.default = final: _prev: {
-            flake_env = final.ocamlPackages.callPackage ./default.nix { inherit nix-filter; };
+      flake = {
+        overlays.default = final: _prev: {
+          flake_env = final.ocamlPackages.callPackage ./default.nix {
+            inherit nix-filter;
           };
         };
-      });
+      };
+    });
 }

flake_env.opam

@@ -10,7 +10,7 @@ doc: "https://git.sr.ht/~bryan_bennett/flake_env"
 bug-reports: "https://todo.sr.ht/~bryan_bennett/flake_env"
 depends: [
   "ocaml"
-  "dune" {>= "3.12"}
+  "dune" {>= "3.11"}
   "odoc" {with-doc}
 ]
 build: [

lib/flake_env__util.re

@@ -17,23 +17,39 @@ let nix = args =>
   );
 
 let hash_files = filenames => {
-  /*** Hash all entries in [filenames], returning a hex-encoded string of the hash of their contents */
+  /*** Hash all entries in [filenames]
+         Returns Some(hex-string) or None if no filenames are found.
+       */
   let ctx = Sha1.init();
-  let () =
+  let files_to_hash =
     filenames
     |> Array.filter(~f=f =>
          switch (Sys_unix.file_exists(f)) {
          | `Yes => true
-         | _ => false
+         | _ =>
+           // let fullpth = Filename_unix.realpath(f);
+           Printf.eprintf(
+             "Cannot find file %s (cwd: %s)\n",
+             f,
+             Core_unix.getcwd(),
+           );
+           false;
          }
-       )
-    |> Array.iter(~f=f => {
-         f
-         |> In_channel.create
-         |> In_channel.input_all
-         |> Sha1.update_string(ctx)
-       });
-  Sha1.finalize(ctx) |> Sha1.to_hex;
+       );
+
+  switch (files_to_hash |> Array.length) {
+  | 0 => Error("No files found to hash")
+  | _ =>
+    let () =
+      files_to_hash
+      |> Array.iter(~f=f => {
+           f
+           |> In_channel.create
+           |> In_channel.input_all
+           |> Sha1.update_string(ctx)
+         });
+    Ok(Sha1.finalize(ctx) |> Sha1.to_hex);
+  };
 };
 
 let rec rmrf = path => {

tests/flake_env_test_util.re

@@ -16,7 +16,22 @@ let _syst_to_bool =
 
 let check_exit_or_signal =
   Alcotest.(check(Alcotest.pair(testable_exit_or_signal, string)));
-let check_string = Alcotest.(check(string));
+let testable_result_string =
+  Alcotest.testable(
+    (pp_fmt, elem) => {
+      switch (elem) {
+      | Ok(s) => Fmt.pf(pp_fmt, "Ok(%s)", s)
+      | Error(s) => Fmt.pf(pp_fmt, "Error(%s)", s)
+      }
+    },
+    (a, b) =>
+      switch (a, b) {
+      | (Ok(a), Ok(b)) => String.compare(a, b) == 0
+      | (Error(a), Error(b)) => String.compare(a, b) == 0
+      | _ => false
+      },
+  );
+let check_result_string = Alcotest.(check(testable_result_string));
 let check_bool = Alcotest.(check(bool));
 let check_get_args =
   Alcotest.(
@@ -47,26 +62,26 @@ let test_run_process_stdout = () =>
   );
 
 let test_hash_one = () => {
-  check_string(
+  check_result_string(
     "Hash matches",
-    hash_files([|"../LICENSE"|]),
-    "b43cf2e824eb66ba0e8f939c08072a8e307b5e5f",
+    Ok("32b4ac64be805d730745f6bac45a5d95174ebd10"),
+    hash_files([|"spit_version.sh"|]),
   );
 };
 
 let test_hash_multiple = () => {
-  check_string(
+  check_result_string(
     "Hash matches",
-    hash_files([|"../LICENSE", "../LICENSE"|]),
-    "08304d8baeed02722f81252952b00f6ac011ce0c",
+    Ok("e4c880fc6ab9a1b88e6be18e53fc4cec9f463d1a"),
+    hash_files([|"spit_version.sh", "spit_version.sh"|]),
   );
 };
 
 let test_hash_filters_nonexistent = () => {
-  check_string(
+  check_result_string(
     "Hash matches",
-    hash_files([|"../LICENSE", "FOOBARBAZ"|]),
-    "b43cf2e824eb66ba0e8f939c08072a8e307b5e5f",
+    Ok("32b4ac64be805d730745f6bac45a5d95174ebd10"),
+    hash_files([|"spit_version.sh", "FOOBARBAZ"|]),
   );
 };