direnv,devShells: split into develop and install

This commit is contained in:
steveej 2024-01-23 09:39:43 +00:00
parent d26e64452d
commit bcaadcfb3d
4 changed files with 63 additions and 56 deletions

2
.envrc
View file

@ -1 +1 @@
use_flake . --impure
use_flake .#develop --impure

View file

@ -170,7 +170,8 @@
inherit systems;
perSystem =
{ inputs'
{ self'
, inputs'
, system
, config
, lib
@ -295,11 +296,18 @@
};
formatter = pkgs.alejandra;
devShells.default = import ./nix/devShells.nix {
inherit inputs' pkgs;
packages' = packages;
};
devShells =
let
all = import ./nix/devShells.nix {
inherit
self'
inputs'
pkgs
;
};
in
(all // { default = all.develop; });
};
flake.nixosModules = {

View file

@ -1,70 +1,69 @@
{ inputs'
, packages'
{ self'
, inputs'
, pkgs
,
}:
pkgs.stdenv.mkDerivation {
name = "infra-env";
buildInputs =
[
(with pkgs.callPackage (pkgs.path + "/nixos") { configuration = { }; };
with config.system.build; [
nixos-generate-config
nixos-install
nixos-enter
manual.manpages
])
]
++ (with pkgs; [
inputs'.colmena.packages.colmena
{
install = pkgs.mkShell {
name = "infra-install";
packages = with pkgs; [
nixos-install-tools
inputs'.disko.packages.disko
just
git
git-crypt
gnupg
];
};
develop = pkgs.mkShell {
name = "infra-develop";
inputsFrom = [
self'.devShells.install
];
packages = with pkgs; [
inputs'.colmena.packages.colmena
dconf2nix
inputs'.nixos-anywhere.packages.nixos-anywhere
inputs'.disko.packages.default
nurl
just
git-crypt
vcsh
gnupg
git
ripgrep
lm_sensors
pass
fuzzel
wofi
# pass
age
age-plugin-yubikey
ssh-to-age
yubico-piv-tool
inputs'.sops-nix.packages.default
sops
nil
apacheHttpd
vncdo
tesseract
imagemagick
# vncdo
# tesseract
# imagemagick
nmap
sysstat
lshw
xxHash
linssid
wavemon
wirelesstools
# lm_sensors
zathura
xorg.xwininfo
glxinfo
autorandr
arandr
playerctl
x11docker
fwupd
# nmap
# sysstat
# lshw
# xxHash
# linssid
# wavemon
# wirelesstools
ntfy
# zathura
# xorg.xwininfo
# glxinfo
# autorandr
# arandr
# playerctl
# x11docker
# fwupd
hedgedoc-cli
# ntfy
# hedgedoc-cli
xwayland
@ -75,9 +74,9 @@ pkgs.stdenv.mkDerivation {
(pkgs.writeShellScriptBin "r11" ''
exec env NIXOS_OZONE_WL="" WAYLAND_DISPLAY="" $@
'')
];
]);
# Set Environment Variables
RUST_BACKTRACE = 1;
# Set Environment Variables
RUST_BACKTRACE = 1;
};
}