From 962c0df2b215b0bfd76e8edc251c00f0016cdcc8 Mon Sep 17 00:00:00 2001
From: panotaka <panotaka@additionalpenguin.com>
Date: Mon, 1 Jan 2024 01:18:26 -0400
Subject: [PATCH] Update dependencies and module imports

---
 flake.lock                  | 11 +++++------
 flake.nix                   | 26 ++++++++++++++------------
 hosts/Blackbird/default.nix |  7 +++----
 hosts/Equinox/default.nix   |  7 ++++---
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/flake.lock b/flake.lock
index 046cbbc..a2718c5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -342,17 +342,16 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1704073740,
-        "narHash": "sha256-IcZeuP6heys+vsbiOP7DJwizrPbC7ZM4fU3nFkM4ubw=",
+        "lastModified": 1704081953,
+        "narHash": "sha256-wyvYfkdja/iblX3KgN7BhESWTmg6nA18dVUdMazXw6M=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "f570501d5051709bb88d85401e38f80ec66bebc0",
+        "rev": "ad3024a9a3c60c6cae8e745e3102ce21c2d3c1c1",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
-        "repo": "NUR",
-        "type": "github"
+        "id": "nur",
+        "type": "indirect"
       }
     },
     "root": {
diff --git a/flake.nix b/flake.nix
index 199269d..b9f5741 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,18 +2,23 @@
   description = "NixOS configuration of Thomas Syms";
   nixConfig = {experimental-features = ["nix-command" "flakes"];};
   inputs = {
-    # System
+    # Nixpkgs
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixos-hardware.url = "github:NixOS/nixos-hardware";
-    disko.url = "github:nix-community/disko";
-    disko.inputs.nixpkgs.follows = "nixpkgs";
 
-    # NUR
-    nur.url = "github:nix-community/NUR";
+    # NixOS-Hardware
+    nixos-hardware.url = "github:NixOS/nixos-hardware";
+
+    # Disko
+    disko = {
+      url = "github:nix-community/disko";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # Home Manager
-    home-manager.url = "github:nix-community/home-manager";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     #VSCode Extensions
     nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions";
@@ -79,13 +84,10 @@
 
         # Modules
         modules = [
-          # NUR Module
-          nur.nixosModules.nur
-
           # Theme Modules
           stylix.nixosModules.stylix
           ./themes/targets/all.nix
-          ./themes/spaceduck
+          ./themes/tokyonight
 
           # Host Module
           ./hosts/Blackbird
diff --git a/hosts/Blackbird/default.nix b/hosts/Blackbird/default.nix
index 12c3b96..3079b3c 100644
--- a/hosts/Blackbird/default.nix
+++ b/hosts/Blackbird/default.nix
@@ -1,8 +1,7 @@
 {
   lib,
   pkgs,
-  nixos-hardware,
-  disko,
+  inputs,
   ...
 }: let
   hostname = "Blackbird";
@@ -12,8 +11,8 @@ in {
 
   imports = [
     # Import hardware configuration
-    nixos-hardware.nixosModules.gpd-pocket-3
-    disko.nixosModules.disko
+    inputs.nixos-hardware.nixosModules.gpd-pocket-3
+    inputs.disko.nixosModules.disko
     ./disko.nix
 
     # Import system configuration
diff --git a/hosts/Equinox/default.nix b/hosts/Equinox/default.nix
index 14a38d6..b072884 100644
--- a/hosts/Equinox/default.nix
+++ b/hosts/Equinox/default.nix
@@ -2,6 +2,7 @@
   lib,
   nixos-hardware,
   disko,
+  inputs,
   ...
 }: let
   hostname = "Equinox";
@@ -11,9 +12,9 @@ in {
 
   imports = [
     # Import hardware configuration
-    nixos-hardware.nixosModules.dell-xps-15-9510
-    nixos-hardware.nixosModules.dell-xps-15-9510-nvidia
-    disko.nixosModules.disko
+    inputs.nixos-hardware.nixosModules.dell-xps-15-9510
+    inputs.nixos-hardware.nixosModules.dell-xps-15-9510-nvidia
+    inputs.disko.nixosModules.disko
     ./disko.nix
 
     # Import system configuration