diff --git a/flake.nix b/flake.nix index 4d81bf1..a1697c1 100644 --- a/flake.nix +++ b/flake.nix @@ -85,11 +85,6 @@ self, systems, nixpkgs, - homeManager, - NixOS-WSL, - NixOS-WSL-2405, - nixpkgs-24-05, - homeManager-24-05, cmp-vimtex, spaceport-nvim, nomodoro, @@ -113,15 +108,7 @@ { nixosConfigurations = ( import ./hosts/hosts.nix { - inherit nixpkgs; - inherit homeManager; inherit inputs; - inherit (nixpkgs) lib; - inherit NixOS-WSL; - inherit NixOS-WSL-2405; - inherit nixpkgs-24-05; - inherit homeManager-24-05; - inherit cmp-vimtex; inherit customPackageOverlay; } ); diff --git a/hosts/hosts.nix b/hosts/hosts.nix index 719f6aa..f6a0367 100644 --- a/hosts/hosts.nix +++ b/hosts/hosts.nix @@ -1,15 +1,11 @@ { - lib, inputs, - nixpkgs-24-05, - homeManager, - homeManager-24-05, - NixOS-WSL-2405, customPackageOverlay, - ... +# ... }: let linuxSystem = "x86_64-linux"; + lib = inputs.nixpkgs.lib; nixpkgs-unstable = import inputs.nixpkgs { system = linuxSystem; config.allowUnfreePredicate = @@ -20,7 +16,7 @@ let }; in { - "maxos" = lib.nixosSystem { + "maxos" = inputs.nixpkgs-24-11.lib.nixosSystem { system = linuxSystem; specialArgs = { inherit customPackageOverlay; @@ -30,7 +26,7 @@ in modules = [ ./maxos/configuration.nix inputs.sops-nix.nixosModules.sops - homeManager.nixosModules.home-manager + inputs.homeManager-24-11.nixosModules.home-manager { home-manager.extraSpecialArgs = { withGUI = true; @@ -82,40 +78,6 @@ in inputs.NixOS-WSL-2411.nixosModules.wsl ]; }; - "nixosWSL" = nixpkgs-24-05.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { - inherit customPackageOverlay; - inherit nixpkgs-unstable; - hostname = "nixosWSL"; - stateVersion = "22.05"; - withDocker = false; - }; - modules = [ - ./commonWSL-configuration.nix - inputs.sops-nix.nixosModules.sops - homeManager-24-05.nixosModules.home-manager - { - home-manager.extraSpecialArgs = { - withGUI = false; - gitSigningKey = "8F904A3FC7021497"; - inherit nixpkgs-unstable; - }; - home-manager.useGlobalPkgs = true; - home-manager.users.deepak = { - imports = [ - ../home/deepak/home.nix - ]; - }; - home-manager.sharedModules = [ - inputs.sops-nix.homeManagerModules.sops - ]; - - } - - NixOS-WSL-2405.nixosModules.wsl - ]; - }; "nixosEggYoke" = inputs.nixpkgs-24-11.lib.nixosSystem { system = "x86_64-linux"; specialArgs = {