From 07b5c7fcf949a29d4af6f71b22c7a69271747a10 Mon Sep 17 00:00:00 2001 From: panotaka Date: Sun, 31 Dec 2023 23:44:15 -0400 Subject: [PATCH] Add NUR repository and modules --- flake.lock | 16 ++++++++++++++++ flake.nix | 10 ++++++++++ hosts/Blackbird/default.nix | 7 ++++--- hosts/Equinox/default.nix | 9 +++++---- 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 7da7408..046cbbc 100644 --- a/flake.lock +++ b/flake.lock @@ -340,6 +340,21 @@ "type": "github" } }, + "nur": { + "locked": { + "lastModified": 1704073740, + "narHash": "sha256-IcZeuP6heys+vsbiOP7DJwizrPbC7ZM4fU3nFkM4ubw=", + "owner": "nix-community", + "repo": "NUR", + "rev": "f570501d5051709bb88d85401e38f80ec66bebc0", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "root": { "inputs": { "disko": "disko", @@ -347,6 +362,7 @@ "nix-vscode-extensions": "nix-vscode-extensions", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", + "nur": "nur", "stylix": "stylix" } }, diff --git a/flake.nix b/flake.nix index acf1d91..199269d 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,9 @@ disko.url = "github:nix-community/disko"; disko.inputs.nixpkgs.follows = "nixpkgs"; + # NUR + nur.url = "github:nix-community/NUR"; + # Home Manager home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; @@ -20,6 +23,7 @@ }; outputs = inputs @ { nixpkgs, + nur, stylix, home-manager, ... @@ -38,6 +42,9 @@ # Modules modules = [ + # NUR Module + nur.nixosModules.nur + # Theme Modules stylix.nixosModules.stylix ./themes/targets/all.nix @@ -72,6 +79,9 @@ # Modules modules = [ + # NUR Module + nur.nixosModules.nur + # Theme Modules stylix.nixosModules.stylix ./themes/targets/all.nix diff --git a/hosts/Blackbird/default.nix b/hosts/Blackbird/default.nix index ff1af84..12c3b96 100644 --- a/hosts/Blackbird/default.nix +++ b/hosts/Blackbird/default.nix @@ -1,7 +1,8 @@ { - inputs, lib, pkgs, + nixos-hardware, + disko, ... }: let hostname = "Blackbird"; @@ -11,8 +12,8 @@ in { imports = [ # Import hardware configuration - inputs.nixos-hardware.nixosModules.gpd-pocket-3 - inputs.disko.nixosModules.disko + nixos-hardware.nixosModules.gpd-pocket-3 + disko.nixosModules.disko ./disko.nix # Import system configuration diff --git a/hosts/Equinox/default.nix b/hosts/Equinox/default.nix index 6be065c..14a38d6 100644 --- a/hosts/Equinox/default.nix +++ b/hosts/Equinox/default.nix @@ -1,6 +1,7 @@ { - inputs, lib, + nixos-hardware, + disko, ... }: let hostname = "Equinox"; @@ -10,9 +11,9 @@ in { imports = [ # Import hardware configuration - inputs.nixos-hardware.nixosModules.dell-xps-15-9510 - inputs.nixos-hardware.nixosModules.dell-xps-15-9510-nvidia - inputs.disko.nixosModules.disko + nixos-hardware.nixosModules.dell-xps-15-9510 + nixos-hardware.nixosModules.dell-xps-15-9510-nvidia + disko.nixosModules.disko ./disko.nix # Import system configuration