From 21ea5fc6b692146d8a91244a8ba84b05b9052587 Mon Sep 17 00:00:00 2001
From: roxwize <rae@roxwize.xyz>
Date: Wed, 18 Dec 2024 16:38:29 -0500
Subject: [PATCH] ~

---
 nixos/base.nix                     | 2 +-
 nixos/flake.lock                   | 6 +++---
 nixos/flake.nix                    | 6 +++++-
 nixos/home.nix                     | 5 +----
 nixos/hosts/qemu/configuration.nix | 2 +-
 nixos/overlays/default.nix         | 6 ++++++
 6 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 nixos/overlays/default.nix

diff --git a/nixos/base.nix b/nixos/base.nix
index ff2fc80..5cfbf43 100644
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, inputs, ... }:
+{ pkgs, ... }:
 {
     imports = [
         ./packages.nix
diff --git a/nixos/flake.lock b/nixos/flake.lock
index 335ff58..6803205 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -67,11 +67,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1734497444,
-        "narHash": "sha256-BQbZ6BpPnPUNYB7+l6GziNU3YmmnU0jg09TzsIB4k18=",
+        "lastModified": 1734554871,
+        "narHash": "sha256-adKmMR20KSMrSQLAq3HbI1Y8DpgB2Fs4Nyiq9OpI/E4=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "b8b3fcbd00fbd6857acc41928c8246bad83dc7bd",
+        "rev": "52adbe40112836626fb9ed51e14d217e8b2f81c1",
         "type": "github"
       },
       "original": {
diff --git a/nixos/flake.nix b/nixos/flake.nix
index a1bcc0b..02fd434 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -20,6 +20,7 @@
                 specialArgs = { inherit inputs; };
                 modules = [
                     ./hosts/qemu/configuration.nix
+                    (import ./overlays)
                 ];
             };
         };
@@ -27,7 +28,10 @@
         homeConfigurations.rae = home-manager.lib.homeManagerConfiguration {
             pkgs = nixpkgs.legacyPackages.x86_64-linux;
             extraSpecialArgs = { inherit inputs; };
-            modules = [ ./home.nix ];
+            modules = [
+                ./home.nix
+                (import ./overlays)
+            ];
         };
     };
 }
diff --git a/nixos/home.nix b/nixos/home.nix
index 64b2be3..082ebee 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -1,8 +1,5 @@
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 {
-    # FIXME is this the correct way to manage this??
-    nixpkgs.overlays = [ inputs.nur.overlays.default ];
-
     home = {
         stateVersion = "24.11";
         username = "rae";
diff --git a/nixos/hosts/qemu/configuration.nix b/nixos/hosts/qemu/configuration.nix
index b35055f..a1043f6 100644
--- a/nixos/hosts/qemu/configuration.nix
+++ b/nixos/hosts/qemu/configuration.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ ... }:
 {
     imports = [
         ./hardware-configuration.nix
diff --git a/nixos/overlays/default.nix b/nixos/overlays/default.nix
new file mode 100644
index 0000000..5bd8b14
--- /dev/null
+++ b/nixos/overlays/default.nix
@@ -0,0 +1,6 @@
+{ inputs, ... }:
+{
+    nixpkgs.overlays = [
+        inputs.nur.overlays.default
+    ];
+}