pederbs/config
2
1
Fork 0
Code Issues Pull Requests Releases Activity

ng

Browse Source
This commit is contained in:
Peder Bergebakken Sundt
2025-06-20 06:48:07 +02:00
parent 044ca7689e
commit b3767cc6a4
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
flake.nix
View File

@@ -205,7 +205,13 @@
{ pkgs, lib, ... }:
let
# TODO: by-name
pbsdspkgs = lib.filterAttrs (_: lib.isDerivation) (self.overlays.pbsdspkgs pkgs null).pbsds;
pbsdspkgs = lib.filterAttrs (_: lib.isDerivation) (
pkgs.appendOverlays
[
input-views.inputs-edge.system-manager-edge.overlays.default
self.overlays.pbsdspkgs
]
).pbsds;
in
pbsdspkgs // { }
);
@@ -271,9 +277,10 @@
# packages = (args.packages or []) ++ packages ++ self.checks.${system}.pre-commit-check.enabledPackages;
#});
inherit (input-views.inputs-edge.system-manager-edge.packages.${system}) system-manager;
inherit (self.packages.${system}) nom-system-manager;
envrc-pkgs = [
self.packages.${system}.nom-nixos-rebuild
# self.packages.${system}.nom-nixos-rebuild-ng
self.packages.${system}.nom-nixos-rebuild-ng
self.packages.${system}.nom-home-manager
pkgs.nix-output-monitor
# pkgs.cachix
@@ -293,7 +300,7 @@
]);
remoteenv = mkShell { } [
self.packages.${system}.nom-nixos-rebuild
# self.packages.${system}.nom-nixos-rebuild-ng
self.packages.${system}.nom-nixos-rebuild-ng
self.packages.${system}.nom-home-manager
pkgs.age
pkgs.ssh-to-age
@@ -304,6 +311,9 @@
envrc-fhs = mkShell { inheritFrom = [ envrc ]; } [ system-manager ];
envrc-remotes-fhs = mkShell { inheritFrom = [ envrc-remotes ]; } [ system-manager ];
remoteenv-fhs = mkShell { inheritFrom = [ remoteenv ]; } [ system-manager ];
# envrc-fhs = mkShell { inheritFrom = [ envrc ]; } [ nom-system-manager ];
# envrc-remotes-fhs = mkShell { inheritFrom = [ envrc-remotes ]; } [ nom-system-manager ];
# remoteenv-fhs = mkShell { inheritFrom = [ remoteenv ]; } [ nom-system-manager ];
});
#checks = forAllSystems ({ inputs, system, ... }: {

15
justfile
View File

@@ -25,7 +25,7 @@ eval-vm $hostname=`just _a_host` $attrpath="" *args:
nix eval ".#nixosConfigurations.\"$hostname\".config.virtualisation.vmVariant.$attrpath" --show-trace "${@:3}"
repl $hostname=`just _a_host`:
NIX_NO_NOM=1 nixos-rebuild --flake .#"$hostname" repl
NIX_NO_NOM=1 nixos-rebuild-ng --flake .#"$hostname" repl
report hostname=`just _a_host`:
nix eval .#nixosReports."{{hostname}}" --json --show-trace | yq . --yaml-output --width=999999 | bat --language yaml --style plain --paging never
@@ -53,10 +53,10 @@ update:
# todo: support system-manager
# todo: support home-manager?
build hostname="" *_:
nixos-rebuild build --accept-flake-config --show-trace --flake .#"{{hostname}}" "${@:2}"
nixos-rebuild-ng build --accept-flake-config --show-trace --flake .#"{{hostname}}" "${@:2}"
build-vm hostname=`just _a_host` *_:
nixos-rebuild build-vm --accept-flake-config --show-trace --flake .#"{{hostname}}" "${@:2}"
nixos-rebuild-ng build-vm --accept-flake-config --show-trace --flake .#"{{hostname}}" "${@:2}"
build-vm-and-run $hostname=`just _a_host` *_:
@# TODO: setup ports?
@@ -69,18 +69,19 @@ build-vm-and-run $hostname=`just _a_host` *_:
# #!/usr/bin/env -S bash -euo pipefail
test *_:
sudo nixos-rebuild test --accept-flake-config --show-trace --flake . "$@"
sudo nixos-rebuild-ng test --accept-flake-config --show-trace --flake . "$@"
switch *_:
sudo nixos-rebuild switch --accept-flake-config --show-trace --flake . "$@"
sudo nixos-rebuild-ng switch --accept-flake-config --show-trace --flake . "$@"
boot *_:
sudo nixos-rebuild boot --accept-flake-config --show-trace --flake . "$@"
sudo nixos-rebuild-ng boot --accept-flake-config --show-trace --flake . "$@"
boot-and-reboot *_:
sudo nixos-rebuild boot --accept-flake-config --show-trace --flake . "$@"
sudo nixos-rebuild-ng boot --accept-flake-config --show-trace --flake . "$@"
sudo reboot
# TODO: nixos-rebuild-ng
push $hostname=`just _a_host` cmd=`gum choose test switch boot --header "Select mode..."`:
#!/usr/bin/env -S bash -euo pipefail
remote_sudo=1

3
overlays/pbsdspkgs.nix
View File

@@ -5,7 +5,7 @@ let
# TODO: get faketty to work, ${expect}/bin/unbuffer is bad
mkNomWrapper =
pkg:
final.writeScriptBin pkg.meta.mainProgram ''
final.writeScriptBin (pkg.meta.mainProgram or (lib.getName pkg)) ''
if test -t 1 && test -z "''${NIX_NO_NOM-}"; then
exec ${lib.getExe pkg} -L "$@" |& ${lib.getExe final.nix-output-monitor}
else
@@ -18,6 +18,7 @@ in
nom-nixos-rebuild = mkNomWrapper final.nixos-rebuild;
nom-nixos-rebuild-ng = mkNomWrapper final.nixos-rebuild-ng;
nom-home-manager = mkNomWrapper final.home-manager;
nom-system-manager = mkNomWrapper final.system-manager;
v4l2-play = final.callPackage ./../pkgs/v4l2-play { };
device-mon = final.callPackage ./../pkgs/device-mon { };