From 83b9d86806bc63790707b8e99f45995d2162087d Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Wed, 5 Jun 2024 22:15:32 -0400 Subject: [PATCH] Add nixos-hardware repo, import on rainbow-planet --- flake.lock | 29 +++++++++++++++++++++++------ flake.nix | 8 ++++++-- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 419543a..aa6db1e 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1717490821, - "narHash": "sha256-CivVhYExnMJ2afm+o1ogB231pKW/azhUghMI53MHmOM=", + "lastModified": 1717637172, + "narHash": "sha256-geTO9YL1V9zYGxupuZvKFWxh6II9sH2bjI1dmEVhVYQ=", "owner": "nix-community", "repo": "disko", - "rev": "a838e83e21502a211b83373109a260e5ef5fbcf1", + "rev": "713aa3df481782719aed4d8c20ad31a9effe3564", "type": "github" }, "original": { @@ -221,6 +221,22 @@ "type": "github" } }, + "nixos-hardware": { + "locked": { + "lastModified": 1717574423, + "narHash": "sha256-cz3P5MZffAHwL2IQaNzsqUBsJS+u0J/AAwArHMAcCa0=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "d6c6cf6f5fead4057d8fb2d5f30aa8ac1727f177", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1687274257, @@ -296,11 +312,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1717399147, - "narHash": "sha256-eCWaE/q1VItpFAxxLVt171MdtDcjEnwi6QB/yuF73JU=", + "lastModified": 1717459389, + "narHash": "sha256-I8/plBsua4/NZ5bKgj+z7/ThiWuud1YFwLsn1QQ5PgE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4a4ecb0ab415c9fccfb005567a215e6a9564cdf5", + "rev": "3b01abcc24846ae49957b30f4345bab4b3f1d14b", "type": "github" }, "original": { @@ -351,6 +367,7 @@ "nix-darwin": "nix-darwin", "nix-flatpak": "nix-flatpak", "nix-homebrew": "nix-homebrew", + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", "nixpkgs-terraform": "nixpkgs-terraform", "nixpkgs-unstable": "nixpkgs-unstable", diff --git a/flake.nix b/flake.nix index 8fccef3..cd0ec22 100644 --- a/flake.nix +++ b/flake.nix @@ -41,6 +41,8 @@ # Manage Homebrew itself nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew"; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + nixpkgs-terraform = { url = "github:stackbuilders/nixpkgs-terraform"; inputs.nixpkgs.follows = "nixpkgs"; @@ -56,7 +58,7 @@ }; # end inputs outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, compose2nix, disko, genebean-omp-themes, - home-manager, nix-darwin, nix-flatpak, nix-homebrew, nixpkgs-terraform, sops-nix, ... }: let + home-manager, nix-darwin, nix-flatpak, nix-homebrew, nixos-hardware, nixpkgs-terraform, sops-nix, ... }: let # creates a macOS system config darwinHostConfig = { system, hostname, username, additionaModules, additionaSpecialArgs }: nix-darwin.lib.darwinSystem { @@ -198,7 +200,9 @@ system = "x86_64-linux"; hostname = "rainbow-planet"; username = "gene"; - additionaModules = []; + additionaModules = [ + nixos-hardware.nixosModules.dell-xps-13-9360 + ]; additionaSpecialArgs = {}; }; }; # end nixosConfigurations