Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e445e49baf | ||
|
|
ef3cf30a34 | ||
|
|
86a0792b6e | ||
|
|
d1aea76dd9 | ||
|
|
cdc9e18035 | ||
|
|
374ba596ab | ||
|
|
ffeede1dca | ||
|
|
a7c17bc738 | ||
|
|
7e93c5267a | ||
|
|
fd7a2ca07d | ||
|
|
d7d6a42d48 |
@@ -16,7 +16,7 @@ Simple Nix flake library for:
|
|||||||
From your new project folder:
|
From your new project folder:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
nix flake new myapp -t git+https://git.dgren.dev/eric/nix-flake-lib.git#default
|
nix flake new myapp -t 'git+https://git.dgren.dev/eric/nix-flake-lib?ref=v1.0.5#default' --refresh
|
||||||
```
|
```
|
||||||
|
|
||||||
## Use the library (existing repo)
|
## Use the library (existing repo)
|
||||||
@@ -24,7 +24,7 @@ nix flake new myapp -t git+https://git.dgren.dev/eric/nix-flake-lib.git#default
|
|||||||
Add this flake input:
|
Add this flake input:
|
||||||
|
|
||||||
```nix
|
```nix
|
||||||
inputs.devshell-lib.url = "git+https://git.dgren.dev/eric/nix-flake-lib?ref=v0.0.5";
|
inputs.devshell-lib.url = "git+https://git.dgren.dev/eric/nix-flake-lib?ref=v1.0.5";
|
||||||
inputs.devshell-lib.inputs.nixpkgs.follows = "nixpkgs";
|
inputs.devshell-lib.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
18
flake.nix
18
flake.nix
@@ -95,6 +95,11 @@
|
|||||||
// additionalHooks;
|
// additionalHooks;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
toolNameWidth = builtins.foldl' (
|
||||||
|
maxWidth: t: pkgs.lib.max maxWidth (builtins.stringLength t.name)
|
||||||
|
) 0 tools;
|
||||||
|
toolLabelWidth = toolNameWidth + 1;
|
||||||
|
|
||||||
toolBannerScript = pkgs.lib.concatMapStrings (
|
toolBannerScript = pkgs.lib.concatMapStrings (
|
||||||
t:
|
t:
|
||||||
let
|
let
|
||||||
@@ -102,7 +107,8 @@
|
|||||||
in
|
in
|
||||||
''
|
''
|
||||||
if command -v ${t.bin} >/dev/null 2>&1; then
|
if command -v ${t.bin} >/dev/null 2>&1; then
|
||||||
printf " $CYAN ${t.name}:$RESET\t${colorVar}%s$RESET\n" "$(${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
|
fi
|
||||||
''
|
''
|
||||||
) tools;
|
) tools;
|
||||||
@@ -129,6 +135,12 @@
|
|||||||
CYAN='\033[1;36m'
|
CYAN='\033[1;36m'
|
||||||
YELLOW='\033[1;33m'
|
YELLOW='\033[1;33m'
|
||||||
BLUE='\033[1;34m'
|
BLUE='\033[1;34m'
|
||||||
|
RED='\033[1;31m'
|
||||||
|
MAGENTA='\033[1;35m'
|
||||||
|
WHITE='\033[1;37m'
|
||||||
|
GRAY='\033[0;90m'
|
||||||
|
BOLD='\033[1m'
|
||||||
|
UNDERLINE='\033[4m'
|
||||||
RESET='\033[0m'
|
RESET='\033[0m'
|
||||||
|
|
||||||
printf "\n$GREEN 🚀 Dev shell ready$RESET\n\n"
|
printf "\n$GREEN 🚀 Dev shell ready$RESET\n\n"
|
||||||
@@ -250,6 +262,10 @@
|
|||||||
run = ''
|
run = ''
|
||||||
sed -E -i "s#^([[:space:]]*devshell-lib\\.url = \")git\\+https://git\\.dgren\\.dev/eric/nix-flake-lib[^\"]*(\";)#\\1git+https://git.dgren.dev/eric/nix-flake-lib?ref=$FULL_TAG\\2#" "$ROOT_DIR/template/flake.nix"
|
sed -E -i "s#^([[:space:]]*devshell-lib\\.url = \")git\\+https://git\\.dgren\\.dev/eric/nix-flake-lib[^\"]*(\";)#\\1git+https://git.dgren.dev/eric/nix-flake-lib?ref=$FULL_TAG\\2#" "$ROOT_DIR/template/flake.nix"
|
||||||
log "Updated template/flake.nix devshell-lib ref to $FULL_TAG"
|
log "Updated template/flake.nix devshell-lib ref to $FULL_TAG"
|
||||||
|
|
||||||
|
sed -E -i "s|(nix flake new myapp -t ')git\\+https://git\\.dgren\\.dev/eric/nix-flake-lib[^']*(#default' --refresh)|\\1git+https://git.dgren.dev/eric/nix-flake-lib?ref=$FULL_TAG\\2|" "$ROOT_DIR/README.md"
|
||||||
|
sed -E -i "s#^([[:space:]]*inputs\\.devshell-lib\\.url = \")git\\+https://git\\.dgren\\.dev/eric/nix-flake-lib[^\"]*(\";)#\\1git+https://git.dgren.dev/eric/nix-flake-lib?ref=$FULL_TAG\\2#" "$ROOT_DIR/README.md"
|
||||||
|
log "Updated README.md devshell-lib refs to $FULL_TAG"
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
||||||
devshell-lib.url = "git+https://git.dgren.dev/eric/nix-flake-lib?ref=v1.0.0";
|
devshell-lib.url = "git+https://git.dgren.dev/eric/nix-flake-lib?ref=v1.0.5";
|
||||||
devshell-lib.inputs.nixpkgs.follows = "nixpkgs";
|
devshell-lib.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -23,81 +23,102 @@
|
|||||||
"aarch64-darwin"
|
"aarch64-darwin"
|
||||||
];
|
];
|
||||||
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
|
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
|
in
|
||||||
{
|
{
|
||||||
devShells = forAllSystems (
|
devShells = forAllSystems (
|
||||||
system:
|
system:
|
||||||
let
|
let
|
||||||
pkgs = import nixpkgs { inherit system; };
|
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 = config.extraPackages ++ [ self.packages.${system}.release ];
|
||||||
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
|
in
|
||||||
{
|
{
|
||||||
default = env.shell;
|
default = env.shell;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
packages = forAllSystems (system: {
|
||||||
|
release = devshell-lib.lib.mkRelease {
|
||||||
|
inherit system;
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
checks = forAllSystems (
|
checks = forAllSystems (
|
||||||
system:
|
system:
|
||||||
let
|
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
|
in
|
||||||
{
|
{
|
||||||
inherit (env) pre-commit-check;
|
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`)
|
# Release command (`release`)
|
||||||
#
|
#
|
||||||
# The release script always updates VERSION first, then:
|
# The release script always updates VERSION first, then:
|
||||||
# 1) runs release steps in order (file writes and scripts)
|
# 1) runs release steps in order (file writes and scripts)
|
||||||
@@ -107,6 +128,7 @@
|
|||||||
# Runtime env vars available in release.run/postVersion:
|
# Runtime env vars available in release.run/postVersion:
|
||||||
# BASE_VERSION, CHANNEL, PRERELEASE_NUM, FULL_VERSION, FULL_TAG
|
# BASE_VERSION, CHANNEL, PRERELEASE_NUM, FULL_VERSION, FULL_TAG
|
||||||
#
|
#
|
||||||
|
# To customize release behavior in your repo, edit:
|
||||||
# packages = forAllSystems (
|
# packages = forAllSystems (
|
||||||
# system:
|
# system:
|
||||||
# {
|
# {
|
||||||
|
|||||||
Reference in New Issue
Block a user