Compare commits

..

No commits in common. "e4775f4611ce51e286ad7b7ee8187c422d62ce55" and "c94356e24f6b060eaa835f84c0dcf0a62f0f0e04" have entirely different histories.

View file

@ -53,11 +53,6 @@
home-manager.users.alarsyo = import ./home; home-manager.users.alarsyo = import ./home;
home-manager.verbose = true; home-manager.verbose = true;
}; };
nix-path = {
nix.nixPath = [
"nixpkgs=${inputs.nixpkgs}"
];
};
}; };
nixosConfigurations = nixosConfigurations =
@ -74,10 +69,6 @@
}; };
}) })
]; ];
sharedModules = [
home-manager.nixosModule
{ nixpkgs.overlays = shared_overlays; }
] ++ (nixpkgs.lib.attrValues self.nixosModules);
in { in {
poseidon = nixpkgs.lib.nixosSystem rec { poseidon = nixpkgs.lib.nixosSystem rec {
@ -85,6 +76,9 @@
modules = [ modules = [
./poseidon.nix ./poseidon.nix
home-manager.nixosModule
self.nixosModules.home
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: { (self: super: {
@ -99,9 +93,9 @@
python3 = self.fastPython3; python3 = self.fastPython3;
}; };
}) })
]; ] ++ shared_overlays;
} }
] ++ sharedModules; ];
}; };
boreal = nixpkgs.lib.nixosSystem rec { boreal = nixpkgs.lib.nixosSystem rec {
@ -109,6 +103,9 @@
modules = [ modules = [
./boreal.nix ./boreal.nix
home-manager.nixosModule
self.nixosModules.home
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
inputs.emacs-overlay.overlay inputs.emacs-overlay.overlay
@ -119,9 +116,9 @@
# (self: super: { # (self: super: {
# stdenv = super.impureUseNativeOptimizations super.stdenv; # stdenv = super.impureUseNativeOptimizations super.stdenv;
# }) # })
]; ] ++ shared_overlays;
} }
] ++ sharedModules; ];
}; };
zephyrus = nixpkgs.lib.nixosSystem rec { zephyrus = nixpkgs.lib.nixosSystem rec {
@ -133,12 +130,15 @@
inputs.nixos-hardware.nixosModules.common-pc-laptop inputs.nixos-hardware.nixosModules.common-pc-laptop
inputs.nixos-hardware.nixosModules.common-pc-ssd inputs.nixos-hardware.nixosModules.common-pc-ssd
home-manager.nixosModule
self.nixosModules.home
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
inputs.emacs-overlay.overlay inputs.emacs-overlay.overlay
]; ] ++ shared_overlays;
} }
] ++ sharedModules; ];
}; };
}; };