dev/nixfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Move devshell to subdirectory

Browse Source
This commit is contained in:
Jack O'Sullivan 2022-02-19 23:34:41 +00:00
parent 17e4feb542
commit fafb7d4656
5 changed files with 90 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.envrc
View File

@ -1,3 +1,14 @@
use_flake_extra_watch() {
watch_file devshell/*
for f in devshell/*; do
if [ "$f" -nt flake.nix ]; then
# nix-direnv doesn't check the dates on other files, so give it a kick via flake.nix
touch flake.nix
fi
done
}
use flake_extra_watch
use flake
# devshell needs the shellHook to run even when cached

52
devshell/commands.nix Normal file
View File

@ -0,0 +1,52 @@
{ pkgs, ... }:
let
homeFlake = "$HOME/.config/nixpkgs/flake.nix";
in
{
commands = [
{
name = "repl";
category = "utilities";
help = "Open a `nix repl` with this flake";
command =
''
tmp="$(mktemp --tmpdir repl.nix.XXXXX)"
echo "builtins.getFlake \"$PRJ_ROOT\"" > "$tmp"
nix repl "$tmp" || true
rm "$tmp"
'';
}
{
name = "home-link";
category = "utilities";
help = "Install link to flake.nix for home-manager to use";
command =
''
[ -e "${homeFlake}" ] && echo "${homeFlake} already exists" && exit 1
mkdir -p "$(dirname "${homeFlake}")"
ln -s "$(pwd)/flake.nix" "${homeFlake}"
echo "Installed link to $(pwd)/flake.nix at ${homeFlake}"
'';
}
{
name = "home-unlink";
category = "utilities";
help = "Remove home-manager flake.nix link";
command = "rm -f ${homeFlake}";
}
{
name = "fmt";
category = "tasks";
help = pkgs.nixpkgs-fmt.meta.description;
command = ''exec "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt" "$@"'';
}
{
name = "home-switch";
category = "tasks";
help = "Run `home-manager switch`";
command = ''home-manager switch --flake . "$@"'';
}
];
}

25
devshell/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ lib, pkgs, ... }:
let
inherit (lib.my) attrsToNVList;
in
{
imports = [ ./commands.nix ./install.nix ];
env = attrsToNVList {
# starship will show this
name = "devshell";
NIX_USER_CONF_FILES = toString (pkgs.writeText "nix.conf"
''
experimental-features = nix-command flakes ca-derivations
'');
};
packages = with pkgs; [
coreutils
nixVersions.stable
agenix
deploy-rs.deploy-rs
home-manager
];
}

0
install.nix → devshell/install.nix
View File

74
flake.nix
View File

@ -42,7 +42,7 @@
inherit (builtins) mapAttrs attrValues;
inherit (lib) recurseIntoAttrs filterAttrs;
inherit (lib.flake) flattenTree eachDefaultSystem;
inherit (lib.my) attrsToNVList inlineModules mkDefaultSystemsPkgs flakePackageOverlay;
inherit (lib.my) inlineModules mkDefaultSystemsPkgs flakePackageOverlay;
# Extend a lib with extras that _must not_ internally reference private nixpkgs. flake-utils doesn't, but many
# other flakes (e.g. home-manager) probably do internally.
@ -141,8 +141,6 @@
} //
(eachDefaultSystem (system:
let
homeFlake = "$HOME/.config/nixpkgs/flake.nix";
pkgs = pkgs'.unstable.${system};
lib = pkgs.lib;
in
@ -153,74 +151,6 @@
deploy = recurseIntoAttrs (pkgs.deploy-rs.lib.deployChecks self.deploy);
};
# TODO: Move shell to a separate file?
devShell = pkgs.devshell.mkShell {
imports = [ ./install.nix ];
env = attrsToNVList {
# starship will show this
name = "devshell";
NIX_USER_CONF_FILES = toString (pkgs.writeText "nix.conf"
''
experimental-features = nix-command flakes ca-derivations
'');
};
packages = with pkgs; [
coreutils
nixVersions.stable
agenix
deploy-rs.deploy-rs
home-manager
];
commands = [
{
name = "repl";
category = "utilities";
help = "Open a `nix repl` with this flake";
command =
''
tmp="$(mktemp --tmpdir repl.nix.XXXXX)"
echo "builtins.getFlake \"$PRJ_ROOT\"" > "$tmp"
nix repl "$tmp" || true
rm "$tmp"
'';
}
{
name = "home-link";
category = "utilities";
help = "Install link to flake.nix for home-manager to use";
command =
''
[ -e "${homeFlake}" ] && echo "${homeFlake} already exists" && exit 1
mkdir -p "$(dirname "${homeFlake}")"
ln -s "$(pwd)/flake.nix" "${homeFlake}"
echo "Installed link to $(pwd)/flake.nix at ${homeFlake}"
'';
}
{
name = "home-unlink";
category = "utilities";
help = "Remove home-manager flake.nix link";
command = "rm -f ${homeFlake}";
}
{
name = "fmt";
category = "tasks";
help = pkgs.nixpkgs-fmt.meta.description;
command = ''exec "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt" "$@"'';
}
{
name = "home-switch";
category = "tasks";
help = "Run `home-manager switch`";
command = ''home-manager switch --flake . "$@"'';
}
];
};
devShell = pkgs.devshell.mkShell ./devshell;
}));
}