diff --git a/config/lua/lsp-conf.lua b/config/lua/lsp-conf.lua
index d645068..13b5e57 100644
--- a/config/lua/lsp-conf.lua
+++ b/config/lua/lsp-conf.lua
@@ -1,6 +1,9 @@
 -- Setup language servers.
 local lspconfig = require('lspconfig')
-lspconfig.gopls.setup {}
+lspconfig.gopls.setup { on_attach = function(_, bufnr)
+    vim.api.nvim_command("au BufWritePost <buffer> lua vim.lsp.buf.format { async = true }")
+end
+}
 
 -- Global mappings.
 -- See `:help vim.diagnostic.*` for documentation on any of the below functions
@@ -20,7 +23,6 @@ vim.api.nvim_create_autocmd('LspAttach', {
     callback = function(ev)
         -- Enable completion triggered by <c-x><c-o>
         vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc'
-
         -- Buffer local mappings.
         -- See `:help vim.lsp.*` for documentation on any of the below functions
         local opts = { buffer = ev.buf }
diff --git a/config/lua/mini-conf.lua b/config/lua/mini-conf.lua
index 5d476fa..d8bae90 100644
--- a/config/lua/mini-conf.lua
+++ b/config/lua/mini-conf.lua
@@ -1,3 +1,5 @@
+-- din( dina
+require('mini.ai').setup()
 -- gc gcc
 require('mini.comment').setup()
 -- alt hjkl
@@ -62,3 +64,13 @@ indent.setup({
     draw =  { delay = 0 }
 })
 indent.gen_animation.none()
+
+-- <C-Space>
+require('mini.completion').setup({
+    delay = {completion = 10^7},
+    window = {
+        info = { height = 25, width = 80, border = 'single' },
+        signature = { height = 25, width = 80, border = 'single' },
+    },
+    fallback_action = "<C-x><C-n>"
+})
diff --git a/config/lua/nvim-treesitter-conf.lua b/config/lua/nvim-treesitter-conf.lua
index 07e9132..559c7f5 100644
--- a/config/lua/nvim-treesitter-conf.lua
+++ b/config/lua/nvim-treesitter-conf.lua
@@ -13,7 +13,8 @@ require("nvim-treesitter.configs").setup {
             keymaps = {
                 ["af"] = "@function.outer",
                 ["if"] = "@function.inner",
-                ["aa"] = "@call.inner",
+                ["aa"] = "@statement.outer",
+                ["ia"] = "@parameter.inner",
             },
         },
         move = {
@@ -21,19 +22,26 @@ require("nvim-treesitter.configs").setup {
             set_jumps = true, -- whether to set jumps in the jumplist
             goto_next_start = {
                 [']]'] = '@function.outer',
-                [']m'] = '@class.outer',
+                [']a'] = '@parameter.inner',
             },
             goto_previous_start = {
                 ['[['] = '@function.outer',
-                ['[m'] = '@class.outer',
+                ['[a'] = '@parameter.inner',
             },
         },
-    },
+        swap = {
+            enable = true,
+            swap_next = {
+                ["p]"] = "@parameter.inner",
+            },
+            swap_previous = {
+                ["p["] = "@parameter.inner",
+            },
+        }, },
     incremental_selection = {
         enable = true,
         keymaps = {
             init_selection = '<CR>',
-            scope_incremental = '<CR>',
             node_incremental = '<TAB>',
             node_decremental = '<S-TAB>',
         },
diff --git a/plugins.nix b/plugins.nix
index d238021..1549d06 100644
--- a/plugins.nix
+++ b/plugins.nix
@@ -8,34 +8,11 @@
     gitsigns-nvim
     oil-nvim
     rose-pine
-
-    #treesitter
-    (nvim-treesitter.withPlugins
-    (
-      plugins: with plugins; [
-        tree-sitter-bash
-        tree-sitter-c
-        tree-sitter-dockerfile
-        tree-sitter-go
-        tree-sitter-html
-        tree-sitter-javascript
-        tree-sitter-json
-        tree-sitter-lua
-        tree-sitter-markdown
-        tree-sitter-markdown-inline
-        tree-sitter-php
-        tree-sitter-python
-        tree-sitter-svelte
-        tree-sitter-typescript
-        tree-sitter-yaml
-      ]
-      )
-      )
-      nvim-treesitter-textobjects
-    ];
-    extra = with pkgs.vimPlugins; [
-      vim-nix
-      #lsp
-      nvim-lspconfig
-    ];
-  }
+    nvim-lspconfig
+    nvim-treesitter.withAllGrammars
+    nvim-treesitter-textobjects
+  ];
+  extra = with pkgs.vimPlugins; [
+    vim-nix
+  ];
+}