feat: switch to lix from nixpkgs

This commit is contained in:
Tim Schubert 2025-05-17 13:05:33 +02:00
parent 6ca9dde866
commit 0d892a1b7e
No known key found for this signature in database
4 changed files with 35 additions and 124 deletions

View file

@ -3,7 +3,6 @@
agenix,
home-manager,
homepage,
lix-module,
nixos-hardware,
nixos-generators,
nixpkgs,
@ -11,8 +10,6 @@
...
}@inputs:
let
lixModule = lix-module.nixosModules.default;
nixosSystem =
{
nixpkgs,
@ -24,7 +21,6 @@ let
modules =
[
lixModule
{
nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays;
}
@ -35,38 +31,40 @@ let
};
in
{
gorgon = nixosSystem rec {
nixpkgs = nixpkgs;
gorgon =
let
system = "x86_64-linux";
in
nixosSystem {
inherit nixpkgs system;
system = "x86_64-linux";
extraModules = [
{
nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays;
dadada.pkgs = self.packages.${system};
dadada.inputs = inputs // {
dadada = self;
};
}
nixos-hardware.nixosModules.lenovo-thinkpad-t14s-amd-gen1
home-manager.nixosModules.home-manager
(
{ pkgs, lib, ... }:
extraModules = [
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.sharedModules = (nixpkgs.lib.attrValues self.hmModules) ++ [
{ dadada.home.helix.package = pkgs.helix; }
{ manual.manpages.enable = false; }
];
home-manager.users.dadada = import ../home;
nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays;
dadada.pkgs = self.packages.${system};
dadada.inputs = inputs // {
dadada = self;
};
}
)
./gorgon/configuration.nix
];
};
nixos-hardware.nixosModules.lenovo-thinkpad-t14s-amd-gen1
home-manager.nixosModules.home-manager
(
{ pkgs, lib, ... }:
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.sharedModules = (nixpkgs.lib.attrValues self.hmModules) ++ [
{ dadada.home.helix.package = pkgs.helix; }
{ manual.manpages.enable = false; }
];
home-manager.users.dadada = import ../home;
}
)
./gorgon/configuration.nix
];
};
surgat = nixosSystem {
nixpkgs = nixpkgs-small;
@ -94,7 +92,6 @@ in
nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
lixModule
nixos-generators.nixosModules.install-iso
self.nixosModules.admin
{

View file

@ -1,4 +1,4 @@
{ config, lib, ... }:
{ config, lib, pkgs, ... }:
let
mkDefault = lib.mkDefault;
inputs = config.dadada.inputs;
@ -22,6 +22,8 @@ in
time.timeZone = mkDefault "Europe/Berlin";
nix.package = pkgs.lix;
nix.settings.substituters = [ https://cache.nixos.org/ ];
nix.settings.trusted-public-keys = [