From 5dadf60db858ce8e39c1932e9ca5012f37e94791 Mon Sep 17 00:00:00 2001
From: roxwize <rae@roxwize.xyz>
Date: Wed, 1 Jan 2025 15:52:39 -0500
Subject: [PATCH] ~

---
 nixos/flake.lock           | 17 +++++++++++++++++
 nixos/flake.nix            |  4 +---
 nixos/hosts/base.nix       | 15 +++++++++++++--
 nixos/overlays/default.nix |  7 -------
 nixos/packages.nix         |  3 ++-
 5 files changed, 33 insertions(+), 13 deletions(-)
 delete mode 100644 nixos/overlays/default.nix

diff --git a/nixos/flake.lock b/nixos/flake.lock
index baa2476..a4df30f 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -79,6 +79,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1735471104,
+        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nur": {
       "inputs": {
         "flake-parts": "flake-parts",
@@ -106,6 +122,7 @@
         "fenix": "fenix",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur"
       }
     },
diff --git a/nixos/flake.nix b/nixos/flake.nix
index 7c0319f..8d0830d 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -3,6 +3,7 @@
 
     inputs = {
         nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+        nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
         home-manager = {
             url = "github:nix-community/home-manager/release-24.11";
             inputs.nixpkgs.follows = "nixpkgs";
@@ -26,7 +27,6 @@
                 specialArgs = { inherit inputs; };
                 modules = [
                     ./hosts/ioides/configuration.nix
-                    (import ./overlays)
                 ];
             };
 
@@ -35,7 +35,6 @@
                 specialArgs = { inherit inputs; };
                 modules = [
                     ./hosts/qemu/configuration.nix
-                    (import ./overlays)
                 ];
             };
         };
@@ -45,7 +44,6 @@
             extraSpecialArgs = { inherit inputs; };
             modules = [
                 ./home
-                (import ./overlays)
             ];
         };
     };
diff --git a/nixos/hosts/base.nix b/nixos/hosts/base.nix
index 3763d4e..0a1f5ce 100644
--- a/nixos/hosts/base.nix
+++ b/nixos/hosts/base.nix
@@ -1,11 +1,22 @@
-{ pkgs, ... }:
+{ pkgs, nixpkgs-unstable, ... }:
 {
     imports = [
         ../packages.nix
     ];
 
     nix.settings.experimental-features = ["nix-command" "flakes"];
-    nixpkgs.config.allowUnfree = true;
+    nixpkgs = {
+        config.allowUnfree = true;
+        overlays = [
+            inputs.nur.overlays.default
+            inputs.fenix.overlays.default
+            (final: prev: {
+                unstable = import nixpkgs-unstable {
+                    system = prev.system;
+                };
+            })
+        ];
+    };
 
     networking.networkmanager.enable = true;
 
diff --git a/nixos/overlays/default.nix b/nixos/overlays/default.nix
deleted file mode 100644
index 8d2c8ff..0000000
--- a/nixos/overlays/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ inputs, ... }:
-{
-    nixpkgs.overlays = [
-        inputs.nur.overlays.default
-        inputs.fenix.overlays.default
-    ];
-}
diff --git a/nixos/packages.nix b/nixos/packages.nix
index 6c43cae..6484637 100644
--- a/nixos/packages.nix
+++ b/nixos/packages.nix
@@ -56,7 +56,7 @@
         # music
         mpc
         playerctl
-        rmpc
+        unstable.rmpc
         # X11
         hsetroot
         nitrogen
@@ -69,6 +69,7 @@
         yambar
         # misc
         catppuccin-sddm
+        nmap
         steam-run
         uxn
     ];