From 5734fa6a8a3278e846d5c42f8a3675de95f62192 Mon Sep 17 00:00:00 2001 From: vorboyvo Date: Tue, 29 Apr 2025 12:00:58 -0400 Subject: [PATCH] Updated flake and also changed function to be worse. --- flake.lock | 29 +++++++++++++++++++++++------ flake.nix | 32 ++++++++++++++++++++++---------- 2 files changed, 45 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 5846594..361f530 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ ] }, "locked": { - "lastModified": 1743717835, - "narHash": "sha256-LJm6FoIcUoBw3w25ty12/sBfut4zZuNGdN0phYj/ekU=", + "lastModified": 1744637364, + "narHash": "sha256-ZVINTNMJS6W3fqPYV549DSmjYQW5I9ceKBl83FwPP7k=", "owner": "nix-community", "repo": "home-manager", - "rev": "66a6ec65f84255b3defb67ff45af86c844dd451b", + "rev": "337541447773985f825512afd0f9821a975186be", "type": "github" }, "original": { @@ -88,13 +88,29 @@ "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz" } }, + "nixos-hardware": { + "locked": { + "lastModified": 1744633460, + "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -107,6 +123,7 @@ "inputs": { "home-manager": "home-manager", "lix-module": "lix-module", + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs" } }, diff --git a/flake.nix b/flake.nix index bb168f8..f612dcc 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + }; outputs = { @@ -20,6 +22,7 @@ nixpkgs, lix-module, home-manager, + nixos-hardware, }: let system = "x86_64-linux"; @@ -27,23 +30,32 @@ { nixosConfigurations = let - hostnameToConfig = hostname: { + dumbassFunction = { hostname, modules }: + let + defaultModules = [ + ./hosts/${hostname}/configuration.nix + home-manager.nixosModules.home-manager + lix-module.nixosModules.default + ]; + in + { name = hostname; value = nixpkgs.lib.nixosSystem { inherit system; - modules = [ - ./hosts/${hostname}/configuration.nix - home-manager.nixosModules.home-manager - lix-module.nixosModules.default - # nur.nixosModules.nur - ]; + modules = defaultModules ++ modules; }; }; in builtins.listToAttrs ( - builtins.map hostnameToConfig [ - "randolph" - "de-lacadie" + builtins.map dumbassFunction [ + { + hostname = "randolph"; + modules = [ nixos-hardware.nixosModules.framework-13-7040-amd ]; + } + { + hostname = "de-lacadie"; + modules = []; + } ] ); };