d_mcknight/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: d_mcknight:d02c29901cc748688a7bd6a74b19490ce88176e3
Branches Tags
d_mcknight:main
..
compare: d_mcknight:f41642c843e01b2daf5cdadb78b0821e18e1109a
Branches Tags
d_mcknight:main

No commits in common. "d02c29901cc748688a7bd6a74b19490ce88176e3" and "f41642c843e01b2daf5cdadb78b0821e18e1109a" have entirely different histories.
d02c29901c ... f41642c843

4 changed files with 64 additions and 166 deletions
Show stats Expand all files Collapse all files

7
.config/nvim/init.lua
View file

@ -18,12 +18,6 @@ vim.cmd("set splitright")
vim.cmd("set spl=en_us spell") vim.cmd("set spl=en_us spell")
vim.opt.guifont = "JetBrainsMonoNerdFontMono:14" vim.opt.guifont = "JetBrainsMonoNerdFontMono:14"
-- Customize window border
vim.diagnostic.config({
float = {
border = "single",
},})
-- Custom Key Binds -- Custom Key Binds
vim.g.mapleader = " " vim.g.mapleader = " "
@ -33,7 +27,6 @@ require("config.lazy")
-- Configure nvim Keymaps -- Configure nvim Keymaps
vim.keymap.set("n", "<leader>r", ":source %<CR>", { desc = "Reload Config" }) vim.keymap.set("n", "<leader>r", ":source %<CR>", { desc = "Reload Config" })
vim.keymap.set("n", "<leader>bs", ":vsplit<CR>", { desc = "Vertical Split" }) vim.keymap.set("n", "<leader>bs", ":vsplit<CR>", { desc = "Vertical Split" })
vim.keymap.set("n", "<leader>vm", ":lua vim.diagnostic.open_float()<CR>", { desc = "Show Diagnostic Message" })
-- remap yank to system clipboard -- remap yank to system clipboard
vim.keymap.set("n", "<leader>y", '"+y', { desc = "Yank to Clipboard" }) vim.keymap.set("n", "<leader>y", '"+y', { desc = "Yank to Clipboard" })

85
.config/nvim/lua/plugins/debugging.lua
View file

@ -1,85 +0,0 @@
return {
{
"mfussenegger/nvim-dap",
config = function()
local dap = require("dap")
vim.keymap.set("n", "<Leader>db", dap.toggle_breakpoint, { desc = "Toggle Breakpoint" })
vim.keymap.set("n", "<Leader>dc", dap.continue, { desc = "Start/Continue" })
vim.keymap.set("n", "<Leader>do", dap.step_over, { desc = "Step Over" })
vim.keymap.set("n", "<Leader>di", dap.step_into, { desc = "Step Into" })
vim.keymap.set("n", "<Leader>dt", dap.terminate, { desc = "Terminate Session" })
end,
},
{
"rcarriga/nvim-dap-ui",
dependencies = {
"mfussenegger/nvim-dap",
"mfussenegger/nvim-dap-python",
"nvim-neotest/nvim-nio",
},
config = function()
require("dapui").setup({
layouts = {
{
elements = {
{ id = "scopes", size = 0.5 },
{ id = "breakpoints", size = 0.25 },
--{ id = "stacks", size = 0.25 },
{ id = "watches", size = 0.25 },
},
size = 0.3,
position = "left",
},
{
elements = {
{ id = "console", size = 0.6 },
{ id = "repl", size = 0.4 },
},
size = 10,
position = "bottom",
},
},
})
require("dap-python").setup("uv")
local dap = require("dap")
dap.listeners.after.event_initialized["dapui_config"] = function()
require("dapui").open()
end
dap.listeners.before.event_terminated["dapui_config"] = function()
require("dapui").close()
end
dap.listeners.before.event_exited["dapui_config"] = function()
require("dapui").close()
end
end,
},
{
"linux-cultist/venv-selector.nvim",
branch = "regexp",
lazy = false,
dependencies = {
"neovim/nvim-lspconfig",
"mfussenegger/nvim-dap",
"mfussenegger/nvim-dap-python",
{ "nvim-telescope/telescope.nvim", branch = "0.1.x", dependencies = { "nvim-lua/plenary.nvim" } },
},
keys = {
{ "<Leader>ea", "<cmd>VenvSelect<cr>", desc = "Activate Virtual Environment" },
{ "<Leader>es", "<cmd>lua print(require('venv-selector').venv())<cr>", desc = "Show Active Virtual Environment" },
},
opts = {
search = {
vscode_venvs = {
command = "fdfind -p '.*/bin/python$' ~/VSCode/.venvs",
},
code_venvs = {
command = "fdfind -p '.*/bin/python$' ~/Code/.venvs",
},
},
},
},
}

