Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
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.2#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.2";
|
||||||
inputs.devshell-lib.inputs.nixpkgs.follows = "nixpkgs";
|
inputs.devshell-lib.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
17
flake.nix
17
flake.nix
@@ -95,6 +95,11 @@
|
|||||||
// additionalHooks;
|
// additionalHooks;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
toolNameWidth = builtins.foldl' (
|
||||||
|
maxWidth: t: builtins.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,7 @@
|
|||||||
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})"
|
printf " $CYAN %-${toString toolLabelWidth}s$RESET ${colorVar}%s$RESET\n" "${t.name}:" "$(${t.bin} ${t.versionCmd})"
|
||||||
fi
|
fi
|
||||||
''
|
''
|
||||||
) tools;
|
) tools;
|
||||||
@@ -129,6 +134,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 +261,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.2";
|
||||||
devshell-lib.inputs.nixpkgs.follows = "nixpkgs";
|
devshell-lib.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user