Huge UI Changes

config/base/keymaps.nix

@@ -26,11 +26,6 @@
         key = "]d";
         action = "<cmd>lua vim.diagnostic.goto_next()<cr>";
       }
-      {
-        mode = "n";
-        key = "<Space>e";
-        action = "<cmd>lua vim.diagnostic.open_float()<cr>";
-      }
       {
         mode = "n";
         key = "<Space>q";

config/plugins/completion/cmp.nix

@@ -8,96 +8,49 @@
 
     cmp = {
       enable = true;
+
       autoEnableSources = true;
+
       settings = {
-        experimental = {
-          ghost_text = false;
-          native_menu = false;
-        };
+        snippet.expand = "function(args) require('luasnip').lsp_expand(args.body) end";
         mapping = {
-          "<C-u>" = "cmp.mapping.scroll_docs(-4)"; # Up
-          "<C-d>" = "cmp.mapping.scroll_docs(4)"; # Down
           "<C-Space>" = "cmp.mapping.complete()";
+          "<C-d>" = "cmp.mapping.scroll_docs(-4)";
+          "<C-e>" = "cmp.mapping.close()";
+          "<C-f>" = "cmp.mapping.scroll_docs(4)";
           "<CR>" = "cmp.mapping.confirm({ select = true, behavior = cmp.ConfirmBehavior.Replace })";
-
-          "<Tab>" = ''
-            cmp.mapping(function(fallback)
-                    if cmp.visible() then
-                        cmp.select_next_item()
-                    elseif luasnip.expand_or_jumpable() then
-                        print("Luasnip can expand or jump!")
-                        luasnip.expand_or_jump()
-                    else
-                        fallback()
-                    end
-                end, { "i", "s" })
-          '';
-
-          "<S-Tab>" = ''
-            cmp.mapping(function(fallback)
-                    if cmp.visible() then
-                        cmp.select_prev_item()
-                    elseif luasnip.jumpable(-1) then
-                        luasnip.jump(-1)
-                    else
-                        fallback()
-                    end
-                  end, { "i", "s" })
-          '';
+          "<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
+          "<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
         };
+
         sources = [
+          {
+            name = "nvim_lsp";
+            priority = 1;
+          }
+          {
+            name = "nvim_lua";
+            priority = 2;
+          }
+          {
+            name = "luasnip";
+            priority = 3;
+          }
+          {
+            name = "buffer";
+            priority = 4;
+          }
           { name = "path"; }
-          { name = "nvim_lua"; }
-          { name = "nvim_lsp"; }
-          { name = "luasnip"; }
-          { name = "buffer"; }
+          { name = "emoji"; }
+          { name = "cmdli"; }
         ];
-        window = {
-          completion = { };
-          documentation = { };
+
+        experimental = {
+          ghost_text = {
+            hl_group = "CmpGhostText";
+          };
         };
-        snippet.expand = "function(args) require('luasnip').lsp_expand(args.body) end";
       };
     };
   };
-
-  extraConfigLua = ''
-    luasnip = require("luasnip")
-
-    kind_icons = {
-      Text = "󰊄 ",
-      Method = " ",
-      Function = "󰡱 ",
-      Constructor = " ",
-      Field = " ",
-      Variable = "󱀍 ",
-      Class = " ",
-      Interface = " ",
-      Module = "󰕳 ",
-      Property = " ",
-      Unit = " ",
-      Value = " ",
-      Enum = " ",
-      Keyword = " ",
-      Snippet = " ",
-      Color = " ",
-      File = " ",
-      Reference = " ",
-      Folder = " ",
-      EnumMember = " ",
-      Constant = " ",
-      Struct = " ",
-      Event = " ",
-      Operator = " ",
-      TypeParameter = " ",
-    }
-
-    local cmp = require'cmp'
-    cmp.setup({
-      window = {
-      completion = cmp.config.window.bordered(),
-      documentation = cmp.config.window.bordered(),
-      },
-    })
-  '';
 }

config/plugins/default.nix

@@ -26,6 +26,9 @@
     # Misc
     ./misc/neocord.nix
     ./misc/wakatime.nix
+    ./misc/comment.nix
+    ./misc/neotree.nix
+    ./misc/mini.nix
 
     # UI
     ./ui/lualine.nix
@@ -34,5 +37,7 @@
     ./ui/bufferline.nix
     ./ui/nvim-colorizer.nix
     ./ui/todo.nix
+    ./ui/nvim-notify.nix
+    ./ui/noice.nix
   ];
 }

config/plugins/git/gitsigns.nix

@@ -1,5 +1,51 @@
 {
   plugins.gitsigns = {
     enable = true;
+    settings = {
+      signs = {
+        add = {
+          text = "▎";
+        };
+        change = {
+          text = "▎";
+        };
+        delete = {
+          text = "";
+        };
+        topdelete = {
+          text = "";
+        };
+        changedelete = {
+          text = "▎";
+        };
+        untracked = {
+          text = "▎";
+        };
+      };
+
+      on_attach = ''
+        function(buffer)
+          local gs = package.loaded.gitsigns
+
+          local function map(mode, l, r, desc)
+            vim.keymap.set(mode, l, r, { buffer = buffer, desc = desc })
+          end
+
+          -- stylua: ignore start
+          map("n", "]h", gs.next_hunk, "Next Hunk")
+          map("n", "[h", gs.prev_hunk, "Prev Hunk")
+          map({ "n", "v" }, "<leader>ghs", ":Gitsigns stage_hunk<CR>", "Stage Hunk")
+          map({ "n", "v" }, "<leader>ghr", ":Gitsigns reset_hunk<CR>", "Reset Hunk")
+          map("n", "<leader>ghS", gs.stage_buffer, "Stage Buffer")
+          map("n", "<leader>ghu", gs.undo_stage_hunk, "Undo Stage Hunk")
+          map("n", "<leader>ghR", gs.reset_buffer, "Reset Buffer")
+          map("n", "<leader>ghp", gs.preview_hunk, "Preview Hunk")
+          map("n", "<leader>ghb", function() gs.blame_line({ full = true }) end, "Blame Line")
+          map("n", "<leader>ghd", gs.diffthis, "Diff This")
+          map("n", "<leader>ghD", function() gs.diffthis("~") end, "Diff This ~")
+          map({ "o", "x" }, "ih", ":<C-U>Gitsigns select_hunk<CR>", "GitSigns Select Hunk")
+        end
+      '';
+    };
   };
 }

