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

pbsdspkgs

This commit is contained in:
Peder Bergebakken Sundt 2024-10-09 16:43:52 +02:00
parent bd765031de
commit 1341d9d719
3 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
base.nix
View File

@ -12,7 +12,9 @@
(ifExists ./hardware-configuration.nix ) (ifExists ./hardware-configuration.nix )
]; ];
nixpkgs.overlays = [ (import ./overlay.nix) ]; nixpkgs.overlays = [
(import ./overlays/wl-clipboard-timeout.nix)
];
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [
pkgs.pulsar.name pkgs.pulsar.name

44
flake.nix
View File

@ -183,9 +183,13 @@
networking.domain = domain; networking.domain = domain;
networking.search = [ domain ]; networking.search = [ domain ];
nixpkgs.overlays = [ nixpkgs.overlays = [
self.overlays.pbsdspkgs
(final: prev: { (final: prev: {
#unstable = unstable.legacyPackages.${final.system}; #unstable = unstable.legacyPackages.${final.system};
unstable = import inputs.unstable { inherit system; config.allowUnfree = true; }; # TODO: inherit nixos config from stable unstable = import inputs.unstable {
inherit system;
config = final.pkgs.config;
};
}) })
]; ];
# This makes commandline tools like 'nix run nixpkgs#hello' # This makes commandline tools like 'nix run nixpkgs#hello'
@ -290,27 +294,35 @@
nixosConfigurations = mkHosts (mkConfig []); nixosConfigurations = mkHosts (mkConfig []);
nixosReports = mkHosts (mkReport []); nixosReports = mkHosts (mkReport []);
# TODO: overlays overlays = {
pbsdspkgs = pkgs: prev: let inherit (pkgs) lib; in {
pbsds = lib.makeScope pkgs.newScope (pbsds: {
# TODO: get faketty to work, ${expect}/bin/unbuffer is bad
nixos-rebuild-nom = pkgs.writeScriptBin "nixos-rebuild" ''
if test -t 1 && test -z "''${NIX_NO_NOM-}"; then
exec ${lib.getExe pkgs.nixos-rebuild} -L "$@" |& ${lib.getExe pkgs.nix-output-monitor}
else
exec ${lib.getExe pkgs.nixos-rebuild} -L "$@"
fi
'';
device-mon = pkgs.callPackage ./pkgs/device-mon {};
#pdoc-docs = (pkgs.callPackage ./pkgs/pdocs.nix {}).pdocs;
#pdoc3-docs = (pkgs.callPackage ./pkgs/pdocs.nix {}).pdocs3;
});
};
wl-clipboard-timeout = ./overlays/wl-clipboard-timeout.nix;
default = self.overlays.pbsdspkgs;
};
packages = forAllSystems ({ inputs, pkgs, lib, ... }: let packages = forAllSystems ({ inputs, pkgs, lib, ... }: let
# TODO: by-name # TODO: by-name
mk-nspawn-setup = hostname: # TODO: nspawn-tarball.nix populates /etc/nixos with junk mk-nspawn-setup = hostname: # TODO: nspawn-tarball.nix populates /etc/nixos with junk
(pkgs.callPackage ./pkgs/mk-nspawn-setup {}) (pkgs.callPackage ./pkgs/mk-nspawn-setup {})
(mkHosts (mkConfig [ "${nixos-nspawn}/nspawn-tarball.nix" ])).${hostname}; (mkHosts (mkConfig [ "${nixos-nspawn}/nspawn-tarball.nix" ])).${hostname};
in { pbsdspkgs = lib.filterAttrs (name: value: lib.isDerivation value) (self.overlays.pbsdspkgs pkgs null).pbsds;
# TODO: get faketty to work, ${expect}/bin/unbuffer is bad in
nixos-rebuild-nom = pkgs.writeScriptBin "nixos-rebuild" '' pbsdspkgs // {
if test -t 1 && test -z "''${NIX_NO_NOM-}"; then
exec ${lib.getExe pkgs.nixos-rebuild} -L "$@" |& ${lib.getExe pkgs.nix-output-monitor}
else
exec ${lib.getExe pkgs.nixos-rebuild} -L "$@"
fi
'';
device-mon = pkgs.callPackage ./pkgs/device-mon {};
#pdoc-docs = (pkgs.callPackage ./pkgs/pdocs.nix {}).pdocs;
#pdoc3-docs = (pkgs.callPackage ./pkgs/pdocs.nix {}).pdocs3;
nspawn-setup-brumlebasse = mk-nspawn-setup "brumlebasse"; nspawn-setup-brumlebasse = mk-nspawn-setup "brumlebasse";
image-brumlebasse-openstack = nixos-generators-2311.nixosGenerate { image-brumlebasse-openstack = nixos-generators-2311.nixosGenerate {
system = "x86_64-linux"; system = "x86_64-linux";

0
overlay.nix → overlays/wl-clipboard-timeout.nix
View File