From 1078872191ecb17d125295fbac5ed82450872a0e Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Sat, 10 Aug 2024 11:49:27 -0400
Subject: [PATCH] flake: update nixos-unstable; hosts: overly zed and rbw from
 unstable

---
 flake.lock               |  6 +++---
 homes/aly/default.nix    | 14 ++++----------
 homes/dustin/default.nix |  1 -
 hosts/common/nix.nix     | 28 +++++++++-------------------
 4 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/flake.lock b/flake.lock
index f87dc451..1310bf66 100644
--- a/flake.lock
+++ b/flake.lock
@@ -166,11 +166,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1722630782,
-        "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=",
+        "lastModified": 1723175592,
+        "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d04953086551086b44b6f3c6b7eeb26294f207da",
+        "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
         "type": "github"
       },
       "original": {
diff --git a/homes/aly/default.nix b/homes/aly/default.nix
index 91239a0d..95fb8edf 100644
--- a/homes/aly/default.nix
+++ b/homes/aly/default.nix
@@ -67,7 +67,6 @@ in {
 
     rbw = {
       enable = true;
-      package = pkgs.rbw;
 
       settings = {
         email = "alyraffauf@fastmail.com";
@@ -100,16 +99,11 @@ in {
 
       zed = {
         enable = true;
-        package = unstable.zed-editor;
 
-        settings = {
-          auto_install_extensions = {nord = true;};
-
-          theme = {
-            dark = "Rosé Pine Moon";
-            light = "Rosé Pine Dawn";
-            mode = "system";
-          };
+        settings.theme = {
+          dark = "Rosé Pine Moon";
+          light = "Rosé Pine Dawn";
+          mode = "system";
         };
       };
     };
diff --git a/homes/dustin/default.nix b/homes/dustin/default.nix
index 315078eb..a09e9a12 100644
--- a/homes/dustin/default.nix
+++ b/homes/dustin/default.nix
@@ -28,7 +28,6 @@ self: {
 
     rbw = {
       enable = true;
-      package = pkgs.rbw;
 
       settings = {
         email = "dustinmraffauf@gmail.com";
diff --git a/hosts/common/nix.nix b/hosts/common/nix.nix
index 8c75522e..6aaaf0e1 100644
--- a/hosts/common/nix.nix
+++ b/hosts/common/nix.nix
@@ -2,8 +2,13 @@
   config,
   lib,
   pkgs,
+  self,
   ...
-}: {
+}: let
+  unstable = import self.inputs.nixpkgs-unstable {
+    system = pkgs.system;
+  };
+in {
   environment.variables.FLAKE = lib.mkDefault "github:alyraffauf/nixcfg";
 
   nix.settings = {
@@ -26,24 +31,7 @@
 
     overlays = [
       (final: prev: {
-        rbw = prev.rbw.override (super: {
-          rustPlatform =
-            super.rustPlatform
-            // {
-              buildRustPackage = args:
-                super.rustPlatform.buildRustPackage (args
-                  // {
-                    version = "1.12.1";
-                    src = pkgs.fetchFromGitHub {
-                      owner = "doy";
-                      repo = "rbw";
-                      rev = "1.12.1";
-                      hash = "sha256-+1kalFyhk2UL+iVzuFLDsSSTudrd4QpXw+3O4J+KsLc=";
-                    };
-                    cargoHash = "sha256-cKbbsDb449WANGT+x8APhzs+hf5SR3RBsCBWDNceRMA=";
-                  });
-            };
-        });
+        rbw = unstable.rbw;
 
         rofi-bluetooth =
           prev.rofi-bluetooth.overrideAttrs
@@ -57,6 +45,8 @@
               sha256 = "sha256-o0Sr3/888L/2KzZZP/EcXx+8ZUzdHB/I/VIeVuJvJks=";
             };
           });
+
+        zed-editor = unstable.zed-editor;
       })
     ];
   };