From fcadd0b39c5923b08456e31d9578f2f6506182db Mon Sep 17 00:00:00 2001
From: Uzair Mohammed <uzair.hamed@gmail.com>
Date: Sat, 28 Dec 2024 17:31:37 -0800
Subject: [PATCH] 2: Set new system-wide environment variables and fix kitty
 mocha theme

---
 home/modules/devStuff.nix           |  2 +-
 home/modules/kitty.nix              |  2 +-
 home/modules/kittyThemes/mocha.conf | 80 -----------------------------
 system/modules/miscNixStuff.nix     |  2 +
 4 files changed, 4 insertions(+), 82 deletions(-)
 delete mode 100644 home/modules/kittyThemes/mocha.conf

diff --git a/home/modules/devStuff.nix b/home/modules/devStuff.nix
index 03b8eab..cd3633b 100644
--- a/home/modules/devStuff.nix
+++ b/home/modules/devStuff.nix
@@ -4,7 +4,7 @@
   ];
   home.sessionVariables = {
     EDITOR = "nvim";
-    SHELL = "fish";
+    SHELL = "/etc/profiles/per-user/uzair/bin/fish";
     ELECTRON_OZONE_PLATFORM_HINT = "wayland";
     NIXOS_CONFIG = "/home/uzair/Documents/nixos-config";
   };
diff --git a/home/modules/kitty.nix b/home/modules/kitty.nix
index 8e17376..11f383a 100644
--- a/home/modules/kitty.nix
+++ b/home/modules/kitty.nix
@@ -1,7 +1,7 @@
 {
     programs.kitty = {
         enable = true;
-	themeFile = "./kittyThemes/mocha";
+	themeFile = "Catppuccin-Mocha";
 	shellIntegration = {
 		enableFishIntegration = true;
 	};
diff --git a/home/modules/kittyThemes/mocha.conf b/home/modules/kittyThemes/mocha.conf
deleted file mode 100644
index f37adf9..0000000
--- a/home/modules/kittyThemes/mocha.conf
+++ /dev/null
@@ -1,80 +0,0 @@
-# vim:ft=kitty
-
-## name:     Catppuccin Kitty Mocha
-## author:   Catppuccin Org
-## license:  MIT
-## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf
-## blurb:    Soothing pastel theme for the high-spirited!
-
-
-
-# The basic colors
-foreground              #cdd6f4
-background              #1e1e2e
-selection_foreground    #1e1e2e
-selection_background    #f5e0dc
-
-# Cursor colors
-cursor                  #f5e0dc
-cursor_text_color       #1e1e2e
-
-# URL underline color when hovering with mouse
-url_color               #f5e0dc
-
-# Kitty window border colors
-active_border_color     #b4befe
-inactive_border_color   #6c7086
-bell_border_color       #f9e2af
-
-# OS Window titlebar colors
-wayland_titlebar_color system
-macos_titlebar_color system
-
-# Tab bar colors
-active_tab_foreground   #11111b
-active_tab_background   #cba6f7
-inactive_tab_foreground #cdd6f4
-inactive_tab_background #181825
-tab_bar_background      #11111b
-
-# Colors for marks (marked text in the terminal)
-mark1_foreground #1e1e2e
-mark1_background #b4befe
-mark2_foreground #1e1e2e
-mark2_background #cba6f7
-mark3_foreground #1e1e2e
-mark3_background #74c7ec
-
-# The 16 terminal colors
-
-# black
-color0 #45475a
-color8 #585b70
-
-# red
-color1 #f38ba8
-color9 #f38ba8
-
-# green
-color2  #a6e3a1
-color10 #a6e3a1
-
-# yellow
-color3  #f9e2af
-color11 #f9e2af
-
-# blue
-color4  #89b4fa
-color12 #89b4fa
-
-# magenta
-color5  #f5c2e7
-color13 #f5c2e7
-
-# cyan
-color6  #94e2d5
-color14 #94e2d5
-
-# white
-color7  #bac2de
-color15 #a6adc8
diff --git a/system/modules/miscNixStuff.nix b/system/modules/miscNixStuff.nix
index 799e462..0153268 100644
--- a/system/modules/miscNixStuff.nix
+++ b/system/modules/miscNixStuff.nix
@@ -1,6 +1,8 @@
 {
   environment.sessionVariables = {
     ELECTRON_OZONE_PLATFORM_HINT = "wayland";
+    SHELL = "/etc/profiles/per-user/uzair/bin/fish";
+    EDITOR = "nvim";
   };
 
   nix.settings.experimental-features = ["nix-command" "flakes"];