From 14a5877b506825f29715ba4a8101edce91b52bb4 Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Mon, 7 Nov 2022 16:32:53 +0100
Subject: [PATCH] switch to simpler color scheme

---
 home/modules/alacritty/colors.toml    | 26 ++++++++++
 home/modules/alacritty/default.nix    | 73 ++-------------------------
 home/modules/git.nix                  |  1 +
 home/modules/gtk.nix                  |  1 -
 home/modules/helix/config/config.toml |  4 +-
 5 files changed, 34 insertions(+), 71 deletions(-)
 create mode 100644 home/modules/alacritty/colors.toml

diff --git a/home/modules/alacritty/colors.toml b/home/modules/alacritty/colors.toml
new file mode 100644
index 0000000..12e8fa2
--- /dev/null
+++ b/home/modules/alacritty/colors.toml
@@ -0,0 +1,26 @@
+# The 'GNOME Light" theme from GNOME terminal.
+
+[primary]
+foreground = '#171421'
+background = '#ffffea'
+bright_foreground = '#5e5c64'
+
+[normal]
+black = '#171421'
+red = '#c01c28'
+green = '#26a269'
+yellow = '#a2734c'
+blue = '#12488b'
+magenta = '#a347ba'
+cyan = '#2aa1b3'
+white = '#d0cfcc'
+
+[bright]
+black = '#5e5c64'
+red = '#f66151'
+green =  '#33d17a'
+yellow = '#e9ad0c'
+blue = '#2a7bde'
+magenta = '#c061cb'
+cyan = '#33c7de'
+white = '#ffffff'
diff --git a/home/modules/alacritty/default.nix b/home/modules/alacritty/default.nix
index 2eacc99..e0cb7e0 100644
--- a/home/modules/alacritty/default.nix
+++ b/home/modules/alacritty/default.nix
@@ -27,86 +27,21 @@ in
             style = "Regular";
           };
           bold = {
-            family = "Source Code Pro";
+            family = "Jetbrains Mono";
             style = "Bold";
           };
           italic = {
-            family = "Source Code Pro";
+            family = "Jetbrains Mono";
             style = "Italic";
           };
           bold_italic = {
-            family = "Source Code Pro";
+            family = "Jetbrains Mono";
             style = "Bold Italic";
           };
         };
         shell.program = "tmux";
         window.decorations = "none";
-        colors = {
-          # Base16 Spacemacs 256 - alacritty color config
-          # Nasser Alshammari (https://github.com/nashamri/spacemacs-theme)
-          # Default colors
-          primary = {
-            background = "0x1f2022";
-            foreground = "0xa3a3a3";
-          };
-
-          # Colors the cursor will use if `custom_cursor_colors` is true
-          cursor = {
-            text = "0x1f2022";
-            cursor = "0xa3a3a3";
-          };
-
-          # Normal colors
-          normal = {
-            black = "0x1f2022";
-            red = "0xf2241f";
-            green = "0x67b11d";
-            yellow = "0xb1951d";
-            blue = "0x4f97d7";
-            magenta = "0xa31db1";
-            cyan = "0x2d9574";
-            white = "0xa3a3a3";
-          };
-
-          # Bright colors
-          bright = {
-            black = "0x585858";
-            red = "0xf2241f";
-            green = "0x67b11d";
-            yellow = "0xb1951d";
-            blue = "0x4f97d7";
-            magenta = "0xa31db1";
-            cyan = "0x2d9574";
-            white = "0xf8f8f8";
-          };
-
-          indexed_colors = [
-            {
-              index = 16;
-              color = "0xffa500";
-            }
-            {
-              index = 17;
-              color = "0xb03060";
-            }
-            {
-              index = 18;
-              color = "0x282828";
-            }
-            {
-              index = 19;
-              color = "0x444155";
-            }
-            {
-              index = 20;
-              color = "0xb8b8b8";
-            }
-            {
-              index = 21;
-              color = "0xe8e8e8";
-            }
-          ];
-        };
+        colors = lib.trivial.importTOML ./colors.toml;
       };
     };
   };
diff --git a/home/modules/git.nix b/home/modules/git.nix
index c85cdd2..990cd42 100644
--- a/home/modules/git.nix
+++ b/home/modules/git.nix
@@ -28,6 +28,7 @@ in
           navigate = true; # use n and N to move between diff sections
           side-by-side = false;
           line-numbers = true;
+          light = true;
         };
         diff = {
           renames = "copies";
diff --git a/home/modules/gtk.nix b/home/modules/gtk.nix
index bf0ccdc..eb6dae8 100644
--- a/home/modules/gtk.nix
+++ b/home/modules/gtk.nix
@@ -13,7 +13,6 @@ in
   config = mkIf cfg.enable {
     gtk = {
       enable = true;
-      theme.name = "Adwaita-dark";
     };
   };
 }
diff --git a/home/modules/helix/config/config.toml b/home/modules/helix/config/config.toml
index 1f7138e..53eaf05 100644
--- a/home/modules/helix/config/config.toml
+++ b/home/modules/helix/config/config.toml
@@ -1,7 +1,9 @@
+theme = "acme"
+
 [editor]
 line-number = "relative"
 mouse = true
 auto-completion = true
 
 [keys.normal]
-C-q = [ "goto_prev_paragraph", "goto_next_paragraph", ":reflow 80" ]
\ No newline at end of file
+C-q = [ "goto_prev_paragraph", "goto_next_paragraph", ":reflow 80" ]