revamp of everything. sorta working

illuminate still doesn't work.

rust tools still don't work.

everything else works.

Author: spikegrobstein

init.lua

@@ -34,7 +34,7 @@ require('lazy').setup({
   'tpope/vim-rhubarb',
 
   -- Detect tabstop and shiftwidth automatically
-  --'tpope/vim-sleuth',
+  'tpope/vim-sleuth',
 
   -- NOTE: This is where your plugins related to LSP can be installed.
   --  The configuration is done below. Search for lspconfig to find it below.
@@ -48,18 +48,50 @@ require('lazy').setup({
 
       -- Useful status updates for LSP
       -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
-      { 'j-hui/fidget.nvim', tag = 'legacy', opts = {} },
+      { 'j-hui/fidget.nvim', opts = {} },
 
       -- Additional lua configuration, makes nvim stuff amazing!
       'folke/neodev.nvim',
     },
   },
 
+  {
+    -- Autocompletion
+    'hrsh7th/nvim-cmp',
+    dependencies = {
+      -- Snippet Engine & its associated nvim-cmp source
+      'L3MON4D3/LuaSnip',
+      'saadparwaiz1/cmp_luasnip',
+
+      -- Adds LSP completion capabilities
+      'hrsh7th/cmp-nvim-lsp',
+
+      -- Adds a number of user-friendly snippets
+      'rafamadriz/friendly-snippets',
+    },
+    opts = function()
+      local cmp_window = require 'cmp.config.window'
+      return {
+        window = {
+          completion = cmp_window.bordered {
+            winhighlight = 'Normal:Normal,FloatBorder:FloatBorder,CursorLine:PmenuSel,Search:None',
+          },
+          documentation = cmp_window.bordered {
+            winhighlight = 'Normal:Normal,FloatBorder:FloatBorder,CursorLine:PmenuSel,Search:None',
+          },
+        },
+        --mapping = {
+        ---- pressing return should not select item
+        --["<CR>"] = vim.NIL,
+        --},
+      }
+    end,
+  },
+
   -- Useful plugin to show you pending keybinds.
   { 'folke/which-key.nvim', opts = {} },
-
-  -- Adds git related signs to the gutter, as well as utilities for managing changes
   {
+    -- Adds git related signs to the gutter, as well as utilities for managing changes
     'lewis6991/gitsigns.nvim',
     opts = {
       -- See `:help gitsigns.txt`
@@ -97,14 +129,28 @@ require('lazy').setup({
     },
   },
 
-  -- Set lualine as statusline
+  -- colorscheme
   {
+    'folke/tokyonight.nvim',
+    lazy = false,
+    priority = 1000,
+    opts = {
+      dim_inactive = true,
+      style = 'night',
+      on_colors = function(colors)
+        colors.border = colors.yellow
+      end,
+    },
+  },
+
+  {
+    -- Set lualine as statusline
     'nvim-lualine/lualine.nvim',
     -- See `:help lualine.txt`
     opts = {
       options = {
         icons_enabled = true,
-        theme = 'onedark',
+        theme = 'tokyonight',
         component_separators = '|',
         section_separators = '',
       },
@@ -117,11 +163,33 @@ require('lazy').setup({
   ---- Enable `lukas-reineke/indent-blankline.nvim`
   ---- See `:help ibl`
   --main = 'ibl',
-  --opts = {
-  --scope = { enabled = false },
-  --},
+  --opts = {},
   --},
 
+  -- "gc" to comment visual regions/lines
+  --{ 'numToStr/Comment.nvim', opts = {} },
+
+  -- Fuzzy Finder (files, lsp, etc)
+  {
+    'nvim-telescope/telescope.nvim',
+    branch = '0.1.x',
+    dependencies = {
+      'nvim-lua/plenary.nvim',
+      -- Fuzzy Finder Algorithm which requires local dependencies to be built.
+      -- Only load if `make` is available. Make sure you have the system
+      -- requirements installed.
+      {
+        'nvim-telescope/telescope-fzf-native.nvim',
+        -- NOTE: If you are having trouble with this installation,
+        --       refer to the README for telescope-fzf-native for more instructions.
+        build = 'make',
+        cond = function()
+          return vim.fn.executable 'make' == 1
+        end,
+      },
+    },
+  },
+
   {
     -- Highlight, edit, and navigate code
     'nvim-treesitter/nvim-treesitter',
@@ -133,6 +201,7 @@ require('lazy').setup({
 
   { import = 'plugins' },
 }, {
+  install = { colorscheme = { 'tokyonight', 'habamax' } },
 })
 
 require 'config.options'
@@ -142,6 +211,7 @@ require 'config.telescope'
 require 'config.treesitter'
 require 'config.lsp'
 require 'config.completion'
+
 require 'config.highlight-yank'
 
 require 'config.rust'

lua/config/lsp.lua

@@ -67,17 +67,20 @@ require('mason-lspconfig').setup()
 --  If you want to override the default filetypes that your language server will attach to you can
 --  define the property 'filetypes' to the map in question.
 local servers = {
-   clangd = {},
+  clangd = {},
   -- gopls = {},
   -- pyright = {},
   rust_analyzer = {
     keys = {
-      { "K",          "<cmd>RustHoverActions<cr>", desc = "Hover Actions (Rust)" },
-      { "<leader>cR", "<cmd>RustCodeAction<cr>",   desc = "Code Action (Rust)" },
-      { "<leader>dr", "<cmd>RustDebuggables<cr>",  desc = "Run Debuggables (Rust)" },
+      { 'K', '<cmd>RustHoverActions<cr>', desc = 'Hover Actions (Rust)' },
+      { '<leader>cR', '<cmd>RustCodeAction<cr>', desc = 'Code Action (Rust)' },
+      { '<leader>dr', '<cmd>RustDebuggables<cr>', desc = 'Run Debuggables (Rust)' },
+      { '<F4>', '<cmd>RustOpenExternalDocs<cr>', { desc = 'Open documentation', remap = true } },
+      { '<F5>', '<cmd>RustReloadWorkspace<CR>', { desc = 'Reload the rust workspace', remap = true } },
+      { '<F6>', '<cmd>RustCodeAction<CR>', { desc = 'Show code action menu.', remap = true } },
     },
     settings = {
-      ["rust-analyzer"] = {
+      ['rust-analyzer'] = {
         cargo = {
           allFeatures = true,
           loadOutDirsFromCheck = true,
@@ -86,21 +89,21 @@ local servers = {
         -- Add clippy lints for Rust.
         checkOnSave = {
           allFeatures = true,
-          command = "clippy",
-          extraArgs = { "--no-deps" },
+          command = 'clippy',
+          extraArgs = { '--no-deps' },
         },
         procMacro = {
           enable = true,
           ignored = {
-            ["async-trait"] = { "async_trait" },
-            ["napi-derive"] = { "napi" },
-            ["async-recursion"] = { "async_recursion" },
+            ['async-trait'] = { 'async_trait' },
+            ['napi-derive'] = { 'napi' },
+            ['async-recursion'] = { 'async_recursion' },
           },
         },
       },
     },
   },
-   tsserver = {},
+  tsserver = {},
   -- html = { filetypes = { 'html', 'twig', 'hbs'} },
 
   lua_ls = {
@@ -112,22 +115,18 @@ local servers = {
 }
 
 -- make lsp windows bordered
-local _border = "single"
+local _border = 'single'
 
-vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(
-  vim.lsp.handlers.hover, {
-    border = _border
-  }
-)
+vim.lsp.handlers['textDocument/hover'] = vim.lsp.with(vim.lsp.handlers.hover, {
+  border = _border,
+})
 
-vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(
-  vim.lsp.handlers.signature_help, {
-    border = _border
-  }
-)
+vim.lsp.handlers['textDocument/signatureHelp'] = vim.lsp.with(vim.lsp.handlers.signature_help, {
+  border = _border,
+})
 
 vim.diagnostic.config {
-  float = { border = _border }
+  float = { border = _border },
 }
 
 -- Setup neovim lua configuration

lua/config/options.lua

@@ -43,7 +43,7 @@ vim.opt.shiftwidth = 2
 vim.opt.winminwidth = 5
 
 -- rust debugging support
-vim.api.nvim_command("packadd termdebug")
-vim.g.termdebugger = "rust-gdb"
+vim.api.nvim_command 'packadd termdebug'
+vim.g.termdebugger = 'rust-gdb'
 
-vim.cmd.colorscheme 'tokyonight'
+vim.cmd.colorscheme 'tokyonight-night'

lua/config/rust.lua

@@ -1,13 +1,3 @@
--- rust keybindings... this is only valid for rust files
-vim.api.nvim_create_autocmd("FileType", {
-  pattern = { "rust" },
-  callback = function()
-    --local rt = require('rust-tools')
-    --rt.inlay_hints.enable()
-
-    vim.keymap.set("n", "<F4>", "<cmd>RustOpenExternalDocs<cr>", { desc = "Open documentation", remap = true })
-    vim.keymap.set("n", "<F5>", "<cmd>RustReloadWorkspace<CR>", { desc = "Reload the rust workspace", remap = true })
-    vim.keymap.set("n", "<F6>", "<cmd>RustCodeAction<CR>", { desc = "Show code action menu.", remap = true })
-  end,
-})
+local rt = require("rust-tools")
 
+rt.setup({})

lua/config/treesitter.lua

@@ -4,7 +4,29 @@
 vim.defer_fn(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', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim', 'bash', 'jq', 'make', 'toml', 'markdown', 'markdown_inline', 'regex', 'yaml', 'json' },
+    ensure_installed = {
+      'bash',
+      'c',
+      'cpp',
+      'go',
+      'javascript',
+      'jq',
+      'json',
+      'lua',
+      'make',
+      'markdown',
+      'markdown_inline',
+      'python',
+      'regex',
+      'ron',
+      'rust',
+      'toml',
+      'tsx',
+      'typescript',
+      'vim',
+      'vimdoc',
+      'yaml',
+    },
 
     -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
     auto_install = true,
@@ -20,6 +42,9 @@ vim.defer_fn(function()
         node_decremental = '<M-space>',
       },
     },
+    endwise = {
+      enable = true,
+    },
     textobjects = {
       select = {
         enable = true,
@@ -66,4 +91,3 @@ vim.defer_fn(function()
     },
   }
 end, 0)
-

lua/plugins/colorscheme.lua

@@ -1,3 +1,6 @@
 return {
-  "RRethy/nvim-treesitter-endwise"
+  "RRethy/nvim-treesitter-endwise",
+  dependencies = {
+    "nvim-treesitter/nvim-treesitter"
+  }
 }

lua/plugins/endwise.lua

@@ -12,4 +12,30 @@ return {
     { "]]", desc = "Next Reference" },
     { "[[", desc = "Prev Reference" },
   },
+
+  -- I think this is just for LazyVim and not a normal lazy.nvim feature
+  config = function(_, opts)
+    require("illuminate").configure(opts)
+
+       local function map(key, dir, buffer)
+      vim.keymap.set("n", key, function()
+        require("illuminate")["goto_" .. dir .. "_reference"](false)
+      end, { desc = dir:sub(1, 1):upper() .. dir:sub(2) .. " Reference", buffer = buffer })
+    end
+
+    map("]]", "next")
+    map("[[", "prev")
+
+    -- also set it after loading ftplugins, since a lot overwrite [[ and ]]
+    vim.api.nvim_create_autocmd("FileType", {
+      callback = function()
+        local buffer = vim.api.nvim_get_current_buf()
+        map("]]", "next", buffer)
+        map("[[", "prev", buffer)
+      end,
+    })
+  end,
+  dependencies = {
+    "nvim-treesitter/nvim-treesitter"
+  }
 }