136
.config/nvim/lua/plugins/language-server.lua
View file

@ -1,75 +1,65 @@
return { return {
{ {
"mason-org/mason.nvim", "mason-org/mason.nvim",
tag = "v1.11.0", tag = "v1.11.0",
config = function() config = function()
require("mason").setup({}) require("mason").setup({})
end, end,
}, },
{ {
"mason-org/mason-lspconfig.nvim", "mason-org/mason-lspconfig.nvim",
tag = "v1.32.0", tag = "v1.32.0",
config = function() config = function()
require("mason-lspconfig").setup({ require("mason-lspconfig").setup({
ensure_installed = { ensure_installed = {
"lua_ls", "lua_ls",
"bashls", "bashls",
"dockerls", "dockerls",
--"gh-actions-language-server", --"gh-actions-language-server",
"helm_ls", "helm_ls",
"jsonls", "jsonls",
"marksman", "marksman",
"nginx_language_server", "nginx_language_server",
"pyright", "ruff",
"ruff", "yamlls",
"yamlls", },
}, })
}) end,
end, },
}, {
{ "nvimtools/none-ls.nvim",
"nvimtools/none-ls.nvim", config = function()
config = function() local null_ls = require("null-ls")
local null_ls = require("null-ls") null_ls.setup({
null_ls.setup({ sources = {
sources = { null_ls.builtins.formatting.stylua,
null_ls.builtins.formatting.stylua, null_ls.builtins.formatting.mdformat,
null_ls.builtins.formatting.mdformat, },
}, })
}) vim.keymap.set("n", "<leader>af", vim.lsp.buf.format, { desc = "Auto-Format File" })
vim.keymap.set("n", "<leader>af", vim.lsp.buf.format, { desc = "Auto-Format File" }) end,
end, },
}, {
{ "neovim/nvim-lspconfig",
"neovim/nvim-lspconfig", tag = "v1.8.0",
tag = "v1.8.0", config = function()
lazy = true, local capabilities = require("cmp_nvim_lsp").default_capabilities()
event = { "BufReadPost", "BufNewFile" }, local lspconfig = require("lspconfig")
dependencies = { lspconfig.ts_ls.setup({
"mason-org/mason.nvim", capabilities = capabilities,
"mason-org/mason-lspconfig.nvim", })
}, lspconfig.lua_ls.setup({ capabilities = capabilities })
config = function() lspconfig.bashls.setup({ capabilities = capabilities })
local capabilities = require("cmp_nvim_lsp").default_capabilities() lspconfig.dockerls.setup({ capabilities = capabilities })
local lspconfig = require("lspconfig") lspconfig.helm_ls.setup({ capabilities = capabilities })
lspconfig.ts_ls.setup({ lspconfig.jsonls.setup({ capabilities = capabilities })
capabilities = capabilities, lspconfig.nginx_language_server.setup({ capabilities = capabilities })
}) lspconfig.marksman.setup({ capabilities = capabilities })
lspconfig.lua_ls.setup({ capabilities = capabilities }) lspconfig.ruff.setup({ capabilities = capabilities })
lspconfig.bashls.setup({ capabilities = capabilities }) lspconfig.yamlls.setup({ capabilities = capabilities })
lspconfig.dockerls.setup({ capabilities = capabilities }) vim.keymap.set("n", "<leader>d", vim.lsp.buf.hover, { desc = "Show Docstring" })
lspconfig.helm_ls.setup({ capabilities = capabilities }) vim.keymap.set("n", "<leader>gt", vim.lsp.buf.definition, { desc = "Go To Definition" })
lspconfig.jsonls.setup({ capabilities = capabilities }) vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, { desc = "Show Code Actions" })
lspconfig.nginx_language_server.setup({ capabilities = capabilities }) end,
lspconfig.marksman.setup({ capabilities = capabilities }) },
lspconfig.pyright.setup({ capabilities = capabilities })
lspconfig.ruff.setup({
capabilities = capabilities,
})
lspconfig.yamlls.setup({ capabilities = capabilities })
vim.keymap.set("n", "<leader>vd", vim.lsp.buf.hover, { desc = "View Docstring" })
vim.keymap.set("n", "<leader>gt", vim.lsp.buf.definition, { desc = "Go To Definition" })
vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, { desc = "Show Code Actions" })
end,
},
} }

2
.config/nvim/lua/plugins/theme.lua
View file

@ -10,6 +10,6 @@ return {
}, },
}) })
vim.cmd("colorscheme github_dark_default") vim.cmd("colorscheme github_dark_default")
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "#222222" }) vim.api.nvim_set_hl(0, "NormalFloat", { bg = "#0d1117" })
end, end,
} }