diff --git a/flake.lock b/flake.lock index a99d747..e320826 100644 --- a/flake.lock +++ b/flake.lock @@ -155,22 +155,6 @@ "type": "github" } }, - "nixos-hardware-2311": { - "locked": { - "lastModified": 1718349360, - "narHash": "sha256-SuPne4BMqh9/IkKIAG47Cu5qfmntAaqlHdX1yuFoDO0=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "ae5c8dcc4d0182d07d75df2dc97112de822cb9d6", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "ae5c8dcc4d0182d07d75df2dc97112de822cb9d6", - "type": "github" - } - }, "nixos-nspawn": { "flake": false, "locked": { @@ -389,7 +373,6 @@ "nix-index-database": "nix-index-database", "nixos-generators-2311": "nixos-generators-2311", "nixos-hardware": "nixos-hardware", - "nixos-hardware-2311": "nixos-hardware-2311", "nixos-nspawn": "nixos-nspawn", "nixpkgs-1909": "nixpkgs-1909", "nixpkgs-2003": "nixpkgs-2003", diff --git a/flake.nix b/flake.nix index 5928b17..eb0b28b 100644 --- a/flake.nix +++ b/flake.nix @@ -33,7 +33,6 @@ # https://github.com/NixOS/nixos-hardware nixos-hardware.url = "github:NixOS/nixos-hardware"; - nixos-hardware-2311.url = "github:NixOS/nixos-hardware/ae5c8dcc4d0182d07d75df2dc97112de822cb9d6"; # pre https://github.com/NixOS/nixos-hardware/pull/977 # https://github.com/tfc/nspawn-nixos nixos-nspawn.url = "github:tfc/nspawn-nixos"; @@ -102,7 +101,6 @@ outputs = { self, nixos-hardware, - nixos-hardware-2311, nixos-nspawn, nixos-generators-2311, ... @@ -261,7 +259,6 @@ mkHosts = mk: let ls = imports: { inherit imports; }; hw = nixos-hardware.nixosModules; - hw_ = nixos-hardware-2311.nixosModules; #vf = nixos-vf2.nixosModules; amd = ls [ hw.common-pc hw.common-pc-ssd hw.common-cpu-amd ]; intel = ls [ hw.common-pc hw.common-pc-ssd hw.common-cpu-intel ./hardware/gpu/intel.nix ]; @@ -269,7 +266,6 @@ cuda = ls [ ./hardware/gpu/cuda.nix hw.common-gpu-nvidia-nonprime ]; cuda-prime = ls [ ./hardware/gpu/cuda.nix hw.common-gpu-nvidia ]; rocm = ls [ ./hardware/gpu/rocm.nix hw.common-gpu-amd ]; - rocm_ = ls [ ./hardware/gpu/rocm.nix hw_.common-gpu-amd ]; nspawn = ls [ "${nixos-nspawn}/nspawn-image.nix" { boot.isContainer = true; } ]; hidpi = hw.common-hidpi; p1005 = ./hardware/printer/hp-laserjet-p1005.nix;