From bccc0a57c349839a089a33cb3dcf61a94a4e5c82 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 8 Sep 2025 15:45:01 +0200 Subject: [PATCH] feat(x1): add nixos-hardware.nixosModules.lenovo-thinkpad-x1-11th-gen --- flake.lock | 41 +++++++++++++------ flake.nix | 2 + .../x1/hardware-configuration.nix | 8 +++- 3 files changed, 38 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 0bb1e22..08f582b 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1753539450, - "narHash": "sha256-JtFQDEnieVtxzfcCo7/TjseMdmhokKkwNKPm525RHBA=", + "lastModified": 1756649772, + "narHash": "sha256-YesaX4RhgNmB0tNBNMgHnW/CV+7o1jrHcpH60Z9KMgg=", "owner": "k3d3", "repo": "claude-desktop-linux-flake", - "rev": "276188d7200d2840d75729524b4950eadcfcdd7d", + "rev": "bbf9abf395d0ec607a55dd9ddef1efee57883827", "type": "github" }, "original": { @@ -370,11 +370,11 @@ ] }, "locked": { - "lastModified": 1753592768, - "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", + "lastModified": 1756679287, + "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc3add429f21450359369af74c2375cb34a2d204", + "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", "type": "github" }, "original": { @@ -519,6 +519,22 @@ "type": "github" } }, + "nixos-hardware": { + "locked": { + "lastModified": 1757103352, + "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "11b2a10c7be726321bb854403fdeec391e798bf0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1736320768, @@ -569,11 +585,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1754937576, - "narHash": "sha256-3sWA5WJybUE16kIMZ3+uxcxKZY/JRR4DFBqLdSLBo7w=", + "lastModified": 1757244434, + "narHash": "sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ddae11e58c0c345bf66efbddbf2192ed0e58f896", + "rev": "092c565d333be1e17b4779ac22104338941d913f", "type": "github" }, "original": { @@ -624,6 +640,7 @@ "lanzaboote": "lanzaboote", "neovim-flake": "neovim-flake", "nix-homebrew": "nix-homebrew", + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay_2", "simple-nixos-mailserver": "simple-nixos-mailserver", @@ -784,11 +801,11 @@ }, "unstable": { "locked": { - "lastModified": 1755027561, - "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", + "lastModified": 1757068644, + "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", + "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8aad04d..28eb7ef 100644 --- a/flake.nix +++ b/flake.nix @@ -65,6 +65,8 @@ claude.url = "github:k3d3/claude-desktop-linux-flake"; claude.inputs.nixpkgs.follows = "nixpkgs"; + + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; }; outputs = diff --git a/systems/x86_64-linux/x1/hardware-configuration.nix b/systems/x86_64-linux/x1/hardware-configuration.nix index 3325841..3f621a5 100644 --- a/systems/x86_64-linux/x1/hardware-configuration.nix +++ b/systems/x86_64-linux/x1/hardware-configuration.nix @@ -5,11 +5,17 @@ , lib , pkgs , modulesPath +, inputs , ... }: { - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + imports = [ + inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-11th-gen + ]; + + hardware.enableRedistributableFirmware = lib.mkDefault true; + boot = { initrd.availableKernelModules = [ "thunderbolt"