From 1f1ade154157ad07f97e8f8550ef5d3238d34e48 Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Thu, 2 Jun 2022 14:16:07 +0200
Subject: [PATCH] Switch to onedark theme

---
 home_manager/modules/polybar.nix              |  4 +-
 rice.nix                                      | 37 ++++++++++---------
 ...thomorrow-night.nix => tomorrow-night.nix} |  0
 3 files changed, 22 insertions(+), 19 deletions(-)
 rename themes/{thomorrow-night.nix => tomorrow-night.nix} (100%)

diff --git a/home_manager/modules/polybar.nix b/home_manager/modules/polybar.nix
index 2ceb9e1..4670c00 100644
--- a/home_manager/modules/polybar.nix
+++ b/home_manager/modules/polybar.nix
@@ -29,8 +29,8 @@ let
 
     selected = {
       foreground = colorPalette.bright.white;
-      background = color.tAlphaRgba (v: 240) colorPalette.dark.blue;
-      underline = colorPalette.dark.white;
+      background = colorPalette.bright.black;
+      underline = colorPalette.normal.white;
     };
 
     alert = colorPalette.bright.red;
diff --git a/rice.nix b/rice.nix
index a284b57..dc3c68d 100644
--- a/rice.nix
+++ b/rice.nix
@@ -7,33 +7,36 @@ let
     }
   ) {};
   nord = with nix-rice; palette.tPalette color.hexToRgba (import ./themes/nord.nix);
-  # onedark = with nix-rice; palette.tPalette color.hexToRgba (import ./themes/onedark.nix);
+  onedark = with nix-rice; palette.tPalette color.hexToRgba (import ./themes/onedark.nix);
+  tomorrow-night = with nix-rice; palette.tPalette color.hexToRgba (import ./themes/tomorrow-night.nix);
 in
 (
   rec {
     rice = nix-rice // {
       colorPalette = with nix-rice; rec {
         normal = {
-          black = nord.n1;
-          blue = nord.n10;
-          cyan = nord.n8;
-          green = nord.n14;
-          magenta = nord.n15;
-          red = nord.n11;
-          white = nord.n5;
-          yellow = nord.n13;
+          black = onedark.black;
+          blue = onedark.blue;
+          cyan = onedark.cyan;
+          green = onedark.green;
+          magenta = onedark.magenta;
+          red = onedark.darkRed;
+          white = onedark.white;
+          yellow = onedark.darkYellow;
         };
         bright = palette.brighten 10 normal // {
-          blue = nord.n9;
-          black = nord.n2;
-          red = nord.n12;
-          white = nord.n6;
+          red = onedark.lightRed;
+          yellow = onedark.lightYellow;
+          # blue = nord.n9;
+          # black = nord.n2;
+          # red = nord.n12;
+          # white = nord.n6;
         };
         dark = palette.darken 10 normal // {
-          black = nord.n0;
-          blue = nord.n3;
-          cyan = nord.n7;
-          white = nord.n4;
+          # black = nord.n0;
+          # blue = nord.n3;
+          # cyan = nord.n7;
+          # white = nord.n4;
         };
       };
       font = {
diff --git a/themes/thomorrow-night.nix b/themes/tomorrow-night.nix
similarity index 100%
rename from themes/thomorrow-night.nix
rename to themes/tomorrow-night.nix