This commit is contained in:
2025-06-20 06:48:07 +02:00
parent 044ca7689e
commit b3767cc6a4
3 changed files with 23 additions and 11 deletions

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, ... }: {