chore: update nixpkgs

This commit is contained in:
Tim Schubert 2025-05-17 12:49:05 +02:00
parent 091c4243fe
commit 6ca9dde866
No known key found for this signature in database
4 changed files with 97 additions and 98 deletions

View file

@ -1,32 +1,42 @@
{ self
, agenix
, lix-module
, nixpkgs
, nixpkgs-full
, home-manager
, homepage
, nixos-hardware
, nixos-generators
, nixpkgs-unstable
, ...
{
self,
agenix,
home-manager,
homepage,
lix-module,
nixos-hardware,
nixos-generators,
nixpkgs,
nixpkgs-small,
...
}@inputs:
let
lixModule = lix-module.nixosModules.default;
nixosSystem = { n_nixpkgs ? nixpkgs, system ? "x86_64-linux", extraModules ? [ ] }: n_nixpkgs.lib.nixosSystem {
inherit system;
nixosSystem =
{
nixpkgs,
system ? "x86_64-linux",
extraModules ? [ ],
}:
nixpkgs.lib.nixosSystem {
inherit system;
modules = [
lixModule
{
nixpkgs.overlays = n_nixpkgs.lib.attrValues self.overlays;
}
] ++ (n_nixpkgs.lib.attrValues self.nixosModules) ++ [ agenix.nixosModules.age ] ++ extraModules;
};
modules =
[
lixModule
{
nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays;
}
]
++ (nixpkgs.lib.attrValues self.nixosModules)
++ [ agenix.nixosModules.age ]
++ extraModules;
};
in
{
gorgon = nixosSystem rec {
n_nixpkgs = nixpkgs-unstable;
nixpkgs = nixpkgs;
system = "x86_64-linux";
@ -34,13 +44,16 @@ in
{
nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays;
dadada.pkgs = self.packages.${system};
dadada.inputs = inputs // { dadada = self; };
dadada.inputs = inputs // {
dadada = self;
};
}
nixos-hardware.nixosModules.lenovo-thinkpad-t14s-amd-gen1
home-manager.nixosModules.home-manager
({ pkgs, lib, ... }:
(
{ pkgs, lib, ... }:
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
@ -49,12 +62,14 @@ in
{ manual.manpages.enable = false; }
];
home-manager.users.dadada = import ../home;
})
}
)
./gorgon/configuration.nix
];
};
surgat = nixosSystem {
nixpkgs = nixpkgs-small;
system = "x86_64-linux";
extraModules = [
{
@ -66,34 +81,39 @@ in
};
agares = nixosSystem {
nixpkgs = nixpkgs-small;
extraModules = [
./agares/configuration.nix
];
};
installer = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
lixModule
nixos-generators.nixosModules.install-iso
self.nixosModules.admin
{
isoImage.isoName = nixpkgs.lib.mkForce "dadada-nixos-installer.iso";
networking.tempAddresses = "disabled";
dadada.admin.enable = true;
documentation.enable = true;
documentation.nixos.enable = true;
i18n.defaultLocale = "en_US.UTF-8";
console = {
font = "Lat2-Terminus16";
keyMap = "us";
};
}
];
};
installer =
let
nixpkgs = nixpkgs-small;
in
nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
lixModule
nixos-generators.nixosModules.install-iso
self.nixosModules.admin
{
isoImage.isoName = nixpkgs.lib.mkForce "dadada-nixos-installer.iso";
networking.tempAddresses = "disabled";
dadada.admin.enable = true;
documentation.enable = true;
documentation.nixos.enable = true;
i18n.defaultLocale = "en_US.UTF-8";
console = {
font = "Lat2-Terminus16";
keyMap = "us";
};
}
];
};
ninurta = nixosSystem {
n_nixpkgs = nixpkgs-full;
nixpkgs = nixpkgs-small;
extraModules = [
./ninurta/configuration.nix
];