yaksmacos

3 files changed, 27 insertions, 11 deletions

diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua
index 5767ddc..661354e 100644
--- a/.config/nvim/lua/lsp.lua
+++ b/.config/nvim/lua/lsp.lua
@@ -47,12 +47,7 @@ require("rust-tools").setup({
 })
 
 -- https://github.com/ray-x/go.nvim#lsp-cmp-support
--- require('go').setup({
--- lsp_cfg = {
--- capabilities = capabilities,
--- on_attach = on_attach
--- }
--- })
+vim.lsp.enable('gopls')
 local lspconfig = require('lspconfig')
 
 lspconfig.zls.setup({
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index d9f119a..ce64b29 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -45,10 +45,27 @@ return require('lazy').setup({
   { 'nvim-treesitter/nvim-treesitter', build = ':TSUpdate' },
   'scrooloose/nerdcommenter', -- commenting shortcuts
 
-  'tpope/vim-eunuch',         -- wrappers UNIX commands
-  --'tpope/vim-surround',       -- surround characters shortcuts
-  'tpope/vim-endwise',        -- wisely add
-  'tpope/vim-repeat',         -- repeat for plugins
+  {
+    "kylechui/nvim-surround",
+    version = "^3.0.0", -- Use for stability; omit to use `main` branch for the latest features
+    event = "VeryLazy",
+    config = {
+      keymaps = {
+        insert          = '<C-g>z',
+        insert_line     = 'gC-ggZ',
+        normal          = 'gz',
+        normal_cur      = 'gZ',
+        normal_line     = 'gzz',
+        normal_cur_line = 'gZZ',
+        visual          = 'gz',
+        visual_line     = 'gZ',
+        delete          = 'gzd',
+        change          = 'gzc',
+      }
+    },
+  },
+  'tpope/vim-endwise', -- wisely add
+  'tpope/vim-repeat',  -- repeat for plugins
   -- 'tpope/vim-vinegar', -- make explore better
   {
     'stevearc/oil.nvim',
@@ -156,4 +173,7 @@ return require('lazy').setup({
       background_colour = "#000000"
     }
   },
+  {
+    'edluffy/hologram.nvim'
+  },
 })
diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua
index cc81451..bef8f4b 100644
--- a/.config/nvim/lua/settings.lua
+++ b/.config/nvim/lua/settings.lua
@@ -146,7 +146,8 @@ vim.api.nvim_create_autocmd("BufWritePre", {
     print(vim.bo.filetype)
     -- idk what's happening but:
     --  https://github.com/sqls-server/sqls/issues/105
-    if vim.bo.filetype == 'sql' then
+    local banned = { sql = true, jai = true, c = true }
+    if banned[vim.bo.filetype] then
       return
     end