From 08b00ba398db728196ee0d1b29b3a9ca11cd0c7e Mon Sep 17 00:00:00 2001
From: osbm <osmanfbayram@gmail.com>
Date: Tue, 11 Mar 2025 03:11:42 +0300
Subject: [PATCH] update plugins

---
 flake.nix                            |  1 -
 plugins/cmp.nix                      | 11 ++++++
 plugins/default.nix                  | 54 +++++++++++-----------------
 plugins/{lsp/default.nix => lsp.nix} |  0
 plugins/mini.nix                     |  1 -
 plugins/treesitter.nix               | 20 +++++++++++
 6 files changed, 52 insertions(+), 35 deletions(-)
 create mode 100644 plugins/cmp.nix
 rename plugins/{lsp/default.nix => lsp.nix} (100%)
 create mode 100644 plugins/treesitter.nix

diff --git a/flake.nix b/flake.nix
index c250c4d..e6a561c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,7 +26,6 @@
       formatter = forAllSystems (system:
         nix-formatter-pack.lib.mkFormatter {
           pkgs = nixpkgs.legacyPackages.${system};
-
           config.tools = {
             deadnix.enable = true;
             nixfmt.enable = true;
diff --git a/plugins/cmp.nix b/plugins/cmp.nix
new file mode 100644
index 0000000..423698f
--- /dev/null
+++ b/plugins/cmp.nix
@@ -0,0 +1,11 @@
+{
+  plugins.cmp = {
+    autoEnableSources = true;
+    settings.sources = [
+      { name = "nvim_lsp"; }
+      { name = "path"; }
+      { name = "buffer"; }
+      { name = "cmdline"; }
+    ];
+  };
+}
\ No newline at end of file
diff --git a/plugins/default.nix b/plugins/default.nix
index eb97031..8da40d5 100644
--- a/plugins/default.nix
+++ b/plugins/default.nix
@@ -1,44 +1,26 @@
 {pkgs, ...}: {
   imports = [
-    ./lsp
+    ./cmp.nix
+    ./lsp.nix
     ./mini.nix
+    ./treesitter.nix
   ];
 
   plugins = {
-    treesitter = {
-      enable = true;
-      # folding = true; # i dont like the way it starts neovim with everything folded
-      settings = {
-        ensure_installed = [
-          "python"
-          "astro"
-          "just"
-          "dockerfile"
-          "json"
-          "yaml"
-          "lua"
-          "nix"
-          "c"
-          "markdown"
-        ];
-        highlight = { enable = true; };
-      };
-    };
-
+    # todo comments highlighter
     todo-comments.enable = true;
+
+    # a statusline plugin
     lualine.enable = true;
 
-    # cmp = {
-    #   # TODO read what this does
-    #   # basically, it's a completion plugin
-    #   enable = true;
-    #   autoEnableSources = true;
-    # };
-    cmp-nvim-lsp.enable = true;
+    # syntax highlighting
+    treesitter.enable = true;
 
-    # blink completion
-    blink-cmp.enable = true;
-    blink-compat.enable = true;
+    # completion plugin
+    cmp.enable = true;
+
+    # blink completion plugin (disabled in favor of cmp)
+    blink-cmp.enable = false;
 
     # Extensible UI for Neovim notifications and LSP progress messages.
     fidget.enable = true;
@@ -55,9 +37,15 @@
     # vim exercises
     vim-be-good.enable = true;
 
-    web-devicons.enable = true; # be concious of this choice
+    # Provides Nerd Font icons
+    web-devicons.enable = true;
+
+    # better ui experience
+    noice.enable = true;
+
+    # an introduction plugin
+    mini.enable = true; # TODO look more into the mini plugin
 
-    # TODO: add floating command inputter
 
   };
 }
diff --git a/plugins/lsp/default.nix b/plugins/lsp.nix
similarity index 100%
rename from plugins/lsp/default.nix
rename to plugins/lsp.nix
diff --git a/plugins/mini.nix b/plugins/mini.nix
index f79fc50..5ed71fc 100644
--- a/plugins/mini.nix
+++ b/plugins/mini.nix
@@ -1,6 +1,5 @@
 {config, lib, ...}:{
   plugins.mini = {
-    enable = true;
     modules = {
       starter = {
         header = ''
diff --git a/plugins/treesitter.nix b/plugins/treesitter.nix
new file mode 100644
index 0000000..00301be
--- /dev/null
+++ b/plugins/treesitter.nix
@@ -0,0 +1,20 @@
+{
+  plugins.treesitter = {
+    # folding = true; # i dont like the way it starts neovim with everything folded
+    settings = {
+      ensure_installed = [
+        "python"
+        "astro"
+        "just"
+        "dockerfile"
+        "json"
+        "yaml"
+        "lua"
+        "nix"
+        "c"
+        "markdown"
+      ];
+      highlight = { enable = true; };
+    };
+  };
+}
\ No newline at end of file