From 250fa6325f19eeb2d7bb78e0e0f5e337ff23194b Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Mon, 3 Jul 2023 16:09:48 +0100
Subject: [PATCH] Update tokyonight colourscheme

Update from storm still being used in some places to night
Add to alacritty, set to use alacritty as main terminal
Add to xfce terminal as well, including transparency
---
 home/desktop/sxhkd.nix |  2 +-
 home/desktop/xfce.nix  | 20 +++++++++++++++++++-
 home/env/bat.nix       |  2 +-
 home/env/fish.nix      |  2 +-
 home/git/default.nix   |  6 +++---
 home/gui/alacritty.nix | 43 +++++++++++-------------------------------
 home/gui/default.nix   |  5 ++++-
 7 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/home/desktop/sxhkd.nix b/home/desktop/sxhkd.nix
index 6a15956a..96089052 100644
--- a/home/desktop/sxhkd.nix
+++ b/home/desktop/sxhkd.nix
@@ -3,7 +3,7 @@
     enable = true;
     keybindings = {
       # Terminal emulators
-      "super + Return" = "wezterm";
+      "super + Return" = "alacritty";
       "super + shift + Return" = "xfce4-terminal --drop-down";
 
       # Launcher
diff --git a/home/desktop/xfce.nix b/home/desktop/xfce.nix
index 0665254d..019e65ca 100644
--- a/home/desktop/xfce.nix
+++ b/home/desktop/xfce.nix
@@ -1,4 +1,4 @@
-{...}: {
+{pkgs, ...}: {
   imports = [
     ./gtk.nix
     ./picom.nix
@@ -6,4 +6,22 @@
     ./polybar.nix
   ];
   xfconf.settings.xsettings."Gtk/MonospaceFontName" = "FiraCode Nerd Font 12";
+  xdg.configFile."xfce4/terminal/colorschemes/tokyonight_night".source =
+    pkgs.fetchFromGitHub {
+      owner = "folke";
+      repo = "tokyonight.nvim";
+      rev = "cd5156f4b4a6c4c337a46deb0c0bd37319920833";
+      sha256 = "/ht+ixR1eyYR0la00Xq5q1gCsgb5Ly90JghERwbaDPQ=";
+    }
+    + "/extras/xfceterm/tokyonight_night.theme";
+  xdg.configFile."xfce4/terminal/terminalrc".text = ''
+    [Configuration]
+    BackgroundMode=TERMINAL_BACKGROUND_TRANSPARENT
+    BackgroundDarkness=0.8
+    ColorForeground=#c0caf5
+    ColorBackground=#1a1b26
+    ColorSelection=#c0caf5
+    ColorSelectionBackground=#283457
+    ColorPalette=#15161e;#f7768e;#9ece6a;#e0af68;#7aa2f7;#bb9af7;#7dcfff;#a9b1d6;#414868;#f7768e;#9ece6a;#e0af68;#7aa2f7;#bb9af7;#7dcfff;#c0caf5
+  '';
 }
diff --git a/home/env/bat.nix b/home/env/bat.nix
index 96cb1792..998dce9e 100644
--- a/home/env/bat.nix
+++ b/home/env/bat.nix
@@ -12,7 +12,7 @@
           rev = "cd5156f4b4a6c4c337a46deb0c0bd37319920833";
           sha256 = "/ht+ixR1eyYR0la00Xq5q1gCsgb5Ly90JghERwbaDPQ=";
         }
-        + "/extras/sublime/tokyonight_storm.tmTheme");
+        + "/extras/sublime/tokyonight_night.tmTheme");
       Catppuccin-macchiato = builtins.readFile (pkgs.fetchFromGitHub
         {
           owner = "catppuccin";
diff --git a/home/env/fish.nix b/home/env/fish.nix
index c91b0499..cdaade45 100644
--- a/home/env/fish.nix
+++ b/home/env/fish.nix
@@ -12,7 +12,7 @@
             rev = "cd5156f4b4a6c4c337a46deb0c0bd37319920833";
             sha256 = "/ht+ixR1eyYR0la00Xq5q1gCsgb5Ly90JghERwbaDPQ=";
           }
-          + "/extras/fish/tokyonight_storm.fish";
+          + "/extras/fish/tokyonight_night.fish";
       }
     ];
   };
diff --git a/home/git/default.nix b/home/git/default.nix
index a351ce16..00c2a31b 100644
--- a/home/git/default.nix
+++ b/home/git/default.nix
@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   imports = [../env/bat.nix];
-  xdg.configFile."git/tokyonight_storm.gitconfig".source =
+  xdg.configFile."git/tokyonight_night.gitconfig".source =
     pkgs.fetchFromGitHub
     {
       owner = "folke";
@@ -8,11 +8,11 @@
       rev = "cd5156f4b4a6c4c337a46deb0c0bd37319920833";
       sha256 = "/ht+ixR1eyYR0la00Xq5q1gCsgb5Ly90JghERwbaDPQ=";
     }
-    + "/extras/delta/tokyonight_storm.gitconfig";
+    + "/extras/delta/tokyonight_night.gitconfig";
   programs.git = {
     enable = true;
     userName = "Evie Litherland-Smith";
-    includes = [{path = "tokyonight_storm.gitconfig";}];
+    includes = [{path = "tokyonight_night.gitconfig";}];
     delta = {
       enable = true;
       options = {
diff --git a/home/gui/alacritty.nix b/home/gui/alacritty.nix
index 8d6f6698..7f1c1769 100644
--- a/home/gui/alacritty.nix
+++ b/home/gui/alacritty.nix
@@ -1,4 +1,4 @@
-{...}: {
+{pkgs, ...}: {
   programs.alacritty = {
     enable = true;
     settings = {
@@ -6,37 +6,16 @@
         normal.family = "FiraCode Nerd Font";
         size = 14;
       };
-      colors = {
-        # Default colors
-        primary = {
-          background = "0x1a1b26";
-          foreground = "0xa9b1d6";
-        };
-
-        # Normal colors
-        normal = {
-          black = "0x32344a";
-          red = "0xf7768e";
-          green = "0x9ece6a";
-          yellow = "0xe0af68";
-          blue = "0x7aa2f7";
-          magenta = "0xad8ee6";
-          cyan = "0x449dab";
-          white = "0x787c99";
-        };
-
-        # Bright colors
-        bright = {
-          black = "0x444b6a";
-          red = "0xff7a93";
-          green = "0xb9f27c";
-          yellow = "0xff9e64";
-          blue = "0x7da6ff";
-          magenta = "0xbb9af7";
-          cyan = "0x0db9d7";
-          white = "0xacb0d0";
-        };
-      };
+      window.opacity = 0.8;
+      import = [
+        (pkgs.fetchFromGitHub {
+            owner = "folke";
+            repo = "tokyonight.nvim";
+            rev = "cd5156f4b4a6c4c337a46deb0c0bd37319920833";
+            sha256 = "/ht+ixR1eyYR0la00Xq5q1gCsgb5Ly90JghERwbaDPQ=";
+          }
+          + "/extras/alacritty/tokyonight_night.yml")
+      ];
     };
   };
 }
diff --git a/home/gui/default.nix b/home/gui/default.nix
index c4e4abc4..7bec527a 100644
--- a/home/gui/default.nix
+++ b/home/gui/default.nix
@@ -1,5 +1,8 @@
 {pkgs, ...}: {
-  imports = [./firefox.nix ./wezterm.nix];
+  imports = [
+    ./firefox.nix
+    ./alacritty.nix
+  ];
   home.packages = with pkgs; [
     neovide
     bitwarden