From 84f5fadb056dca17b4a57cd0a88d99fe30c77117 Mon Sep 17 00:00:00 2001 From: ak56 Date: Thu, 9 May 2024 20:51:41 -0400 Subject: [PATCH] Update nvim config --- README.md | 2 +- init.lua | 16 +++++++++++++--- lua/custom/plugins/filetree.lua | 6 ++++-- lua/kickstart/plugins/debug.lua | 26 ++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ef119d21..0641266a 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ In the file: `lua/custom/plugins/filetree.lua`, add: ```lua -- Unless you are still migrating, remove the deprecated commands from v1.x -vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]]) +-- vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]]) return { "nvim-neo-tree/neo-tree.nvim", diff --git a/init.lua b/init.lua index 73edbca2..4b15086e 100644 --- a/init.lua +++ b/init.lua @@ -174,7 +174,7 @@ require('lazy').setup({ -- These are some example plugins that I've included in the kickstart repository. -- Uncomment any of the lines below to enable them. -- require 'kickstart.plugins.autoformat', - -- require 'kickstart.plugins.debug', + require 'kickstart.plugins.debug', -- NOTE: The import below automatically adds your own plugins, configuration, etc from `lua/custom/plugins/*.lua` -- You can use this folder to prevent any conflicts with this init.lua if you're interested in keeping @@ -207,9 +207,18 @@ vim.o.clipboard = 'unnamedplus' -- Enable break indent vim.o.breakindent = true +-- Whitespace +vim.o.expandtab = true +vim.o.shiftwidth = 4 +vim.o.softtabstop = 4 +vim.o.tabstop = 4 + -- Save undo history vim.o.undofile = true +-- Shows current line highlight +vim.o.cursorline = true + -- Case insensitive searching UNLESS /C or capital in search vim.o.ignorecase = true vim.o.smartcase = true @@ -227,6 +236,7 @@ vim.o.completeopt = 'menuone,noselect' -- NOTE: You should make sure your terminal supports this vim.o.termguicolors = true +vim.o.guifont = "JetBrainsMono NFM" -- [[ Basic Keymaps ]] @@ -406,10 +416,10 @@ end -- 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 = {}, + clangd = {}, -- gopls = {}, -- pyright = {}, - -- rust_analyzer = {}, + rust_analyzer = {}, -- tsserver = {}, lua_ls = { diff --git a/lua/custom/plugins/filetree.lua b/lua/custom/plugins/filetree.lua index 55580ad2..97ad3d85 100644 --- a/lua/custom/plugins/filetree.lua +++ b/lua/custom/plugins/filetree.lua @@ -1,6 +1,5 @@ -- Unless you are still migrating, remove the deprecated commands from v1.x vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]]) - return { "nvim-neo-tree/neo-tree.nvim", version = "*", @@ -10,6 +9,9 @@ return { "MunifTanjim/nui.nvim", }, config = function () - require('neo-tree').setup {} + require('neo-tree').setup { + vim.keymap.set('n', 'sn', require('neo-tree').show, { desc = '[S]how [N]eotree' }), + vim.keymap.set('n', 'fn', require('neo-tree').float, { desc = '[F]loat [N]eotree' }) + } end, } diff --git a/lua/kickstart/plugins/debug.lua b/lua/kickstart/plugins/debug.lua index deeda564..a6062be0 100644 --- a/lua/kickstart/plugins/debug.lua +++ b/lua/kickstart/plugins/debug.lua @@ -39,6 +39,8 @@ return { ensure_installed = { -- Update this to ensure that you have the debuggers for the langs you want 'delve', + 'c', + 'cpp' }, } @@ -52,6 +54,30 @@ return { dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ') end) + -- LLVM (Low Level Virtual Machine) + dap.adapters.lldb = { + type = 'executable', + command = 'lldb-vscode', -- adjust as needed, must be absolute path + --args: string[], -- arguments for the command + name = 'lldb' + } + + dap.configurations.cpp = { + { + name = "Launch", + type = "lldb", + request = "launch", + program = function() + return vim.fn.input('Path to executable: ' .. vim.fn.getcwd() .. '/' .. 'file') + end, + stopOnEntry = false, + args = {}, + runInTerminal = true, + }, + } + dap.configurations.c = dap.configurations.cpp + dap.configurations.rust = dap.configurations.cpp + -- Dap UI setup -- For more information, see |:help nvim-dap-ui| dapui.setup {