Compare commits
No commits in common. "f41642c843e01b2daf5cdadb78b0821e18e1109a" and "05874830dd743dcbc0c9478aedcbb0ba5a70466e" have entirely different histories.
f41642c843
...
05874830dd
4 changed files with 9 additions and 92 deletions
|
@ -12,12 +12,10 @@ vim.cmd("set shiftwidth=2")
|
||||||
|
|
||||||
-- Configure Editor Settings
|
-- Configure Editor Settings
|
||||||
vim.cmd("set number")
|
vim.cmd("set number")
|
||||||
vim.cmd("set scrolloff=8")
|
|
||||||
vim.cmd("set splitbelow")
|
vim.cmd("set splitbelow")
|
||||||
vim.cmd("set splitright")
|
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"
|
||||||
|
|
||||||
-- Custom Key Binds
|
-- Custom Key Binds
|
||||||
vim.g.mapleader = " "
|
vim.g.mapleader = " "
|
||||||
|
|
||||||
|
@ -26,11 +24,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" })
|
|
||||||
|
|
||||||
-- remap yank to system clipboard
|
|
||||||
vim.keymap.set("n", "<leader>y", '"+y', { desc = "Yank to Clipboard" })
|
|
||||||
vim.keymap.set("v", "<leader>y", '"+y', { desc = "Yank to Clipboard" })
|
|
||||||
|
|
||||||
-- Configure Telescope Keymaps
|
-- Configure Telescope Keymaps
|
||||||
local builtin = require("telescope.builtin")
|
local builtin = require("telescope.builtin")
|
||||||
|
|
|
@ -28,31 +28,4 @@ return {
|
||||||
-- vim.g.barbar_auto_setup = false
|
-- vim.g.barbar_auto_setup = false
|
||||||
--end,
|
--end,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"goolord/alpha-nvim",
|
|
||||||
vim.keymap.set("n", "<A-left>", ":BufferPrevious<CR>", { desc = "Previous Buffer" }),
|
|
||||||
vim.keymap.set("n", "<A-right>", ":BufferNext<CR>", { desc = "Next Buffer" }),
|
|
||||||
vim.keymap.set("n", "<leader>bq", ":BufferClose<CR>", { desc = "Close Buffer" }),
|
|
||||||
vim.keymap.set("n", "<A-q>", ":BufferClose<CR>", { desc = "Close Buffer" }),
|
|
||||||
vim.keymap.set("n", "<leader>bp", ":BufferPrevious<CR>", { desc = "Previous Buffer" }),
|
|
||||||
vim.keymap.set("n", "<leader>bn", ":BufferNext<CR>", { desc = "Next Buffer" }),
|
|
||||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
|
||||||
config = function()
|
|
||||||
local alpha = require("alpha")
|
|
||||||
local dashboard = require("alpha.themes.startify")
|
|
||||||
|
|
||||||
dashboard.section.header.val = {
|
|
||||||
" ",
|
|
||||||
" ███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗ ",
|
|
||||||
" ████╗ ██║██╔════╝██╔═══██╗██║ ██║██║████╗ ████║ ",
|
|
||||||
" ██╔██╗ ██║█████╗ ██║ ██║██║ ██║██║██╔████╔██║ ",
|
|
||||||
" ██║╚██╗██║██╔══╝ ██║ ██║╚██╗ ██╔╝██║██║╚██╔╝██║ ",
|
|
||||||
" ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║ ",
|
|
||||||
" ╚═╝ ╚═══╝╚══════╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝ ",
|
|
||||||
" ",
|
|
||||||
}
|
|
||||||
|
|
||||||
alpha.setup(dashboard.opts)
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,45 +0,0 @@
|
||||||
return {
|
|
||||||
{
|
|
||||||
"L3MON4D3/LuaSnip",
|
|
||||||
dependencies = {
|
|
||||||
"saadparwaiz1/cmp_luasnip", -- Snippets source for nvim-cmp
|
|
||||||
"rafamadriz/friendly-snippets", -- Collection of snippets
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"hrsh7th/nvim-cmp",
|
|
||||||
config = function()
|
|
||||||
require("luasnip.loaders.from_vscode").lazy_load() -- Load snippets from friendly-snippets
|
|
||||||
local cmp = require("cmp")
|
|
||||||
|
|
||||||
cmp.setup({
|
|
||||||
snippet = {
|
|
||||||
-- REQUIRED - you must specify a snippet engine
|
|
||||||
expand = function(args)
|
|
||||||
require("luasnip").lsp_expand(args.body) -- For `luasnip` users.
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
window = {
|
|
||||||
completion = cmp.config.window.bordered(),
|
|
||||||
documentation = cmp.config.window.bordered(),
|
|
||||||
},
|
|
||||||
mapping = cmp.mapping.preset.insert({
|
|
||||||
["<C-PageUp>"] = cmp.mapping.scroll_docs(-4),
|
|
||||||
["<C-PageDown>"] = cmp.mapping.scroll_docs(4),
|
|
||||||
["<C-Space>"] = cmp.mapping.complete(),
|
|
||||||
["<C-e>"] = cmp.mapping.abort(),
|
|
||||||
["<CR>"] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
|
|
||||||
}),
|
|
||||||
sources = cmp.config.sources({
|
|
||||||
--{ name = "nvim_lsp" },
|
|
||||||
{ name = "luasnip" }, -- For luasnip users.
|
|
||||||
}, {
|
|
||||||
{ name = "buffer" },
|
|
||||||
}),
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"hrsh7th/cmp-nvim-lsp",
|
|
||||||
},
|
|
||||||
}
|
|
|
@ -43,20 +43,16 @@ return {
|
||||||
"neovim/nvim-lspconfig",
|
"neovim/nvim-lspconfig",
|
||||||
tag = "v1.8.0",
|
tag = "v1.8.0",
|
||||||
config = function()
|
config = function()
|
||||||
local capabilities = require("cmp_nvim_lsp").default_capabilities()
|
|
||||||
local lspconfig = require("lspconfig")
|
local lspconfig = require("lspconfig")
|
||||||
lspconfig.ts_ls.setup({
|
lspconfig.lua_ls.setup({})
|
||||||
capabilities = capabilities,
|
lspconfig.bashls.setup({})
|
||||||
})
|
lspconfig.dockerls.setup({})
|
||||||
lspconfig.lua_ls.setup({ capabilities = capabilities })
|
lspconfig.helm_ls.setup({})
|
||||||
lspconfig.bashls.setup({ capabilities = capabilities })
|
lspconfig.jsonls.setup({})
|
||||||
lspconfig.dockerls.setup({ capabilities = capabilities })
|
lspconfig.nginx_language_server.setup({})
|
||||||
lspconfig.helm_ls.setup({ capabilities = capabilities })
|
lspconfig.marksman.setup({})
|
||||||
lspconfig.jsonls.setup({ capabilities = capabilities })
|
lspconfig.ruff.setup({})
|
||||||
lspconfig.nginx_language_server.setup({ capabilities = capabilities })
|
lspconfig.yamlls.setup({})
|
||||||
lspconfig.marksman.setup({ capabilities = capabilities })
|
|
||||||
lspconfig.ruff.setup({ capabilities = capabilities })
|
|
||||||
lspconfig.yamlls.setup({ capabilities = capabilities })
|
|
||||||
vim.keymap.set("n", "<leader>d", vim.lsp.buf.hover, { desc = "Show Docstring" })
|
vim.keymap.set("n", "<leader>d", vim.lsp.buf.hover, { desc = "Show Docstring" })
|
||||||
vim.keymap.set("n", "<leader>gt", vim.lsp.buf.definition, { desc = "Go To Definition" })
|
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" })
|
vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, { desc = "Show Code Actions" })
|
||||||
|
|
Loading…
Reference in a new issue