config/plugins/lsp/lsp.nix

@@ -2,7 +2,15 @@
 {
   plugins = {
     lsp-lines.enable = true;
-    luasnip.enable = true;
+
+    luasnip = {
+      enable = true;
+      extraConfig = {
+        history = true;
+        delete_check_events = "TextChanged";
+        fromVscode = [ { lazyLoad = true; } ];
+      };
+    };
 
     lspkind = {
       enable = true;

config/plugins/misc/comment.nix

@@ -0,0 +1 @@
+{ plugins.comment.enable = true; }

config/plugins/misc/mini.nix

@@ -0,0 +1,84 @@
+{
+  plugins.mini = {
+    enable = true;
+    modules = {
+      pairs = { };
+      bufremove = { };
+      comment = {
+        custom_commentstring = ''
+          function()
+            return require("ts_context_commentstring.internal").calculate_commentstring() or vim.bo.commentstring
+          end
+        '';
+      };
+      surround = {
+        mappings = {
+          add = "gsa"; # -- Add surrounding in Normal and Visual modes
+          delete = "gsd"; # -- Delete surrounding
+          find = "gsf"; # -- Find surrounding (to the right)
+          find_left = "gsF"; # -- Find surrounding (to the left)
+          highlight = "gsh"; # -- Highlight surrounding
+          replace = "gsr"; # -- Replace surrounding
+          update_n_lines = "gsn"; # -- Update `n_lines`
+        };
+      };
+      ai = {
+        n_lines = 500;
+        custom_textobjects = {
+          o = ''
+            ai.gen_spec.treesitter({
+                        a = { "@block.outer", "@conditional.outer", "@loop.outer" },
+                        i = { "@block.inner", "@conditional.inner", "@loop.inner" },
+                      }, {})'';
+          f = ''ai.gen_spec.treesitter({ a = "@function.outer", i = "@function.inner" }, {})'';
+          c = ''ai.gen_spec.treesitter({ a = "@class.outer", i = "@class.inner" }, {})'';
+          t = ''{ "<([%p%w]-)%f[^<%w][^<>]->.-</%1>", "^<.->().*()</[^/]->$" }'';
+        };
+      };
+    };
+  };
+  keymaps = [
+    {
+      action = ''
+        function()
+          vim.g.minipairs_disable = not vim.g.minipairs_disable
+        end
+      '';
+      key = "<leader>up";
+      options.desc = "Toggle auto pairs";
+    }
+    {
+      action = ''
+        function()
+          local bd = require("mini.bufremove").delete
+          if vim.bo.modified then
+            local choice = vim.fn.confirm(("Save changes to %q?"):format(vim.fn.bufname()), "&Yes\n&No\n&Cancel")
+            if choice == 1 then -- Yes
+              vim.cmd.write()
+              bd(0)
+            elseif choice == 2 then -- No
+              bd(0, true)
+            end
+          else
+            bd(0)
+          end
+        end
+      '';
+      key = "<leader>bd";
+      options = {
+        desc = "Delete Buffer";
+      };
+    }
+    {
+      action = ''
+        function() 
+          require("mini.bufremove").delete(0, true)
+        end
+      '';
+      key = "<leader>bD";
+      options = {
+        desc = "Delete Buffer (Force)";
+      };
+    }
+  ];
+}

config/plugins/misc/neotree.nix

@@ -0,0 +1,51 @@
+{
+  plugins.neo-tree = {
+    enable = true;
+    sources = [
+      "filesystem"
+      "buffers"
+      "git_status"
+      "document_symbols"
+    ];
+    filesystem = {
+      bindToCwd = false;
+      followCurrentFile = {
+        enabled = true;
+      };
+      useLibuvFileWatcher = true;
+    };
+    window.mappings = {
+      "<space>" = "none";
+      "Y" = ''
+        function(state)
+          local node = state.tree:get_node()
+          local path = node:get_id()
+          vim.fn.setreg("+", path, "c")
+        end
+      '';
+    };
+    defaultComponentConfigs = {
+      indent = {
+        withExpanders = true;
+        expanderCollapsed = "";
+        expanderExpanded = "";
+        expanderHighlight = "NeoTreeExpander";
+      };
+      gitStatus.symbols = {
+        unstaged = "󰄱";
+        staged = "󰱒";
+      };
+    };
+  };
+
+  keymaps = [
+    {
+      action = "<cmd>Neotree<CR>";
+      key = "<leader>e";
+      options = {
+        desc = "Explorer Neotree";
+        silent = true;
+      };
+    }
+  ];
+}

config/plugins/ui/bufferline.nix

@@ -1,5 +1,14 @@
 {
   plugins.bufferline = {
     enable = true;
+    diagnostics = "nvim_lsp";
+    offsets = [
+      {
+        filetype = "CHADTree";
+        highlight = "Directory";
+        text = "File Explorer";
+        text_align = "center";
+      }
+    ];
   };
 }