chore(release): v1.0.4

README.md

@@ -16,7 +16,7 @@ Simple Nix flake library for:
 From your new project folder:
 
 ```bash
-nix flake new myapp -t 'git+https://git.dgren.dev/eric/nix-flake-lib?ref=v1.0.2#default' --refresh
+nix flake new myapp -t 'git+https://git.dgren.dev/eric/nix-flake-lib?ref=v1.0.4#default' --refresh
 ```
 
 ## Use the library (existing repo)
@@ -24,7 +24,7 @@ nix flake new myapp -t 'git+https://git.dgren.dev/eric/nix-flake-lib?ref=v1.0.2#
 Add this flake input:
 
 ```nix
-inputs.devshell-lib.url = "git+https://git.dgren.dev/eric/nix-flake-lib?ref=v1.0.2";
+inputs.devshell-lib.url = "git+https://git.dgren.dev/eric/nix-flake-lib?ref=v1.0.4";
 inputs.devshell-lib.inputs.nixpkgs.follows = "nixpkgs";
 ```
 

VERSION

@@ -1,3 +1,3 @@
-1.0.2
+1.0.4
 stable
 0

flake.nix

@@ -96,7 +96,7 @@
             };
 
             toolNameWidth = builtins.foldl' (
-              maxWidth: t: builtins.max maxWidth (builtins.stringLength t.name)
+              maxWidth: t: pkgs.lib.max maxWidth (builtins.stringLength t.name)
             ) 0 tools;
             toolLabelWidth = toolNameWidth + 1;
 
@@ -107,7 +107,8 @@
               in
               ''
                 if command -v ${t.bin} >/dev/null 2>&1; then
-                  printf "  $CYAN %-${toString toolLabelWidth}s$RESET ${colorVar}%s$RESET\n" "${t.name}:" "$(${t.bin} ${t.versionCmd})"
+                  version="$(${t.bin} ${t.versionCmd} 2>/dev/null | head -n 1 | sed -E 's/^[[:space:]]+//; s/[[:space:]]+$//')"
+                  printf "  $CYAN %-${toString toolLabelWidth}s$RESET ${colorVar}%s$RESET\n" "${t.name}:" "$version"
                 fi
               ''
             ) tools;

template/flake.nix

@@ -4,7 +4,7 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-    devshell-lib.url = "git+https://git.dgren.dev/eric/nix-flake-lib?ref=v1.0.2";
+    devshell-lib.url = "git+https://git.dgren.dev/eric/nix-flake-lib?ref=v1.0.4";
     devshell-lib.inputs.nixpkgs.follows = "nixpkgs";
   };
 
@@ -23,62 +23,63 @@
         "aarch64-darwin"
       ];
       forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
+
+      mkDevShellConfig = pkgs: {
+        # includeStandardPackages = false; # opt out of nixfmt/gitlint/gitleaks/shfmt defaults
+
+        extraPackages = with pkgs; [
+          # add your tools here, e.g.:
+          # go
+          # bun
+          # rustc
+        ];
+
+        features = {
+          # oxfmt = true;  # enables oxfmt + oxlint from nixpkgs
+        };
+
+        formatters = {
+          # shfmt.enable = true;
+          # gofmt.enable = true;
+        };
+
+        formatterSettings = {
+          # shfmt.options = [ "-i" "2" "-s" "-w" ];
+          # oxfmt.includes = [ "*.ts" "*.tsx" "*.js" "*.json" ];
+        };
+
+        additionalHooks = {
+          tests = {
+            enable = true;
+            entry = "echo 'No tests defined yet.'"; # replace with your test command
+            pass_filenames = false;
+            stages = [ "pre-push" ];
+          };
+          # my-hook = {
+          #   enable = true;
+          #   entry = "${pkgs.some-tool}/bin/some-tool";
+          #   pass_filenames = false;
+          # };
+        };
+
+        tools = [
+          # { name = "Bun";   bin = "${pkgs.bun}/bin/bun";    versionCmd = "--version"; color = "YELLOW"; }
+          # { name = "Go";    bin = "${pkgs.go}/bin/go";       versionCmd = "version";   color = "CYAN";   }
+          # { name = "Rust";  bin = "${pkgs.rustc}/bin/rustc"; versionCmd = "--version"; color = "YELLOW"; }
+        ];
+
+        extraShellHook = ''
+          # any repo-specific shell setup here
+        '';
+      };
     in
     {
       devShells = forAllSystems (
         system:
         let
           pkgs = import nixpkgs { inherit system; };
-          env = devshell-lib.lib.mkDevShell {
+          config = mkDevShellConfig pkgs;
-            inherit system;
+          env = devshell-lib.lib.mkDevShell ({ inherit system; } // config);
-
-            # includeStandardPackages = false; # opt out of nixfmt/gitlint/gitleaks/shfmt defaults
-
-            extraPackages = with pkgs; [
-              # add your tools here, e.g.:
-              # go
-              # bun
-              # rustc
-            ];
-
-            features = {
-              # oxfmt = true;  # enables oxfmt + oxlint from nixpkgs
-            };
-
-            formatters = {
-              # shfmt.enable = true;
-              # gofmt.enable = true;
-            };
-
-            formatterSettings = {
-              # shfmt.options = [ "-i" "2" "-s" "-w" ];
-              # oxfmt.includes = [ "*.ts" "*.tsx" "*.js" "*.json" ];
-            };
-
-            additionalHooks = {
-              tests = {
-                enable = true;
-                entry = "echo 'No tests defined yet.'"; # replace with your test command
-                pass_filenames = false;
-                stages = [ "pre-push" ];
-              };
-              # my-hook = {
-              #   enable = true;
-              #   entry = "${pkgs.some-tool}/bin/some-tool";
-              #   pass_filenames = false;
-              # };
-            };
-
-            tools = [
-              # { name = "Bun";   bin = "${pkgs.bun}/bin/bun";    versionCmd = "--version"; color = "YELLOW"; }
-              # { name = "Go";    bin = "${pkgs.go}/bin/go";       versionCmd = "version";   color = "CYAN";   }
-              # { name = "Rust";  bin = "${pkgs.rustc}/bin/rustc"; versionCmd = "--version"; color = "YELLOW"; }
-            ];
-
-            extraShellHook = ''
-              # any repo-specific shell setup here
-            '';
-          };
         in
         {
           default = env.shell;
@@ -88,14 +89,23 @@
       checks = forAllSystems (
         system:
         let
-          env = devshell-lib.lib.mkDevShell { inherit system; };
+          pkgs = import nixpkgs { inherit system; };
+          config = mkDevShellConfig pkgs;
+          env = devshell-lib.lib.mkDevShell ({ inherit system; } // config);
         in
         {
           inherit (env) pre-commit-check;
         }
       );
 
-      formatter = forAllSystems (system: (devshell-lib.lib.mkDevShell { inherit system; }).formatter);
+      formatter = forAllSystems (
+        system:
+        let
+          pkgs = import nixpkgs { inherit system; };
+          config = mkDevShellConfig pkgs;
+        in
+        (devshell-lib.lib.mkDevShell ({ inherit system; } // config)).formatter
+      );
 
       # Optional: release command (`release`)
       #