Added lots of things

moduler/common/fish.nix

@@ -12,7 +12,17 @@
 			   sha256 = "0dbnir6jbwjpjalz14snzd3cgdysgcs3raznsijd6savad3qhijc";
 			 };
 		   }
-		   { name = "grc"; src = pkgs.fishPlugins.grc.src; }
+		   { 
+		   	name = "grc"; 
+			src = pkgs.fishPlugins.grc.src; 
+			}
 	  ];
+	  shellAbbrs = {
+		  homec="nvim ~/nix/config/home.nix";
+		  ls="exa -lag --header";
+	  };
+	  interactiveShellInit = ''
+		${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source
+	  '';
 	};
 }

moduler/common/kitty.nix

@@ -12,7 +12,7 @@
       # size = 30;
     };
     shellIntegration = {
-      enableZshIntegration = true;
+      # enableZshIntegration = true;
       mode = "no-cursor";
     };
     theme = "Catppuccin-Macchiato";

moduler/common/spotifyd.nix

@@ -4,7 +4,7 @@
   	enable = true;
 	settings = {
 		username = "fredzyw";
-		password = sops.secrets.spotify_password;
+		# password = sops.secrets.spotify_password;
 		device_name = myhostname;
 	};
   };

moduler/common/starship.nix

@@ -1,20 +1,59 @@
 # This file is generated from "README.org"
 { pkgs, ... }:
 {
-	programs.starship.enable = true;
-	programs.starship.enableFishIntegration = true;
-	programs.starship.package = pkgs.unstable.starship;
-	programs.starship.settings.add_newline = true;
-	programs.starship.settings.character = {
-	  success_symbol = "[𝝺](#c792ea)";
-	  vicmd_symbol = "[ ](bold green)";
-	  error_symbol = "[☓ ](bold red)";
-	};
-	programs.starship.settings.directory = {
-	  style = "bold cyan";
-	};
-	programs.starship.settings.nix_shell = {
-	  disabled = false;
-	  symbol = " ";
-	};
+	programs.starship =
+		let
+		  flavour = "macchiato"; # One of `latte`, `frappe`, `macchiato`, or `mocha`
+		in
+		{
+		  enable = true;
+		  enableFishIntegration = true;
+		  settings = {
+			# Other config here
+			# format = "$all"; # Remove this line to disable the default prompt format
+			palette = "catppuccin_${flavour}";
+			nix_shell = {
+			  disabled = false;
+			  symbol = " ";
+			};
+		  } // builtins.fromTOML (builtins.readFile
+			(pkgs.fetchFromGitHub
+			  {
+				owner = "catppuccin";
+				repo = "starship";
+				rev = "5629d2356f62a9f2f8efad3ff37476c19969bd4f"; # Replace with the latest commit hash
+				sha256 = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0=";
+			  } + /palettes/${flavour}.toml));
+		};
+	# programs.starship = {
+	# 	enable = true;
+	# 	enableFishIntegration = true;
+	# 	package = pkgs.starship;
+	# 	settings = {
+	# 		# Other config here
+	# 		format = "$all"; # Remove this line to disable the default prompt format
+	# 		palette = "catppuccin_macchiato";
+	# 		add_newline = true;
+	# 		character = {
+	# 		  success_symbol = "[𝝺](#c792ea)";
+	# 		  vicmd_symbol = "[ ](bold green)";
+	# 		  error_symbol = "[☓ ](bold red)";
+	# 		};
+	# 		directory = {
+	# 		  style = "bold cyan";
+	# 		};
+	# 		nix_shell = {
+	# 		  disabled = false;
+	# 		  symbol = " ";
+	# 		};
+	# 	  } // builtins.fromTOML (builtins.readFile
+	# 		(pkgs.fetchFromGitHub
+	# 		  {
+	# 			owner = "catppuccin";
+	# 			repo = "starship";
+	# 			rev = ""; # Replace with the latest commit hash
+	# 			sha256 = "";
+	# 		  } + /palettes/macchiato.toml));
+	# 	};
+	# }
 }

moduler/common/zsh.nix

@@ -21,8 +21,20 @@
         file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
       }
 	  {
-        name = "zsh-syntax-highlighting";
-        src = pkgs.zsh-syntax-highlighting;
+        name = "fash-syntax-highlighting";
+        file = "fast-syntax-highlighting.plugin.zsh";
+        src = builtins.fetchGit {
+          url = "https://github.com/zdharma-continuum/fast-syntax-highlighting";
+          rev = "cf318e06a9b7c9f2219d78f41b46fa6e06011fd9";
+        };
+      }
+	  {
+        name = "zsh-fzf-history-search";
+        file = "zsh-fzf-history-search.plugin.zsh";
+        src = builtins.fetchGit {
+          url = "https://github.com/joshskidmore/zsh-fzf-history-search";
+          rev = "741012388886e7ee39330fe3cdb6a4803012dc0b";
+        };
       }
 	  {
         name = "zsh-autosuggestions";