From a844c71ef3582c50987603499a4496fb168b18ad Mon Sep 17 00:00:00 2001
From: Anthony Rodriguez <anthony@nezia.dev>
Date: Mon, 26 Aug 2024 23:56:43 +0200
Subject: [PATCH] add wezterm and move zellij to shell programs

---
 home/base/programs/default.nix           |  2 +-
 home/base/programs/wezterm.nix           | 17 +++++++++++++++++
 home/base/shell/default.nix              |  8 +++++++-
 home/base/shell/fish.nix                 | 19 +++++++++++--------
 home/base/{programs => shell}/zellij.nix |  0
 modules/stylix.nix                       |  3 ++-
 6 files changed, 38 insertions(+), 11 deletions(-)
 create mode 100644 home/base/programs/wezterm.nix
 rename home/base/{programs => shell}/zellij.nix (100%)

diff --git a/home/base/programs/default.nix b/home/base/programs/default.nix
index 9ebf8a4..70cb71c 100644
--- a/home/base/programs/default.nix
+++ b/home/base/programs/default.nix
@@ -5,7 +5,7 @@
     ./git.nix 
     ./gnupg.nix
     ./nixvim 
-    ./zellij.nix
+    ./wezterm.nix
     ./browsers.nix
     ./miscellaneous.nix
   ];
diff --git a/home/base/programs/wezterm.nix b/home/base/programs/wezterm.nix
new file mode 100644
index 0000000..f7659a0
--- /dev/null
+++ b/home/base/programs/wezterm.nix
@@ -0,0 +1,17 @@
+{ ... }:
+
+{
+  programs.wezterm = {
+    enable = true;
+    extraConfig = ''
+      local wezterm = require 'wezterm'
+
+      return {
+        font = wezterm.font 'MonaspiceNe Nerd Font',
+        front_end = "WebGpu",
+        enable_tab_bar = false,
+        enable_wayland = false
+      }
+    '';
+  };
+}
diff --git a/home/base/shell/default.nix b/home/base/shell/default.nix
index a41689c..768e9b0 100644
--- a/home/base/shell/default.nix
+++ b/home/base/shell/default.nix
@@ -1,5 +1,11 @@
 { ... }:
 
 {
-  imports = [ ./fish.nix ./starship.nix ./zoxide.nix ./direnv.nix ];
+  imports = [ 
+    ./fish.nix 
+    ./starship.nix 
+    ./zoxide.nix 
+    ./direnv.nix 
+    ./zellij.nix
+  ];
 }
diff --git a/home/base/shell/fish.nix b/home/base/shell/fish.nix
index de30e4d..ea6df80 100644
--- a/home/base/shell/fish.nix
+++ b/home/base/shell/fish.nix
@@ -1,22 +1,25 @@
 { pkgs,  ... }:
 
+let
+  catppuccin-fish = pkgs.fetchFromGitHub {
+    owner = "catppuccin";
+    repo = "fish";
+    rev = "a3b9eb5eaf2171ba1359fe98f20d226c016568cf";
+    hash = "sha256-shQxlyoauXJACoZWtRUbRMxmm10R8vOigXwjxBhG8ng=";
+  };
+in
   {
   programs.fish = {
     enable = true;
     interactiveShellInit = ''
       set fish_greeting # Disable greeting
       fish_vi_key_bindings # Enable Vi mode
-
-      function fzf --wraps=fzf --description="Use fzf-tmux if in tmux session"
-      if set --query TMUX
-        fzf-tmux $argv
-      else
-        command fzf $argv
-      end
-    end
+      fish_config theme choose "Catppuccin Frappe"
     '';
     shellAbbrs = { cd = "z"; ngc = "sudo nix-collect-garbage -d"; };
     plugins = [ { name = "fzf"; src = pkgs.fishPlugins.fzf.src; } ];
   };
+
+  xdg.configFile."fish/themes/Catppuccin Frappe.theme".source = "${catppuccin-fish}/themes/Catppuccin Frappe.theme";
 }
 
diff --git a/home/base/programs/zellij.nix b/home/base/shell/zellij.nix
similarity index 100%
rename from home/base/programs/zellij.nix
rename to home/base/shell/zellij.nix
diff --git a/modules/stylix.nix b/modules/stylix.nix
index 0a9f0dc..d48581a 100644
--- a/modules/stylix.nix
+++ b/modules/stylix.nix
@@ -5,6 +5,7 @@
   stylix.image = ../lucy.jpg;
   stylix.polarity = "dark";
   stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-frappe.yaml";
+  stylix.autoEnable = true;
 
   stylix.cursor = {
     name = "Adwaita";
@@ -14,7 +15,7 @@
   stylix.fonts = {
     monospace = {
       package = pkgs.nerdfonts.override { fonts = [ "Monaspace" ]; };
-      name = "MonaspiceNe Nerd Font";
+      name = "MonaspiceNe Nerd Font Mono";
     };
     sizes = {
       terminal = 14;