From db123caedeeaf3ef28c20dc4dcf24b3866216fad Mon Sep 17 00:00:00 2001
From: Mohammad Rafiq <mohammadrafiq567@gmail.com>
Date: Fri, 7 Mar 2025 20:50:46 +0800
Subject: [PATCH] chore: cleanup theming and get nvim colors working in tmux

---
 flake.nix                                                | 9 +++------
 {users => systems}/modules/personalisation.nix           | 2 +-
 systems/nemesis.nix                                      | 1 +
 users/modules/programs/nixvim.nix                        | 5 +----
 users/modules/programs/nixvim/colorscheme-catppuccin.nix | 8 --------
 users/modules/programs/tmux.nix                          | 3 ++-
 users/rafiq.nix                                          | 1 -
 7 files changed, 8 insertions(+), 21 deletions(-)
 rename {users => systems}/modules/personalisation.nix (89%)
 delete mode 100644 users/modules/programs/nixvim/colorscheme-catppuccin.nix

diff --git a/flake.nix b/flake.nix
index 54ae40a..2ef9c28 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,19 +10,16 @@
     args = {inherit self inputs;};
     mkSystem = hostname:
       nixpkgs.lib.nixosSystem {
-        specialArgs = args; modules = [ ./systems/${hostname}.nix
+        specialArgs = args; 
+	modules = [ 
+	  ./systems/${hostname}.nix
 
           # Add the home-manager user
           home-manager.nixosModules.home-manager
           {
             home-manager = {
-              # Don't instantiate the home-manager instance of nixpkgs
-              #useGlobalPkgs = true;
-              # Install user packages to /etc/profiles
               useUserPackages = true;
-              # Pass inputs to configurations
               extraSpecialArgs = args;
-              # Add the users
               users.rafiq.imports = [
                 ./users/rafiq.nix
               ];
diff --git a/users/modules/personalisation.nix b/systems/modules/personalisation.nix
similarity index 89%
rename from users/modules/personalisation.nix
rename to systems/modules/personalisation.nix
index ee9c483..5b02579 100644
--- a/users/modules/personalisation.nix
+++ b/systems/modules/personalisation.nix
@@ -1,5 +1,5 @@
 { inputs, pkgs, config, ... }: {
-  imports = [ inputs.stylix.homeManagerModules.stylix ];
+  imports = [ inputs.stylix.nixosModules.stylix ];
   stylix = {
     enable = true;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
diff --git a/systems/nemesis.nix b/systems/nemesis.nix
index db0738c..2745c2d 100644
--- a/systems/nemesis.nix
+++ b/systems/nemesis.nix
@@ -8,6 +8,7 @@
     ./modules/networking.nix # Common networking settings
     ./modules/hyprland.nix # Hyprland compositor
     ./modules/nvidia.nix # Nvidia settings
+    ./modules/personalisation.nix
   ];
 
   networking.hostName = "nemesis";
diff --git a/users/modules/programs/nixvim.nix b/users/modules/programs/nixvim.nix
index 6833f40..e961bce 100644
--- a/users/modules/programs/nixvim.nix
+++ b/users/modules/programs/nixvim.nix
@@ -1,7 +1,6 @@
 { inputs, ... }: {
   imports = [ 
     inputs.nixvim.homeManagerModules.nixvim 
-    #./nixvim/colorscheme-catppuccin.nix
     ./nixvim/nvim-tree.nix # filetree
     ./nixvim/noice.nix # custom CMDLINE
     ./nixvim/lualine.nix # custom statusline
@@ -12,16 +11,14 @@
     viAlias = true;
     vimAlias = true;
     vimdiffAlias = true;
-    extraConfigLua = ""; 
-    extraPlugins = [];
 
     opts = {
       shiftwidth = 2;
       number = true;
       relativenumber = true;
+      termguicolors = true;
     };
 
     clipboard.providers.wl-copy.enable = true;
-
   };
 }
diff --git a/users/modules/programs/nixvim/colorscheme-catppuccin.nix b/users/modules/programs/nixvim/colorscheme-catppuccin.nix
deleted file mode 100644
index 411a122..0000000
--- a/users/modules/programs/nixvim/colorscheme-catppuccin.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  programs.nixvim.colorschemes.catppuccin = {
-    enable = true;
-    settings = {
-      flavour = "mocha";
-    };
-  };
-}
diff --git a/users/modules/programs/tmux.nix b/users/modules/programs/tmux.nix
index de3d09f..a98da3f 100644
--- a/users/modules/programs/tmux.nix
+++ b/users/modules/programs/tmux.nix
@@ -21,7 +21,8 @@
       ];
       extraConfig = ''
         set -g default-terminal "tmux-256color"
-        set -ag terminal-overrides ",xterm-256color:RGB"
+        set -ag terminal-overrides ",tmux-256color:RGB"
+	set -as terminal-features ",tmux-256color:RGB"
       '';
     };
 }
diff --git a/users/rafiq.nix b/users/rafiq.nix
index 7ae548e..f53b80e 100644
--- a/users/rafiq.nix
+++ b/users/rafiq.nix
@@ -1,6 +1,5 @@
 { pkgs, ... }: {
   imports = [
-    ./modules/personalisation.nix
     ./modules/sh.nix
     ./modules/de.nix
     ./modules/utils.nix