improve ui

solidsnakedev · Sep 5, 2024 · 397f57f · 397f57f
1 parent e378ab5
commit 397f57f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 4 deletions.
diff --git a/modules/init.lua b/modules/init.lua
@@ -79,14 +79,15 @@ nmap("gd", ":Telescope lsp_definitions<cr>")
 nmap("gr", ":Telescope lsp_reference<cr>")
 nmap("gi", ":Telescope lsp_implementations<cr>")
 nmap("<leader>ac", "<cmd>lua vim.lsp.buf.code_action()<cr>")
+-- nmap("<leader>ac", ":Lspsaga code_action<cr>")
 nmap("gp", "<cmd>lua vim.diagnostic.open_float()<cr>")
 nmap("gk", "<cmd>lua vim.diagnostic.goto_prev()<cr>")
 nmap("gj", "<cmd>lua vim.diagnostic.goto_next()<cr>")
 
 
 -- nmap("<leader>gd", builtin.lsp_definitions)
 
-nmap("s", ":HopWord<cr>")
+nmap("s", ":HopChar1<cr>")
 nmap("<S-L>", ":BufferLineCycleNext<cr>")
 nmap("<S-H>", ":BufferLineCyclePrev<cr>")
 nmap("<leader>c", ":Bdelete<cr>")

diff --git a/modules/nixvim.nix b/modules/nixvim.nix
@@ -4,8 +4,9 @@
     enable = true;
     viAlias = true;
     vimAlias = true;
-    # colorschemes.catppuccin.enable = true;
-    colorschemes.kanagawa.enable = true;
+    # colorschemes.kanagawa.enable = true;
+    # colorschemes.tokyonight.enable = true;
+    colorschemes.catppuccin.enable = true;
     plugins = {
       lsp = {
         enable = true;
@@ -21,6 +22,11 @@
           # tsserver.enable = true;
         };
       };
+      lspsaga = {
+        enable = true;
+        lightbulb.enable = false;
+      };
+      lspkind.enable = true;
       typescript-tools = {
         enable = true;
         settings.exposeAsCodeAction = "all";
@@ -35,7 +41,11 @@
       direnv.enable = true;
       which-key.enable = true;
       wilder.enable = true;
-      telescope.enable = true;
+      telescope = {
+        enable = true;
+        # extensions.ui-select.enable = true;
+      };
+      dressing.enable = true;
       dashboard.enable = true;
       hop.enable = true;
       nvim-tree.enable = true;
@@ -46,14 +56,30 @@
       cmp-nvim-lsp.enable = true;
       cmp-path.enable = true;
       cmp-buffer.enable = true;
+      cmp_luasnip.enable = true;
+      nvim-snippets.enable = true;
+      friendly-snippets.enable = true;
+      luasnip = {
+        enable = true;
+        settings = {
+          enable_autosnippets = true;
+        };
+      };
       cmp = {
         enable = true;
         autoEnableSources = true;
         settings = {
+          snippet.expand = ''
+            function(args)
+              require('luasnip').lsp_expand(args.body)
+            end
+          '';
           sources = [
             { name = "nvim_lsp"; }
             { name = "path"; }
             { name = "buffer"; }
+            { name = "luasnip"; }
+            { name = "snippets"; }
           ];
           mapping = {
             "<C-Space>" = "cmp.mapping.complete()";