diff --git a/flake.lock b/flake.lock index b978a1f..de64b41 100644 --- a/flake.lock +++ b/flake.lock @@ -81,6 +81,26 @@ "type": "github" } }, + "nixos-hardware": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1785232496, + "narHash": "sha256-65EQYIRRpTdpH8lUiB6Mvo5uBkG60aBIzAJuALfx+O0=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "2e790b0a6be8ec2b76174ac0931b8ff11919ec98", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixos-hardware", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1785734586, @@ -154,6 +174,7 @@ "disko": "disko", "flake-parts": "flake-parts", "home-manager": "home-manager", + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixvim": "nixvim", "sops-nix": "sops-nix" diff --git a/flake.nix b/flake.nix index c6ce9ad..323dbb4 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,11 @@ flake-parts.url = "github:hercules-ci/flake-parts"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; + nixos-hardware = { + url = "github:NixOS/nixos-hardware"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixvim.url = "github:nix-community/nixvim/nixos-26.05"; disko = { @@ -34,11 +39,11 @@ perSystem = { - config, - self', - inputs', - pkgs, - system, + # config, + # self', + # inputs', + # pkgs, + # system, ... }: { @@ -47,7 +52,7 @@ # system. # Equivalent to inputs'.nixpkgs.legacyPackages.hello; - packages.default = pkgs.hello; + # packages.default = pkgs.hello; }; flake = { diff --git a/hosts/dell-xps9360-nixos-btw/default.nix b/hosts/dell-xps9360-nixos-btw/default.nix index bb0a5f2..ee65393 100644 --- a/hosts/dell-xps9360-nixos-btw/default.nix +++ b/hosts/dell-xps9360-nixos-btw/default.nix @@ -1,8 +1,9 @@ -{ ... }: +{ inputs, ... }: { imports = [ ./hardware-configuration.nix ../common/users/rtucek.nix + inputs.nixos-hardware.nixosModules.dell-xps-13-9360 ]; networking.hostName = "dell-xps9360-nixos-btw"; diff --git a/hosts/tux-ibp-amdgen9-nixos-btw/default.nix b/hosts/tux-ibp-amdgen9-nixos-btw/default.nix index be35ed9..54c710a 100644 --- a/hosts/tux-ibp-amdgen9-nixos-btw/default.nix +++ b/hosts/tux-ibp-amdgen9-nixos-btw/default.nix @@ -1,8 +1,9 @@ -{ ... }: +{ inputs, ... }: { imports = [ ./hardware-configuration.nix ../common/users/rtucek.nix + inputs.nixos-hardware.nixosModules.tuxedo-infinitybook-pro14-gen9-amd ]; networking.hostName = "tux-ibp-amdgen9-nixos-btw";