From 782c805c0e9bb3b48f51ce4a24d48a53c5593563 Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Thu, 26 Aug 2021 11:36:21 +0200
Subject: [PATCH] nix-rice overlay

---
 home.nix          | 41 +------------------------------------
 overlays/rice.nix | 51 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 40 deletions(-)
 create mode 100644 overlays/rice.nix

diff --git a/home.nix b/home.nix
index d1cd57b..a206f8b 100644
--- a/home.nix
+++ b/home.nix
@@ -11,47 +11,8 @@ let
 in
 {
   nixpkgs.overlays = [
-    (final: prev: { rice = (prev.lib.callPackageWith prev) nix-rice {}; }) # Custom library
+    (import ./overlays/rice.nix)
     (final: prev: (prev.lib.callPackageWith prev) ./custom/default.nix {}) # Custom packges
-    (
-      final: prev: rec {
-        rice = prev.rice // {
-          colorPalette = with pkgs.rice; palette.palette rec {
-            black = color.hexToRgba nord.n0;
-            red = color.hexToRgba nord.n11;
-            green = color.hexToRgba nord.n14;
-            yellow = color.hexToRgba nord.n13;
-            blue = color.hexToRgba nord.n10;
-            magenta = color.hexToRgba nord.n15;
-            cyan = color.hexToRgba nord.n8;
-            white = color.hexToRgba nord.n4;
-
-            bright-white = color.hexToRgba nord.n6;
-            bright-red = color.hexToRgba nord.n12;
-            cursor-cursor = color.hexToRgba nord.n4;
-
-            primary-background = color.tAlphaRgba (v: float.round (255 * opacity)) black;
-          };
-          font = {
-            normal = {
-              name = "Cantarell";
-              package = pkgs.cantarell-fonts;
-              size = 10;
-            };
-            monospace = {
-              name = "FuraCode Nerd Font Mono";
-              package = (
-                pkgs.nerdfonts.override {
-                  fonts = [ "FiraCode" ];
-                }
-              );
-              size = 10;
-            };
-          };
-          opacity = 0.9;
-        };
-      }
-    )
     (
       final: prev: {
         lockscreen = prev.lockscreen.override {
diff --git a/overlays/rice.nix b/overlays/rice.nix
new file mode 100644
index 0000000..135e061
--- /dev/null
+++ b/overlays/rice.nix
@@ -0,0 +1,51 @@
+final: prev:
+let
+  callPackage = final.lib.callPackageWith final;
+  nix-rice = callPackage (
+    fetchTarball {
+      url = "https://github.com/bertof/nix-rice/archive/refs/tags/v0.1.2.tar.gz";
+      sha256 = "15f97nwwvk828vnx6kk325zzjn4q37hrpp9aiqiz2qhfs06mr147";
+    }
+  ) {};
+  nord = import ../themes/nord.nix;
+  onedark = import ../themes/onedark.nix;
+in
+(
+  rec {
+    rice = nix-rice // rec {
+      colorPalette = with nix-rice; palette.palette rec {
+        black = color.hexToRgba nord.n0;
+        red = color.hexToRgba nord.n11;
+        green = color.hexToRgba nord.n14;
+        yellow = color.hexToRgba nord.n13;
+        blue = color.hexToRgba nord.n10;
+        magenta = color.hexToRgba nord.n15;
+        cyan = color.hexToRgba nord.n8;
+        white = color.hexToRgba nord.n4;
+
+        bright-white = color.hexToRgba nord.n6;
+        bright-red = color.hexToRgba nord.n12;
+        cursor-cursor = color.hexToRgba nord.n4;
+
+        primary-background = color.tAlphaRgba (v: 255 * opacity) black;
+      };
+      font = {
+        normal = {
+          name = "Cantarell";
+          package = final.cantarell-fonts;
+          size = 10;
+        };
+        monospace = {
+          name = "FuraCode Nerd Font Mono";
+          package = (
+            final.nerdfonts.override {
+              fonts = [ "FiraCode" ];
+            }
+          );
+          size = 10;
+        };
+      };
+      opacity = 0.9;
+    };
+  }
+)