migrate to lazy.nvim

lua/plugins.lua

@@ -1,26 +0,0 @@
-return function(use)
-  use({ "folke/trouble.nvim" })
-  use({
-    "folke/which-key.nvim",
-    config = function()
-      require("which-key").setup({})
-    end,
-  })
-  use({ "windwp/nvim-autopairs" })
-  use({ "nvim-tree/nvim-web-devicons" })
-  use({
-    "nvim-tree/nvim-tree.lua",
-    tag = "nightly",
-  })
-  use({ "ckipp01/stylua-nvim" })
-  use({ "gennaro-tedesco/nvim-jqx" })
-  use({ "lervag/vimtex" })
-  use({
-    "f3fora/nvim-texlabconfig",
-    run = "go build",
-  })
-  use({ "sindrets/diffview.nvim" })
-  use({ "nvim-treesitter/playground" })
-  use({ "softinio/scaladex.nvim" })
-  use({ "TimUntersberger/neogit" })
-end

lua/plugins/gitsigns.lua

@@ -0,0 +1,15 @@
+return {
+  "lewis6991/gitsigns.nvim",
+  lazy = false,
+  config = function()
+    require("gitsigns").setup({
+      signs = {
+        add = { text = "+" },
+        change = { text = "~" },
+        delete = { text = "_" },
+        topdelete = { text = "‾" },
+        changedelete = { text = "~" },
+      },
+    })
+  end,
+}

lua/plugins/init.lua

@@ -0,0 +1,63 @@
+return {
+  { "folke/neoconf.nvim", cmd = "Neoconf" },
+  {
+    "folke/neodev.nvim",
+    config = function()
+      require("neodev").setup()
+    end,
+  },
+  {
+    "folke/tokyonight.nvim",
+    lazy = false, -- make sure we load this during startup if it is your main colorscheme
+    priority = 1000, -- make sure to load this before all the other start plugins
+    config = function()
+      vim.g.tokyonight_style = "night"
+      vim.g.tokyonight_italic_functions = true
+      vim.o.termguicolors = true
+      -- load the colorscheme here
+      vim.cmd([[colorscheme tokyonight]])
+    end,
+  },
+  {
+    "folke/trouble.nvim",
+    config = function()
+      require("trouble").setup()
+    end,
+  },
+  "folke/which-key.nvim",
+  {
+    "j-hui/fidget.nvim",
+    config = function()
+      require("fidget").setup()
+    end,
+  },
+  {
+    "windwp/nvim-autopairs",
+    lazy = false,
+    config = function()
+      require("nvim-autopairs").setup()
+    end,
+  },
+  "nvim-tree/nvim-web-devicons",
+  "ckipp01/stylua-nvim",
+  "gennaro-tedesco/nvim-jqx",
+  "softinio/scaladex.nvim",
+  {
+    "lukas-reineke/indent-blankline.nvim",
+    config = function()
+      require("indent_blankline").setup({
+        char = "┊",
+        show_trailing_blankline_indent = false,
+      })
+    end,
+  },
+  "tpope/vim-fugitive",
+  "tpope/vim-rhubarb",
+  "tpope/vim-sleuth",
+  {
+    "numToStr/Comment.nvim",
+    config = function()
+      require("Comment").setup()
+    end,
+  },
+}

lua/plugins/lsp.lua

