From 845068b51c6ea63cac391263d0041178b573c007 Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Tue, 2 Apr 2024 21:09:00 +0900
Subject: [PATCH] Update

---
 .../common/software/cli/nixvim/base.nix       | 23 +++++++++----------
 home-manager/common/software/cli/tmux.nix     |  4 +++-
 stylix/themes/stylix/home-manager/nixvim.nix  |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/home-manager/common/software/cli/nixvim/base.nix b/home-manager/common/software/cli/nixvim/base.nix
index 5dc88f75..84e38d60 100644
--- a/home-manager/common/software/cli/nixvim/base.nix
+++ b/home-manager/common/software/cli/nixvim/base.nix
@@ -30,17 +30,6 @@
     };
 
     plugins = {
-      # Testing 
-      noice = {
-        enable = true;
-        popupmenu.enabled = true;
-      };
-      notify = {
-        enable = true;
-        topDown = true; 
-        fps = 60;
-        stages = "slide";
-      };
 
     # Git related
       # Gutter information for git modifications
@@ -53,6 +42,17 @@
       rainbow-delimiters.enable = true;
       # Colorize hex colors inline
       nvim-colorizer.enable = true;
+      # Fancy popups, etc for vim
+      noice = {
+        enable = true;
+        popupmenu.enabled = true;
+      };
+      notify = {
+        enable = true;
+        topDown = true; 
+        fps = 60;
+        stages = "slide";
+      };
 
     # Nix related
       # Nix language syntax highlighting / file type associations
@@ -265,7 +265,6 @@
       everforest
       onedark-nvim
       rose-pine
-      melange-nvim
     ];
   };
 }
diff --git a/home-manager/common/software/cli/tmux.nix b/home-manager/common/software/cli/tmux.nix
index 758c50ef..c0618e19 100644
--- a/home-manager/common/software/cli/tmux.nix
+++ b/home-manager/common/software/cli/tmux.nix
@@ -3,7 +3,7 @@
     enable = true;
     keyMode = "vi";
     mouse = true;
-    terminal = "xterm-256color";
+    # terminal = "xterm-256color";
     plugins = with pkgs.tmuxPlugins; [
       {
         plugin = power-theme;
@@ -15,6 +15,8 @@
           set -g @tmux_power_show_upload_speed    false
           set -g @tmux_power_show_download_speed  false
           set -g @tmux_power_show_web_reachable   false
+          set -g default-terminal "screen-256color" 
+          set-option -sa terminal-overrides ",xterm-256color:RGB"
         '';
       }
       {
diff --git a/stylix/themes/stylix/home-manager/nixvim.nix b/stylix/themes/stylix/home-manager/nixvim.nix
index a9fa3b3a..b51eda1b 100644
--- a/stylix/themes/stylix/home-manager/nixvim.nix
+++ b/stylix/themes/stylix/home-manager/nixvim.nix
@@ -1,4 +1,4 @@
 { lib, ... }: {
-  programs.nixvim.colorscheme = lib.mkForce "tokyonight-night";
+  programs.nixvim.colorscheme = lib.mkForce "ayu-mirage";
   stylix.targets.nixvim.enable = false;
 }