feat: add snacks, update config, minor cleanups and new theme

adrielp · Dec 27, 2024 · fac989d · fac989d
1 parent 0df2ddb
commit fac989d
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 55 deletions.
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
@@ -1,30 +1,34 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "LuaSnip": { "branch": "master", "commit": "787dee55ca364cc9119787165418fe93b74c1842" },
-  "catppuccin": { "branch": "main", "commit": "cf021ebfb1e400a5fd1615cbda024308ca589b18" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
+  "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
   "copilot.vim": { "branch": "release", "commit": "87038123804796ca7af20d1b71c3428d858a9124" },
+  "cyberdream.nvim": { "branch": "main", "commit": "e46e958729a29492cc1681dac7bd8fd640a4d15b" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "gen.nvim": { "branch": "main", "commit": "83f1d6b6ffa6a6f32f6a93a33adc853f27541a94" },
+  "gen.nvim": { "branch": "main", "commit": "b9721662daedd880ca0a0358cf6ffbff60617ab3" },
   "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
-  "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" },
+  "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
   "lsp-zero.nvim": { "branch": "v2.x", "commit": "9a686513eaaa13d737d0fec8956a18268ead8b29" },
-  "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "7446f47b3dfb7df801f31a6f6783c2ad119a6935" },
+  "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "2daa8921b7afdcfa47419a21ea343c3df6d74fa0" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "neogit": { "branch": "master", "commit": "570c39181784f7a2e1bc9cedbfb11846022eea54" },
-  "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
-  "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" },
-  "nvim-lspconfig": { "branch": "master", "commit": "28b205ebe73a18f401e040585106f9bafd8ff21f" },
-  "nvim-treesitter": { "branch": "master", "commit": "46a6587a23eb842411e27f325280e8d7f71bd00a" },
-  "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
-  "oil.nvim": { "branch": "master", "commit": "cca1631d5ea450c09ba72f3951a9e28105a3632c" },
+  "mini.nvim": { "branch": "main", "commit": "4228f166ee9db3e910eea1915e2d3683028add47" },
+  "neogit": { "branch": "master", "commit": "dc926b93e0bb0affce888f0014dbbfa31f966ef7" },
+  "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" },
+  "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" },
+  "nvim-dap": { "branch": "master", "commit": "a6070b4e9e9a8ff1bc513c3748eff27080b0f44a" },
+  "nvim-lspconfig": { "branch": "master", "commit": "f1405c1ea5d7a1051a8ced3110d7cf3b8524041b" },
+  "nvim-treesitter": { "branch": "master", "commit": "caba7ef3556079dec03407bcbb290ddc688ea06e" },
+  "nvim-web-devicons": { "branch": "master", "commit": "6317aca1fd86cc8e8c5ad30029ae7640d566cec6" },
+  "oil.nvim": { "branch": "master", "commit": "ba858b662599eab8ef1cba9ab745afded99cb180" },
   "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
-  "stay-centered.nvim": { "branch": "main", "commit": "c28430fe49615680587458914070d7bd1d8782cc" },
-  "telescope.nvim": { "branch": "master", "commit": "37dc9233a473dd6c3f54456ef9994d8f77c80211" },
+  "render-markdown.nvim": { "branch": "main", "commit": "0022a579ac7355966be5ade77699b88c76b6a549" },
+  "snacks.nvim": { "branch": "main", "commit": "98df370703b3c47a297988f3e55ce99628639590" },
+  "stay-centered.nvim": { "branch": "main", "commit": "e1a63ccaf2584e97c0ef8e64f9654c9a80d983f6" },
+  "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" },
   "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
   "vim-gofmt": { "branch": "master", "commit": "cea5b06b2c2646ced49a64f006be2edb42645dd1" },
-  "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" },
-  "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }
-}
+  "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" },
+  "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }
+}
diff --git a/.config/nvim/lua/plugins/init.lua b/.config/nvim/lua/plugins/init.lua
@@ -13,16 +13,18 @@ if not vim.loop.fs_stat(lazypath) then
 end
 vim.opt.rtp:prepend(lazypath)
 