@@ -0,0 +1,105 @@
+return {
+  "neovim/nvim-lspconfig",
+  dependencies = {
+    -- Automatically install LSPs to stdpath for neovim
+    "williamboman/mason.nvim",
+    "williamboman/mason-lspconfig.nvim",
+
+    -- Useful status updates for LSP
+    "j-hui/fidget.nvim",
+
+    -- Additional lua configuration, makes nvim stuff amazing
+    "folke/neodev.nvim",
+  },
+  config = function()
+    -- LSP settings.
+    --  This function gets run when an LSP connects to a particular buffer.
+    local on_attach = function(_, bufnr)
+      -- NOTE: Remember that lua is a real programming language, and as such it is possible
+      -- to define small helper and utility functions so you don't have to repeat yourself
+      -- many times.
+      --
+      -- In this case, we create a function that lets us more easily define mappings specific
+      -- for LSP related items. It sets the mode, buffer and description for us each time.
+      local nmap = function(keys, func, desc)
+        if desc then
+          desc = "LSP: " .. desc
+        end
+
+        vim.keymap.set("n", keys, func, { buffer = bufnr, desc = desc })
+      end
+
+      nmap("<leader>rn", vim.lsp.buf.rename, "[R]e[n]ame")
+      nmap("<leader>ca", vim.lsp.buf.code_action, "[C]ode [A]ction")
+
+      nmap("gd", vim.lsp.buf.definition, "[G]oto [D]efinition")
+      nmap("gr", require("telescope.builtin").lsp_references, "[G]oto [R]eferences")
+      nmap("gI", vim.lsp.buf.implementation, "[G]oto [I]mplementation")
+      nmap("<leader>D", vim.lsp.buf.type_definition, "Type [D]efinition")
+      nmap("<leader>ds", require("telescope.builtin").lsp_document_symbols, "[D]ocument [S]ymbols")
+      nmap("<leader>ws", require("telescope.builtin").lsp_dynamic_workspace_symbols, "[W]orkspace [S]ymbols")
+
+      -- See `:help K` for why this keymap
+      nmap("K", vim.lsp.buf.hover, "Hover Documentation")
+      nmap("<C-k>", vim.lsp.buf.signature_help, "Signature Documentation")
+
+      -- Lesser used LSP functionality
+      nmap("gD", vim.lsp.buf.declaration, "[G]oto [D]eclaration")
+      nmap("<leader>wa", vim.lsp.buf.add_workspace_folder, "[W]orkspace [A]dd Folder")
+      nmap("<leader>wr", vim.lsp.buf.remove_workspace_folder, "[W]orkspace [R]emove Folder")
+      nmap("<leader>wl", function()
+        print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+      end, "[W]orkspace [L]ist Folders")
+
+      -- Create a command `:Format` local to the LSP buffer
+      vim.api.nvim_buf_create_user_command(bufnr, "Format", function(_)
+        vim.lsp.buf.format()
+      end, { desc = "Format current buffer with LSP" })
+    end
+
+    -- Enable the following language servers
+    --  Feel free to add/remove any LSPs that you want here. They will automatically be installed.
+    --
+    --  Add any additional override configuration in the following tables. They will be passed to
+    --  the `settings` field of the server config. You must look up that documentation yourself.
+    local servers = {
+      -- clangd = {},
+      -- gopls = {},
+      -- pyright = {},
+      -- rust_analyzer = {},
+      -- tsserver = {},
+
+      sumneko_lua = {
+        Lua = {
+          workspace = { checkThirdParty = false },
+          telemetry = { enable = false },
+        },
+      },
+    }
+
+    --
+    -- nvim-cmp supports additional completion capabilities, so broadcast that to servers
+    local capabilities = vim.lsp.protocol.make_client_capabilities()
+    capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities)
+
+    -- Setup mason so it can manage external tooling
+    require("mason").setup()
+
+    -- Ensure the servers above are installed
+    local mason_lspconfig = require("mason-lspconfig")
+
+    mason_lspconfig.setup({
+      ensure_installed = vim.tbl_keys(servers),
+    })
+
+    mason_lspconfig.setup_handlers({
+      function(server_name)
+        require("lspconfig")[server_name].setup({
+          capabilities = capabilities,
+          on_attach = on_attach,
+          settings = servers[server_name],
+        })
+      end,
+    })
+  end,
+}

lua/plugins/lualine.lua

@@ -0,0 +1,14 @@
+return {
+  "nvim-lualine/lualine.nvim",
+  lazy = false,
+  config = function()
+    require("lualine").setup({
+      options = {
+        icons_enabled = false,
+        theme = "tokyonight",
+        component_separators = "|",
+        section_separators = "",
+      },
+    })
+  end,
+}

lua/plugins/neo-tree.lua

@@ -0,0 +1,15 @@
+return {
+  "nvim-neo-tree/neo-tree.nvim",
+  branch = "v2.x",
+  dependencies = {
+    "nvim-lua/plenary.nvim",
+    "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
+    "MunifTanjim/nui.nvim",
+  },
+  keys = {
+    { "<leader>m", "<cmd>Neotree toggle<cr>", desc = "NeoTree" },
+  },
+  config = function()
+    require("neo-tree").setup()
+  end,
+}

lua/plugins/neogit.lua

@@ -0,0 +1,18 @@
+return {
+  "TimUntersberger/neogit",
+  cmd = "Neogit",
+  dependencies = { "sindrets/diffview.nvim" },
+  config = function()
+    require("neogit").setup({
+      integrations = {
+        diffview = true,
+      },
+    })
+    vim.api.nvim_set_keymap(
+      "n",
+      "<leader>ng",
+      [[<cmd>lua require('neogit').open({ kind = "split" })<cr>]],
+      { noremap = true, silent = true }
+    )
+  end,
+}

lua/plugins/nvim-cmp.lua

