more cleanup

This commit is contained in:
Daniel Lundin 2024-10-18 10:57:46 +02:00
parent c9f5febd94
commit a362c3885f
Signed by: dln
SSH key fingerprint: SHA256:dQy1Xj3UiqJYpKR5ggQ2bxgz4jCH8IF+k3AB8o0kmdI
2 changed files with 17 additions and 32 deletions

View file

@ -21,7 +21,6 @@
outputs =
inputs@{
self,
nixpkgs-stable,
nixpkgs-unstable,
ghostty-hm,
home-manager,
@ -30,19 +29,16 @@
let
inherit (self) outputs;
system = "x86_64-linux";
pkgs = nixpkgs-unstable.legacyPackages.${system};
overlays-nixpkgs = final: prev: {
stable = import nixpkgs-stable {
inherit system;
config.allowUnfree = true;
mkHost =
modules:
nixpkgs-unstable.lib.nixosSystem {
specialArgs = {
inherit inputs outputs;
};
modules = [ ./common ] ++ modules;
};
unstable = import nixpkgs-unstable {
inherit system;
config.allowUnfree = true;
};
};
mkHome =
modules:
@ -54,23 +50,8 @@
modules = [
ghostty-hm.homeModules.default
./home/common
(
{ ... }:
{
nixpkgs.overlays = [ overlays-nixpkgs ];
}
)
] ++ modules;
};
mkHost =
modules:
nixpkgs-unstable.lib.nixosSystem {
specialArgs = {
inherit inputs outputs;
};
modules = [ ./common ] ++ modules;
};
in
{
overlays = import ./overlays { inherit inputs outputs; };
@ -82,17 +63,17 @@
];
};
nixosConfigurations = {
dinky = mkHost [ ./hosts/dinky ];
nemo = mkHost [ ./hosts/nemo ];
pearl = mkHost [ ./hosts/pearl ];
};
homeConfigurations = {
"dln@dinky" = mkHome [ ./home/dln/dinky.nix ];
"dln@nemo" = mkHome [ ./home/dln/nemo.nix ];
"dln@pearl" = mkHome [ ./home/dln/pearl.nix ];
"lsjostro@nemo" = mkHome [ ./home/lsjostro/nemo.nix ];
};
nixosConfigurations = {
dinky = mkHost [ ./hosts/dinky ];
nemo = mkHost [ ./hosts/nemo ];
pearl = mkHost [ ./hosts/pearl ];
};
};
}

View file

@ -13,6 +13,10 @@
};
unstable-packages = final: _prev: {
stable = import inputs.nixpkgs-stable {
system = final.system;
config.allowUnfree = true;
};
unstable = import inputs.nixpkgs-unstable {
system = final.system;
config.allowUnfree = true;