--- Plugins I use
+-- Plugins
 local plugs = {
     -- Essential Plugins
-    --'tpope/vim-fugitive',
     {
         'windwp/nvim-autopairs',
+        event = "InsertEnter",
         init = function()
             require('nvim-autopairs').setup{}
         end
     },
+    -- May revisit and try jiaoshijie/undotree instead, but mbbill/undotree
+    -- seems more maintained currently, even though it's vimscript
     'mbbill/undotree',
     {
         'nvim-lualine/lualine.nvim',
@@ -31,12 +33,12 @@ local plugs = {
         }
 
     },
+    -- TODO: Replace with local LLM or something better than CoPilot.
     'github/copilot.vim',
     {
         'nvim-treesitter/nvim-treesitter',
         build = ':TSUpdate'
     },
-
     {'nvim-treesitter/playground'},
     'theprimeagen/harpoon',
     {
@@ -47,17 +49,15 @@ local plugs = {
     },
     -- Theme
     {
-        'catppuccin/nvim',
-        name = 'catppuccin',
+        "scottmckendry/cyberdream.nvim",
         lazy = false,
         priority = 1000,
-        opts = {
-            transparent_background = true
-        },
         init = function()
-            vim.cmd.colorscheme 'catppuccin-mocha'
+            vim.cmd.colorscheme 'cyberdream'
         end
     },
+    -- TODO: Re-evaluate config
+    -- Development of this plugin stopped, now it's all NVIM native
     -- LSP
     {
         'VonHeikemen/lsp-zero.nvim',
@@ -68,8 +68,6 @@ local plugs = {
             {
                 'williamboman/mason.nvim',
                 build = function()
-                    -- vim.cmd 'MasonUpdate'
-                    -- vim.cmd, 'MasonUpdate'
                     pcall(vim.cmd, 'MasonUpdate')
                 end,
             },
@@ -107,16 +105,18 @@ local plugs = {
         },
       },
     },
+    -- TODO: Re-evaluate config
+    -- Might want to just re-implement myself, or add autocommands
     {
         "darrikonn/vim-gofmt",
     },
+    -- TODO: It's just an autocmd, re-implement myself to reduce plugin count
     {
         "arnamak/stay-centered.nvim",
         init = function()
             require('stay-centered').setup{}
         end
     },
-    -- NeoGit, a replacement for Vim Fugitive
     {
         "NeogitOrg/neogit",
         dependencies = {
@@ -126,10 +126,6 @@ local plugs = {
         },
         config = true
     },
-    -- Lua
-    {
-        "folke/zen-mode.nvim",
-    },
     {
         "numToStr/Comment.nvim",
         config = function()
@@ -145,6 +141,7 @@ local plugs = {
             require('oil').setup{}
         end
     },
+    -- TODO: Re-evaluate config eventually
     {
         'David-Kunz/gen.nvim',
             opts = {
@@ -170,27 +167,34 @@ local plugs = {
             no_auto_close = false, -- Never closes the window automatically.
             debug = false -- Prints errors and the command which is run.
         }
+    },
+    -- TODO: Re-evaluate config - not sure I'm ready to use it yet
+    {
+        "folke/snacks.nvim",
+        priority = 1000,
+        lazy = false,
+        ---@type snacks.Config
+        opts = {
+            -- dim = { enabled = true },
+            dashboard = { enabled = true },
+            indent = { enabled = true },
+            statuscolumn = { enabled = true },
+            zen = { enabled = true },
+            -- words = { enabled = true },
+        },
+    },
+    {
+        'MeanderingProgrammer/render-markdown.nvim',
+        dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.nvim' }, -- if you use the mini.nvim suite
+        -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'echasnovski/mini.icons' }, -- if you use standalone mini plugins
+        -- dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons
+        ---@module 'render-markdown'
+        ---@type render.md.UserConfig
+        opts = {},
+    },
+    {
+        'mfussenegger/nvim-dap'
     }
-    -- See the docs for more information
-    -- https://github.com/huynle/ogpt.nvim
-    -- {
-    --     "huynle/ogpt.nvim",
-    --     event = "VeryLazy",
-    --     opts = {
-    --         default_provider = "ollama",
-    --         providers = {
-    --             ollama = {
-    --                 api_host = os.getenv("OLLAMA_API_HOST") or "http://localhost:11434",
-    --                 api_key = os.getenv("OLLAMA_API_KEY") or "",
-    --             }
-    --         }
-    --     },
-    --     dependencies = {
-    --         "MunifTanjim/nui.nvim",
-    --         "nvim-lua/plenary.nvim",
-    --         "nvim-telescope/telescope.nvim"
-    --     }
-    -- },
 }
 
 -- can add opts to .setup(plugs) 

diff --git a/.zshrc b/.zshrc
@@ -158,3 +158,5 @@ export EDITOR='nvim'
 export NVM_DIR="$HOME/.nvm"
 [ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && \. "/opt/homebrew/opt/nvm/nvm.sh"  # This loads nvm
 [ -s "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" ] && \. "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm"  # This loads nvm bash_completion
+
+# export PATH="/opt/homebrew/opt/[email protected]/bin:$PATH"