diff --git a/flake.nix b/flake.nix index 3964aa8..6b44ac1 100644 --- a/flake.nix +++ b/flake.nix @@ -40,15 +40,13 @@ self, nixpkgs, home-manager, - nix4vscode, - copyparty, ... }: let system = "x86_64-linux"; commonSystem = - hostname: overlays: + hostname: nixpkgs.lib.nixosSystem { inherit system; specialArgs = { @@ -57,9 +55,6 @@ flakes = self; }; modules = [ - { - nixpkgs.overlays = overlays; - } ./hosts ./hosts/${hostname} home-manager.nixosModules.home-manager @@ -79,13 +74,13 @@ in { nixosConfigurations = { - fantomitechno-laptop = commonSystem "laptop" [ nix4vscode.overlays.default ]; - fantomitechno-desktop = commonSystem "desktop" [ nix4vscode.overlays.default ]; - fantomitechno-msi = commonSystem "msi" [ ]; + fantomitechno-laptop = commonSystem "laptop"; + fantomitechno-desktop = commonSystem "desktop"; + fantomitechno-msi = commonSystem "msi"; # Servers - conseil = commonSystem "conseil" [ copyparty.overlays.default ]; - fant0mib0t = commonSystem "fant0mib0t" [ ]; + conseil = commonSystem "conseil"; + fant0mib0t = commonSystem "fant0mib0t"; # Installer # nix build --no-link --print-out-paths ".#installer" diff --git a/hosts/computer.nix b/hosts/computer.nix index c9bb2ab..38ac37b 100644 --- a/hosts/computer.nix +++ b/hosts/computer.nix @@ -1,4 +1,9 @@ -{ pkgs, hostname, ... }: +{ + pkgs, + hostname, + flakes, + ... +}: { imports = builtins.map (i: ../modules/${i}) ([ @@ -51,5 +56,6 @@ "electron-39.8.10" ]; }; + overlays = [ flakes.inputs.nix4vscode.overlays.default ]; }; } diff --git a/hosts/conseil/default.nix b/hosts/conseil/default.nix index 7159514..7d63834 100644 --- a/hosts/conseil/default.nix +++ b/hosts/conseil/default.nix @@ -1,6 +1,7 @@ { pkgs, dotfileFolder, + flakes, ... }: @@ -85,5 +86,9 @@ }; }; + nixpkgs = { + overlays = [ flakes.inputs.copyparty.overlays.default ]; + }; + system.stateVersion = "26.05"; }