From 6dc3f1c6f18822a57bbdb3c47781b9df02b0d63e Mon Sep 17 00:00:00 2001 From: Christian Ott Date: Thu, 18 Apr 2024 19:41:10 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9E=95=20Use=20framework13=20configuration?= =?UTF-8?q?=20until=20an=20official=20fw16=20config=20is=20there?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 17 +++++++++++++++++ flake.nix | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 84b7b6f..c79b81c 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,22 @@ "type": "github" } }, + "nixos-hardware": { + "locked": { + "lastModified": 1712909959, + "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1713145326, @@ -56,6 +72,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable" } diff --git a/flake.nix b/flake.nix index 332e433..78d181a 100644 --- a/flake.nix +++ b/flake.nix @@ -4,13 +4,14 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { url = github:nix-community/home-manager/release-23.11; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }@inputs: + outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, ... }@inputs: let username = "chrigi"; lib = nixpkgs.lib; @@ -25,6 +26,7 @@ nixosConfigurations.nix-fw16 = lib.nixosSystem { modules = [ ./configuration.nix + nixos-hardware.nixosModules.framework-13-7040-amd home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true;