diff --git a/.gitignore b/.gitignore index 3a18c73..8d10e08 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /dist result +.direnv/ +.envrc diff --git a/bin/make b/bin/make new file mode 100755 index 0000000..c19f2ca --- /dev/null +++ b/bin/make @@ -0,0 +1,3 @@ +#!env bash + +make $* diff --git a/envrc.sample b/envrc.sample new file mode 100644 index 0000000..568e15c --- /dev/null +++ b/envrc.sample @@ -0,0 +1,2 @@ +use flake . +gomod2nix diff --git a/shell.nix b/shell.nix index d4f21a8..c108b31 100644 --- a/shell.nix +++ b/shell.nix @@ -1,24 +1,25 @@ -{ pkgs ? ( +{ + pkgs ? ( let inherit (builtins) fetchTree fromJSON readFile; inherit ((fromJSON (readFile ./flake.lock)).nodes) nixpkgs gomod2nix; in - import (fetchTree nixpkgs.locked) { - overlays = [ - (import "${fetchTree gomod2nix.locked}/overlay.nix") - ]; - } - ) -, mkGoEnv ? pkgs.mkGoEnv -, gomod2nix ? pkgs.gomod2nix -}: - -let - goEnv = mkGoEnv { pwd = ./.; }; + import (fetchTree nixpkgs.locked) { + overlays = [ + (import "${fetchTree gomod2nix.locked}/overlay.nix") + ]; + } + ), + mkGoEnv ? pkgs.mkGoEnv, + gomod2nix ? pkgs.gomod2nix, +}: let + goEnv = mkGoEnv {pwd = ./.;}; in -pkgs.mkShell { - packages = [ - goEnv - gomod2nix - ]; -} + pkgs.mkShell { + packages = [ + goEnv + gomod2nix + pkgs.go_1_21 + pkgs.pre-commit + ]; + }