diff --git a/flake.lock b/flake.lock index b356804..263a3f7 100644 --- a/flake.lock +++ b/flake.lock @@ -31,7 +31,6 @@ }, "original": { "owner": "nixos", - "ref": "master", "repo": "nixos-hardware", "type": "github" } @@ -54,11 +53,11 @@ }, "nur": { "locked": { - "lastModified": 1704199801, - "narHash": "sha256-sg+RrgeW6sTn8x4XKLtz9Yxczq1gbHMf3O3OWTY6HNI=", + "lastModified": 1704210337, + "narHash": "sha256-rRLL+IAanCm/aL55YgSNZvSHbC7oZLJe0lDtRVL6HiQ=", "owner": "nix-community", "repo": "nur", - "rev": "6a4c627e8b6504f328d60a0cb1f373f6f6e3f40e", + "rev": "5aaff8bf9354976e682c034b184a3298c8c30f3e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 77a5c2a..72e8cbd 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,4 @@ { - description = "Nix flake for my system configuration with nix and home-manager"; - inputs = { nixpkgs = { url = "github:nixos/nixpkgs/nixos-unstable"; @@ -12,7 +10,7 @@ }; nixos-hardware = { - url = "github:nixos/nixos-hardware/master"; + url = "github:nixos/nixos-hardware"; }; nur = { @@ -21,18 +19,12 @@ }; outputs = { nixpkgs, home-manager, nixos-hardware, nur, ... }: - let - x86 = "x86_64-linux"; - common = ./modules/system; - in { + { nixosConfigurations = { desktop = nixpkgs.lib.nixosSystem { - specialArgs = { - inherit x86; - }; - + system = "x86_64-linux"; modules = [ - common + ./modules/system ./devices/desktop home-manager.nixosModules.home-manager { @@ -49,12 +41,9 @@ }; surface = nixpkgs.lib.nixosSystem { - specialArgs = { - inherit x86; - }; - + system = "x86_64-linux"; modules = [ - common + ./modules/system ./devices/surface nixos-hardware.nixosModules.microsoft-surface-pro-intel