lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

ops/nixos: add jq everywhere

Browse source
This commit is contained in:
Luke Granger-Brown 2021-03-20 12:11:45 +00:00
parent 705bcd9446
commit d8086e7042
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ops/nixos/lib/common.nix
View file

@ -56,6 +56,7 @@ in
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
vim rxvt_unicode.terminfo tmux rebuilder tailscale rsync libarchive tcpdump restic vim rxvt_unicode.terminfo tmux rebuilder tailscale rsync libarchive tcpdump restic
iftop htop jq
(mercurial.overridePythonAttrs (origAttrs: { (mercurial.overridePythonAttrs (origAttrs: {
propagatedBuildInputs = [python3Packages.hg-evolve depot.nix.pkgs.hg-git]; propagatedBuildInputs = [python3Packages.hg-evolve depot.nix.pkgs.hg-git];
})) }))

3
ops/nixos/lib/home-manager/common.nix
View file

@ -74,12 +74,13 @@ in
whois whois
dnsutils dnsutils
] ++ lib.optionals (configName != null) [ ] ++ lib.optionals (configName != null) [
# This only applies to "external" users of this config.
(writeShellScriptBin "home-manager" '' (writeShellScriptBin "home-manager" ''
#!/bin/sh #!/bin/sh
exec "${home-manager}/bin/home-manager" -f "${config.home.homeDirectory}/depot/home-manager-ext.nix" -A "${configName}" "$@" exec "${home-manager}/bin/home-manager" -f "${config.home.homeDirectory}/depot/home-manager-ext.nix" -A "${configName}" "$@"
'') '')
rxvt_unicode.terminfo tmux rsync libarchive tcpdump restic rxvt_unicode.terminfo tmux rsync libarchive tcpdump restic
iftop htop iftop htop jq
(mercurial.overridePythonAttrs (origAttrs: { (mercurial.overridePythonAttrs (origAttrs: {
propagatedBuildInputs = [python3Packages.hg-evolve depot.nix.pkgs.hg-git]; propagatedBuildInputs = [python3Packages.hg-evolve depot.nix.pkgs.hg-git];
})) }))