yaksmacos

4 files changed, 29 insertions, 12 deletions

diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index ba15a52..6dba4e0 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -9,6 +9,7 @@
   "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
   "fzf-lua": { "branch": "main", "commit": "758173f499d15410ecb50c5519a41b27c33e645d" },
   "gitsigns.nvim": { "branch": "main", "commit": "8b729e489f1475615dc6c9737da917b3bc163605" },
+  "hologram.nvim": { "branch": "main", "commit": "f5194f71ec1578d91b2e3119ff08e574e2eab542" },
   "jai.vim": { "branch": "master", "commit": "72c09c5f803b8ab2e708a3ad2b7c3704e2b4b3d8" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "leap.nvim": { "branch": "main", "commit": "212429314c5bfa41f4154bfa8805f7227ba6a880" },
@@ -29,6 +30,7 @@
   "nvim-lspconfig": { "branch": "master", "commit": "b8e7957bde4cbb3cb25a13a62548f7c273b026e9" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
   "nvim-notify": { "branch": "master", "commit": "b5825cf9ee881dd8e43309c93374ed5b87b7a896" },
+  "nvim-surround": { "branch": "main", "commit": "fcfa7e02323d57bfacc3a141f8a74498e1522064" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
   "odin.vim": { "branch": "master", "commit": "e7ce5f9d1804273986c661132de19798b0b2b267" },
@@ -46,7 +48,6 @@
   "vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" },
   "vim-ember-hbs": { "branch": "master", "commit": "777095c1b25f334cef9db5504c7d409d52843aa9" },
   "vim-endwise": { "branch": "master", "commit": "eab530110d7a0d985902a3964894816b50dbf31a" },
-  "vim-eunuch": { "branch": "master", "commit": "e86bb794a1c10a2edac130feb0ea590a00d03f1e" },
   "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
   "vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" },
   "vim-magnum": { "branch": "master", "commit": "7a30761b935d72bada5bbe90162a6afdb77c858d" },
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