Cleanup

lazy-lock.json

@@ -3,6 +3,7 @@
   "catppuccin": { "branch": "main", "commit": "beaf41a30c26fd7d6c386d383155cbd65dd554cd" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
   "gruvbox.nvim": { "branch": "main", "commit": "a472496e1a4465a2dd574389dcf6cdb29af9bf1b" },
+  "harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" },
   "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
   "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "80c0130c5f16b551865a69e832f1feadeedb5fbe" },

lua/config/keymaps.lua

@@ -3,7 +3,7 @@ vim.keymap.set("n", "<leader>w", ":w<CR>")
 vim.keymap.set("n", "<leader>q", ":q<CR>")
 
 -- Clear search highlight
-vim.keymap.set("n", "<leader>h", ":nohlsearch<CR>")
+vim.keymap.set("n", "<leader>c", ":nohlsearch<CR>")
 
 -- Better window navigation
 vim.keymap.set("n", "<C-h>", "<C-w>h")

lua/config/lazy.lua

@@ -20,6 +20,7 @@ vim.opt.rtp:prepend(lazypath)
 local plugins = {
   require("plugins.colorschemes"),  -- theme
   require("plugins.editing"),       -- editing
+  require("plugins.harpoon"),       -- harpoon
   require("plugins.lsp"),           -- LSP
   require("plugins.telescope"),     -- fuzzy finder
   require("plugins.treesitter"),    -- syntax tree

lua/config/treesitter.lua

@@ -1,11 +0,0 @@
-return {
-  "nvim-treesitter/nvim-treesitter",
-  run = ":TSUpdate",
-  config = function()
-    require("nvim-treesitter.configs").setup({
-      ensure_installed = { "lua", "c", "cpp", "rust" },
-      highlight = { enable = true, additional_vim_regex_highlighting = false },
-      indent = { enable = true },
-    })
-  end,
-}

lua/plugins/harpoon.lua

@@ -0,0 +1,23 @@
+return {
+  "ThePrimeagen/harpoon",
+  branch = "harpoon2",
+  dependencies = {
+    "nvim-lua/plenary.nvim",
+  },
+
+  -- lazy = false,  -- load immediately
+
+  config = function()
+    local harpoon = require("harpoon")
+
+    harpoon:setup()
+
+    vim.keymap.set("n", "<leader>a", function() harpoon:list():add() end)
+    vim.keymap.set("n", "<C-e>", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
+
+    vim.keymap.set("n", "<leader>h", function() harpoon:list():select(1) end)
+    vim.keymap.set("n", "<leader>j", function() harpoon:list():select(2) end)
+    vim.keymap.set("n", "<leader>k", function() harpoon:list():select(3) end)
+    vim.keymap.set("n", "<leader>l", function() harpoon:list():select(4) end)
+  end,
+}

lua/plugins/lsp.lua

@@ -36,9 +36,24 @@ return {
       vim.lsp.config("rust_analyzer", {})
       vim.lsp.enable("rust_analyzer")
 
+      -- Haskell
+      vim.lsp.config('hls', {
+        filetypes = { 'haskell', 'lhaskell', 'cabal' },
+      })
+      vim.lsp.enable('hls')
+
+      -- Prolog
+      vim.lsp.enable('prolog_ls')
+
+      -- Python
+      vim.lsp.enable('pylsp')
+
+      -- Java (from Eclipse)
+      vim.lsp.enable('jdtls')
+
       -- Auto format
       vim.api.nvim_create_autocmd("BufWritePre", {
-        pattern = "*.rs",
+        pattern = {"*.rs", "*.hs", "*.py"},
         callback = function()
           vim.lsp.buf.format({ async = false })
         end,
@@ -66,6 +81,7 @@ return {
       keymap.set("n", "gd", vim.lsp.buf.definition, { desc = "Go to definition" })
       keymap.set("n", "K", vim.lsp.buf.hover, { desc = "Hover documentation" })
       keymap.set("n", "gr", vim.lsp.buf.references, { desc = "References" })
+      keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, { desc = "Code Action" })
     end,
   },
 
@@ -96,27 +112,4 @@ return {
       })
     end,
   },
-  {
-    "hrsh7th/nvim-cmp",
-    dependencies = { "hrsh7th/cmp-nvim-lsp", "L3MON4D3/LuaSnip" },
-    config = function()
-      local cmp = require("cmp")
-      cmp.setup({
-        snippet = {
-          expand = function(args)
-            require("luasnip").lsp_expand(args.body)
-          end,
-        },
-        mapping = cmp.mapping.preset.insert({
-          ["<C-n>"] = cmp.mapping.select_next_item(),
-          ["<C-p>"] = cmp.mapping.select_prev_item(),
-          ["<CR>"] = cmp.mapping.confirm({ select = true }),
-        }),
-        sources = cmp.config.sources({
-          { name = "nvim_lsp" },
-          { name = "buffer" },
-        }),
-      })
-    end,
-  },
 }

lua/plugins/treesitter.lua

@@ -3,7 +3,7 @@ return {
   lazy = false,
   run = ":TSUpdate",
   config = function()
-    require'nvim-treesitter'.install { 'lua', 'c', 'cpp', 'rust' }
+    require'nvim-treesitter'.install { 'lua', 'c', 'cpp', 'rust', 'java' }
     vim.api.nvim_create_autocmd('FileType', {
       pattern = { '<filetype>' },
       callback = function() vim.treesitter.start() end,