@@ -0,0 +1,67 @@
+return {
+  "hrsh7th/nvim-cmp",
+  -- load cmp on InsertEnter
+  event = "InsertEnter",
+  -- these dependencies will only be loaded when cmp loads
+  -- dependencies are always lazy-loaded unless specified otherwise
+  dependencies = {
+    "hrsh7th/cmp-nvim-lsp",
+    "hrsh7th/cmp-buffer",
+    "L3MON4D3/LuaSnip",
+    "saadparwaiz1/cmp_luasnip",
+    "hrsh7th/cmp-path",
+    "hrsh7th/cmp-cmdline",
+    "hrsh7th/cmp-nvim-lua",
+    "hrsh7th/cmp-nvim-lsp-signature-help",
+  },
+  config = function()
+    local cmp = require("cmp")
+    local luasnip = require("luasnip")
+
+    cmp.setup({
+      snippet = {
+        expand = function(args)
+          luasnip.lsp_expand(args.body)
+        end,
+      },
+      mapping = cmp.mapping.preset.insert({
+        ["<C-d>"] = cmp.mapping.scroll_docs(-4),
+        ["<C-f>"] = cmp.mapping.scroll_docs(4),
+        ["<C-Space>"] = cmp.mapping.complete(),
+        ["<CR>"] = cmp.mapping.confirm({
+          behavior = cmp.ConfirmBehavior.Replace,
+          select = true,
+        }),
+        ["<Tab>"] = cmp.mapping(function(fallback)
+          if cmp.visible() then
+            cmp.select_next_item()
+          elseif luasnip.expand_or_jumpable() then
+            luasnip.expand_or_jump()
+          else
+            fallback()
+          end
+        end, { "i", "s" }),
+        ["<S-Tab>"] = cmp.mapping(function(fallback)
+          if cmp.visible() then
+            cmp.select_prev_item()
+          elseif luasnip.jumpable(-1) then
+            luasnip.jump(-1)
+          else
+            fallback()
+          end
+        end, { "i", "s" }),
+      }),
+      sources = {
+        { name = "nvim_lsp" },
+        { name = "luasnip" },
+        { name = "buffer" },
+        { name = "path" },
+        { name = "nvim_lua" },
+        { name = "nvim_lsp_signature_help" },
+      },
+    })
+
+    local cmp_autopairs = require("nvim-autopairs.completion.cmp")
+    cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done())
+  end,
+}

lua/plugins/telescope.lua

