wip

nvim/lua/config/lazy.lua

@@ -29,7 +29,7 @@ require("lazy").setup({
   },
   -- Configure any other settings here. See the documentation for more details.
   -- colorscheme that will be used when installing plugins.
-  install = { colorscheme = { "habamax" } },
+  install = { colorscheme = { "onedark" } },
   -- automatically check for plugin updates
   checker = { enabled = false },
 })

nvim/lua/config/options.lua

@@ -4,6 +4,7 @@ vim.g.autoformat = false
 vim.opt.number = true
 vim.opt.relativenumber = true
 vim.opt.cursorline = true
+vim.opt.termguicolors = true
 
 vim.opt.tabstop = 2
 vim.opt.shiftwidth = 2
@@ -20,7 +21,8 @@ vim.opt.undofile = true
 
 vim.o.termguicolors = false
 vim.opt.guicursor = "n-v-c:block,i:block,r:block"
-vim.opt.fillchars = { eob = " " }
+
+--vim.opt.fillchars = { eob = " " }
 
 vim.cmd([[
   autocmd FileType python,haskell,c,cpp setlocal tabstop=4 shiftwidth=4 softtabstop=4

nvim/lua/plugins/bufferline.lua

@@ -0,0 +1,10 @@
+return {
+  {
+    "akinsho/bufferline.nvim",
+    version = "*",
+    dependencies = "nvim-tree/nvim-web-devicons",
+    config = function()
+      require("bufferline").setup{}
+    end
+  }
+}

nvim/lua/plugins/colorscheme.lua

@@ -23,6 +23,11 @@ return {
 
         hi TelescopeSelection guibg=Gray guifg=Green gui=bold ctermbg=Black ctermfg=Green cterm=bold
         hi TelescopePreviewMatch ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black
+
+        hi TreesitterContext guibg=NONE ctermbg=NONE
+
+        hi LazyProp guibg=NONE ctermbg=NONE
+        hi IblScope guibg=NONE guifg=Yellow ctermbg=NONE ctermfg=Yellow
 			]])
 
       vim.api.nvim_create_autocmd("TextYankPost", {

nvim/lua/plugins/indent-blankline.lua

@@ -1,5 +1,16 @@
 return {
   {
     "lukas-reineke/indent-blankline.nvim",
+    config = function()
+      require("ibl").setup({
+        --indent = { char = "│" },
+        --indent = { char = "⎸" },
+        indent = { char = "┆" },
+        scope = {
+          show_start = false,
+          show_end = false
+        },
+      })
+    end,
   }
 }

nvim/lua/plugins/lsp.lua

@@ -27,7 +27,6 @@ return {
         },
         auto_install = true,
         sync_install = true,
-        ignore_install = {},
       }
     end
   },
@@ -49,15 +48,14 @@ return {
 				zindex = 20, -- The Z-index of the context window
 				on_attach = nil, -- (fun(buf: integer): boolean) rurn false to disable attaching
 			})
-      vim.cmd([[
-        hi TreesitterContext guibg=NONE ctermbg=NONE
-      ]])
 		end,
 	},
 
   {
     "neovim/nvim-lspconfig",
     config = function()
+      local lsp = require('lspconfig')
+      lsp.lua_ls.setup{}
       require("which-key").add({
         { "<leader>cl", ":LspInfo<CR>", desc = "LSP Info" },
       })
@@ -66,7 +64,16 @@ return {
 
   {
     "williamboman/mason.nvim",
+    config = function()
+      require("mason").setup{}
+    end
+  },
+
+  {
     "williamboman/mason-lspconfig.nvim",
+    config = function()
+      require("mason-lspconfig").setup{}
+    end
   },
 
   {

nvim/lua/plugins/neotree.lua

@@ -16,9 +16,35 @@ return {
 				--  hijack_netrw_behavior = "disabled",
 				--},
 			})
+
+			local function toggle_neotree()
+				local api = vim.api
+				local win = api.nvim_get_current_win()
+				local bufs = api.nvim_list_bufs()
+
+				for _, buf in ipairs(bufs) do
+					local name = api.nvim_buf_get_name(buf)
+					if name:match("neo%-tree filesystem") then
+						api.nvim_command(":Neotree close")
+						return
+					end
+				end
+
+				api.nvim_command(":Neotree")
+			end
+
       require("which-key").add({
-        { "<leader>e", ":Neotree<CR>", desc = "Neotree" }
+        { "<leader>e", toggle_neotree, desc = "File Explorer" }
       })
+
+      vim.fn.sign_define("DiagnosticSignError",
+        {text = " ", texthl = "DiagnosticSignError"})
+      vim.fn.sign_define("DiagnosticSignWarn",
+        {text = " ", texthl = "DiagnosticSignWarn"})
+      vim.fn.sign_define("DiagnosticSignInfo",
+        {text = " ", texthl = "DiagnosticSignInfo"})
+      vim.fn.sign_define("DiagnosticSignHint",
+        {text = "󰌵", texthl = "DiagnosticSignHint"})
 		end,
 	},
 }

nvim/lua/plugins/telescope.lua

@@ -21,7 +21,6 @@ return {
     },
     config = function()
       -- Custom Telescope command to grep from Git root
-      vim.api.nvim_set_keymap('n', '<leader>lg', "<cmd>lua require('telescope.builtin').live_grep({ cwd = git_root() })<CR>", { noremap = true, silent = true })
       require("which-key").add({
         { "<leader>/", function()
             require('telescope.builtin').live_grep({ cwd = git_root() })
@@ -38,7 +37,7 @@ return {
         { "<leader>gi", ":Telescope lsp_implementations<CR>", desc = "Go to Implementations" },
         { "<leader>gt", ":Telescope lsp_type_definitions<CR>", desc = "Go to Type Definition" },
         { "<leader>cv", ":Telescope treesitter<CR>", desc = "List function names & variables" },
-        { "<leader>ca", ":Telescope diagnostics<CR>", desc = "Code diagnostics" },
+        { "<leader>cd", ":Telescope diagnostics<CR>", desc = "Code diagnostics" },
 
         -- Git
         { "<leader>Gt", ":Telescope git_branches<CR>", desc = "Git Branches" },