From a34b4a82629ff1af09f241e3ebaa43d628fade55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Wed, 30 Nov 2022 12:39:45 +0100
Subject: [PATCH] feat: use owickstrom colours

---
 configs/alacritty.nix            |  6 ++---
 lib/colours/owickstrom-dark.nix  | 38 ++++++++++++++++----------------
 lib/colours/owickstrom-light.nix | 37 +++++++++++++++++++++++++++++++
 lib/colours/owickstrom.nix       | 37 -------------------------------
 4 files changed, 59 insertions(+), 59 deletions(-)
 create mode 100644 lib/colours/owickstrom-light.nix
 delete mode 100644 lib/colours/owickstrom.nix

diff --git a/configs/alacritty.nix b/configs/alacritty.nix
index a7a9c38..1559cf3 100644
--- a/configs/alacritty.nix
+++ b/configs/alacritty.nix
@@ -6,7 +6,7 @@
 }: let
   alacritty-cfg = theme:
     (pkgs.formats.yaml {}).generate "alacritty.yml" {
-      window.opacity = 0.95;
+      window.opacity = 0.99;
       font = {
         normal.family = "Monospace";
         size = 6;
@@ -57,7 +57,7 @@ in {
   ];
 
   environment.etc = {
-    "themes/dark/alacritty.yml".source = alacritty-cfg (import <niveum/lib/colours/ayu-dark.nix>);
-    "themes/light/alacritty.yml".source = alacritty-cfg (import <niveum/lib/colours/ayu-light.nix>);
+    "themes/dark/alacritty.yml".source = alacritty-cfg (import <niveum/lib/colours/owickstrom-dark.nix>);
+    "themes/light/alacritty.yml".source = alacritty-cfg (import <niveum/lib/colours/owickstrom-light.nix>);
   };
 }
diff --git a/lib/colours/owickstrom-dark.nix b/lib/colours/owickstrom-dark.nix
index 22ff5e7..59058a7 100644
--- a/lib/colours/owickstrom-dark.nix
+++ b/lib/colours/owickstrom-dark.nix
@@ -1,37 +1,37 @@
 rec {
   black = {
-    bright = "#4b4b4b";
-    dark = "#242424";
+    bright = "#282c34";
+    dark = "#282c34";
   };
   red = {
-    bright = "#fc1c18";
-    dark = "#d71c15";
+    bright = "#e06c75";
+    dark = "#e06c75";
   };
   green = {
-    bright = "#6bc219";
-    dark = "#5aa513";
+    bright = "#98c379";
+    dark = "#98c379";
   };
   yellow = {
-    bright = "#fec80e";
-    dark = "#fdb40c";
+    bright = "#e5c07b";
+    dark = "#e5c07b";
   };
   blue = {
-    bright = "#0955ff";
-    dark = "#063b8c";
+    bright = "#61afef";
+    dark = "#61afef";
   };
   magenta = {
-    bright = "#fb0050";
-    dark = "#e40038";
+    bright = "#c678dd";
+    dark = "#c678dd";
   };
   cyan = {
-    bright = "#3ea8fc";
-    dark = "#2595e1";
+    bright = "#56b6c2";
+    dark = "#56b6c2";
   };
   white = {
-    bright = "#8c00ec";
-    dark = "#efefef";
+    bright = "#dcdfe4";
+    dark = "#dcdfe4";
   };
-  background = "#181818";
-  foreground = white.dark;
-  cursor = "#bbbbbb";
+  background = black.dark;
+  foreground = white.bright;
+  cursor = "#a3b3cc";
 }
diff --git a/lib/colours/owickstrom-light.nix b/lib/colours/owickstrom-light.nix
new file mode 100644
index 0000000..222b5b8
--- /dev/null
+++ b/lib/colours/owickstrom-light.nix
@@ -0,0 +1,37 @@
+rec {
+  black = {
+    bright = "#4b4b4b";
+    dark = "#242424";
+  };
+  red = {
+    bright = "#fc1c18";
+    dark = "#d71c15";
+  };
+  green = {
+    bright = "#6bc219";
+    dark = "#5aa513";
+  };
+  yellow = {
+    bright = "#fec80e";
+    dark = "#fdb40c";
+  };
+  blue = {
+    bright = "#0955ff";
+    dark = "#063b8c";
+  };
+  magenta = {
+    bright = "#fb0050";
+    dark = "#e40038";
+  };
+  cyan = {
+    bright = "#3ea8fc";
+    dark = "#2595e1";
+  };
+  white = {
+    bright = "#8c00ec";
+    dark = "#efefef";
+  };
+  background = white.dark;
+  foreground = "#181818";
+  cursor = "#bbbbbb";
+}
diff --git a/lib/colours/owickstrom.nix b/lib/colours/owickstrom.nix
deleted file mode 100644
index 59058a7..0000000
--- a/lib/colours/owickstrom.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-rec {
-  black = {
-    bright = "#282c34";
-    dark = "#282c34";
-  };
-  red = {
-    bright = "#e06c75";
-    dark = "#e06c75";
-  };
-  green = {
-    bright = "#98c379";
-    dark = "#98c379";
-  };
-  yellow = {
-    bright = "#e5c07b";
-    dark = "#e5c07b";
-  };
-  blue = {
-    bright = "#61afef";
-    dark = "#61afef";
-  };
-  magenta = {
-    bright = "#c678dd";
-    dark = "#c678dd";
-  };
-  cyan = {
-    bright = "#56b6c2";
-    dark = "#56b6c2";
-  };
-  white = {
-    bright = "#dcdfe4";
-    dark = "#dcdfe4";
-  };
-  background = black.dark;
-  foreground = white.bright;
-  cursor = "#a3b3cc";
-}