@@ -0,0 +1,41 @@
+return {
+  "nvim-telescope/telescope.nvim",
+  branch = "0.1.x",
+  dependencies = {
+    "nvim-lua/plenary.nvim",
+    { "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
+  },
+  config = function()
+    require("telescope").setup({
+      defaults = {
+        mappings = {
+          i = {
+            ["<C-u>"] = false,
+            ["<C-d>"] = false,
+          },
+        },
+      },
+    })
+
+    -- Enable telescope fzf native, if installed
+    pcall(require("telescope").load_extension, "fzf")
+    pcall(require("telescope").load_extension, "scaladex")
+
+    -- See `:help telescope.builtin`
+    vim.keymap.set("n", "<leader>?", require("telescope.builtin").oldfiles, { desc = "[?] Find recently opened files" })
+    vim.keymap.set("n", "<leader><space>", require("telescope.builtin").buffers, { desc = "[ ] Find existing buffers" })
+    vim.keymap.set("n", "<leader>/", function()
+      -- You can pass additional configuration to telescope to change theme, layout, etc.
+      require("telescope.builtin").current_buffer_fuzzy_find(require("telescope.themes").get_dropdown({
+        winblend = 10,
+        previewer = false,
+      }))
+    end, { desc = "[/] Fuzzily search in current buffer]" })
+
+    vim.keymap.set("n", "<leader>sf", require("telescope.builtin").find_files, { desc = "[S]earch [F]iles" })
+    vim.keymap.set("n", "<leader>sh", require("telescope.builtin").help_tags, { desc = "[S]earch [H]elp" })
+    vim.keymap.set("n", "<leader>sw", require("telescope.builtin").grep_string, { desc = "[S]earch current [W]ord" })
+    vim.keymap.set("n", "<leader>sg", require("telescope.builtin").live_grep, { desc = "[S]earch by [G]rep" })
+    vim.keymap.set("n", "<leader>sd", require("telescope.builtin").diagnostics, { desc = "[S]earch [D]iagnostics" })
+  end,
+}

lua/plugins/texlabconfig.lua

@@ -0,0 +1,40 @@
+return {
+  "f3fora/nvim-texlabconfig",
+  build = "go build",
+  dependencies = { "lervag/vimtex" },
+  config = function()
+    -- vimtex
+    vim.g.vimtex_view_method = "skim"
+    vim.g.vimtex_compiler_method = "tectonic"
+
+    -- nvim-texlabconfig
+    local tex_preview_executable = "/Applications/Skim.app/Contents/SharedSupport/displayline"
+    local tex_preview_args = { "%l", "%p", "%f" }
+    local texlab_build_executable = "tectonic"
+    local texlab_build_args = {
+      "-X",
+      "compile",
+      "%f",
+      "--synctex",
+      "--keep-logs",
+      "--keep-intermediates",
+    }
+    require("texlabconfig").setup({
+      cache_activate = true,
+      cache_filetypes = { "tex", "bib" },
+      reverse_search_edit_cmd = vim.cmd.edit,
+      settings = {
+        texlab = {
+          build = {
+            executable = texlab_build_executable,
+            args = texlab_build_args,
+          },
+          forwardSearch = {
+            executable = tex_preview_executable,
+            args = tex_preview_args,
+          },
+        },
+      },
+    })
+  end,
+}

lua/plugins/treesitter.lua

@@ -0,0 +1,128 @@
+return {
+  "nvim-treesitter/nvim-treesitter",
+  build = ":TSUpdate",
+  -- build = function()
+  --   pcall(require("nvim-treesitter.install").update({ with_sync = true }))
+  -- end,
+  dependencies = { "nvim-treesitter/nvim-treesitter-textobjects", "nvim-treesitter/playground" },
+  config = function()
+    require("nvim-treesitter.configs").setup({
+      -- Add languages to be installed here that you want installed for treesitter
+      ensure_installed = {
+        "c",
+        "cpp",
+        "go",
+        "lua",
+        "python",
+        "rust",
+        "typescript",
+        "help",
+        "vim",
+        "scala",
+        "bash",
+        "dockerfile",
+        "fish",
+        "git_rebase",
+        "gitattributes",
+        "gitcommit",
+        "gitignore",
+        "haskell",
+        "hocon",
+        "html",
+        "http",
+        "java",
+        "javascript",
+        "json",
+        "json5",
+        "latex",
+        "make",
+        "markdown_inline",
+        "nix",
+        "sql",
+        "terraform",
+        "yaml",
+      },
+
+      -- Install parsers synchronously (only applied to `ensure_installed`)
+      sync_install = false,
+
+      -- Automatically install missing parsers when entering buffer
+      -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
+      auto_install = true,
+
+      highlight = { enable = true },
+      indent = { enable = true, disable = { "python" } },
+      incremental_selection = {
+        enable = true,
+        keymaps = {
+          init_selection = "<c-space>",
+          node_incremental = "<c-space>",
+          scope_incremental = "<c-s>",
+          node_decremental = "<c-backspace>",
+        },
+      },
+      textobjects = {
+        select = {
+          enable = true,
+          lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
+          keymaps = {
+            -- You can use the capture groups defined in textobjects.scm
+            ["aa"] = "@parameter.outer",
+            ["ia"] = "@parameter.inner",
+            ["af"] = "@function.outer",
+            ["if"] = "@function.inner",
+            ["ac"] = "@class.outer",
+            ["ic"] = "@class.inner",
+          },
+        },
+        move = {
+          enable = true,
+          set_jumps = true, -- whether to set jumps in the jumplist
+          goto_next_start = {
+            ["]m"] = "@function.outer",
+            ["]]"] = "@class.outer",
+          },
+          goto_next_end = {
+            ["]M"] = "@function.outer",
+            ["]["] = "@class.outer",
+          },
+          goto_previous_start = {
+            ["[m"] = "@function.outer",
+            ["[["] = "@class.outer",
+          },
+          goto_previous_end = {
+            ["[M"] = "@function.outer",
+            ["[]"] = "@class.outer",
+          },
+        },
+        swap = {
+          enable = true,
+          swap_next = {
+            ["<leader>a"] = "@parameter.inner",
+          },
+          swap_previous = {
+            ["<leader>A"] = "@parameter.inner",
+          },
+          playground = {
+            enable = true,
+            disable = {},
+            updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code
+            persist_queries = false, -- Whether the query persists across vim sessions
+            keybindings = {
+              toggle_query_editor = "o",
+              toggle_hl_groups = "i",
+              toggle_injected_languages = "t",
+              toggle_anonymous_nodes = "a",
+              toggle_language_display = "I",
+              focus_language = "f",
+              unfocus_language = "F",
+              update = "R",
+              goto_node = "<cr>",
+              show_help = "?",
+            },
+          },
+        },
+      },
+    })
+  end,
+}