feat
This commit is contained in:
@ -109,3 +109,7 @@ vim.keymap.set("n", "<c-\\>", "<cmd>TmuxNavigatePrevious<cr>")
|
|||||||
-- Floating Terminal --
|
-- Floating Terminal --
|
||||||
vim.keymap.set("n", "<A-k>", "<cmd>ToggleTerm direction=float<cr>")
|
vim.keymap.set("n", "<A-k>", "<cmd>ToggleTerm direction=float<cr>")
|
||||||
vim.keymap.set("t", "<A-k>", "<cmd>ToggleTerm direction=float<cr>")
|
vim.keymap.set("t", "<A-k>", "<cmd>ToggleTerm direction=float<cr>")
|
||||||
|
|
||||||
|
-- TODO: shift this over now that lsp-config is no longer needed
|
||||||
|
-- doesnt work?
|
||||||
|
-- vim.lsp.enable("ty")
|
||||||
|
@ -8,6 +8,7 @@ return {
|
|||||||
lua = { "stylua" },
|
lua = { "stylua" },
|
||||||
rust = { "rustfmt", lsp_format = "fallback" },
|
rust = { "rustfmt", lsp_format = "fallback" },
|
||||||
javascript = { "prettierd", "prettier", stop_after_first = true },
|
javascript = { "prettierd", "prettier", stop_after_first = true },
|
||||||
|
python = { "ruff_format" },
|
||||||
},
|
},
|
||||||
format_on_save = {
|
format_on_save = {
|
||||||
lsp_format = "fallback",
|
lsp_format = "fallback",
|
||||||
@ -45,34 +46,6 @@ return {
|
|||||||
vim.cmd.colorscheme("gruvbox-material")
|
vim.cmd.colorscheme("gruvbox-material")
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
{ "hrsh7th/vim-vsnip" },
|
|
||||||
{ "hrsh7th/cmp-nvim-lsp" },
|
|
||||||
{
|
|
||||||
"hrsh7th/nvim-cmp",
|
|
||||||
config = function()
|
|
||||||
local cmp = require("cmp")
|
|
||||||
cmp.setup({
|
|
||||||
snippet = {
|
|
||||||
expand = function(args)
|
|
||||||
vim.fn["vsnip#anonymous"](args.body)
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
mapping = cmp.mapping.preset.insert({
|
|
||||||
["<C-b>"] = cmp.mapping.scroll_docs(-4),
|
|
||||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
|
||||||
["<C-Space>"] = cmp.mapping.complete(),
|
|
||||||
["<C-e>"] = cmp.mapping.abort(),
|
|
||||||
["<CR>"] = cmp.mapping.confirm({ select = true }),
|
|
||||||
}),
|
|
||||||
sources = cmp.config.sources({
|
|
||||||
{ name = "nvim_lsp" },
|
|
||||||
{ name = "vsnip" },
|
|
||||||
}, {
|
|
||||||
{ name = "buffer" },
|
|
||||||
}),
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"nvim-telescope/telescope.nvim",
|
"nvim-telescope/telescope.nvim",
|
||||||
dependencies = { "nvim-lua/plenary.nvim" },
|
dependencies = { "nvim-lua/plenary.nvim" },
|
||||||
@ -136,10 +109,8 @@ return {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"neovim/nvim-lspconfig",
|
"neovim/nvim-lspconfig",
|
||||||
dependencies = { "hrsh7th/cmp-nvim-lsp" },
|
|
||||||
config = function()
|
config = function()
|
||||||
local lsp = require("lspconfig")
|
local lsp = require("lspconfig")
|
||||||
local capabilities = require("cmp_nvim_lsp").default_capabilities()
|
|
||||||
|
|
||||||
lsp.lua_ls.setup({
|
lsp.lua_ls.setup({
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
@ -154,39 +125,79 @@ return {
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
lsp.vtsls.setup({
|
lsp.vtsls.setup({})
|
||||||
capabilities = capabilities,
|
|
||||||
})
|
|
||||||
|
|
||||||
lsp.zls.setup({
|
lsp.zls.setup({})
|
||||||
capabilities = capabilities,
|
|
||||||
})
|
|
||||||
|
|
||||||
lsp.rust_analyzer.setup({
|
lsp.rust_analyzer.setup({
|
||||||
capabilities = capabilities,
|
|
||||||
diagnostic = {
|
diagnostic = {
|
||||||
-- Prevents the annoying popup for cancalled requests
|
-- Prevents the annoying popup for cancalled requests
|
||||||
refreshSupport = false,
|
refreshSupport = false,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
lsp.gopls.setup({
|
lsp.gopls.setup({})
|
||||||
capabilities = capabilities,
|
lsp.tailwindcss.setup({})
|
||||||
})
|
lsp.ocamllsp.setup({})
|
||||||
lsp.tailwindcss.setup({
|
lsp.svelte.setup({})
|
||||||
capabilities = capabilities,
|
lsp.biome.setup({})
|
||||||
})
|
lsp.pylsp.setup({})
|
||||||
lsp.ocamllsp.setup({
|
lsp.svelte.setup({})
|
||||||
capabilities = capabilities,
|
|
||||||
})
|
|
||||||
lsp.svelte.setup({
|
|
||||||
capabilities = capabilities,
|
|
||||||
})
|
|
||||||
lsp.biome.setup({
|
|
||||||
capabilities = capabilities,
|
|
||||||
})
|
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"saghen/blink.cmp",
|
||||||
|
-- optional: provides snippets for the snippet source
|
||||||
|
dependencies = { "rafamadriz/friendly-snippets" },
|
||||||
|
|
||||||
|
-- use a release tag to download pre-built binaries
|
||||||
|
version = "1.*",
|
||||||
|
-- AND/OR build from source, requires nightly: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust
|
||||||
|
-- build = 'cargo build --release',
|
||||||
|
-- If you use nix, you can build from source using latest nightly rust with:
|
||||||
|
-- build = 'nix run .#build-plugin',
|
||||||
|
|
||||||
|
---@module 'blink.cmp'
|
||||||
|
---@type blink.cmp.Config
|
||||||
|
opts = {
|
||||||
|
-- 'default' (recommended) for mappings similar to built-in completions (C-y to accept)
|
||||||
|
-- 'super-tab' for mappings similar to vscode (tab to accept)
|
||||||
|
-- 'enter' for enter to accept
|
||||||
|
-- 'none' for no mappings
|
||||||
|
--
|
||||||
|
-- All presets have the following mappings:
|
||||||
|
-- C-space: Open menu or open docs if already open
|
||||||
|
-- C-n/C-p or Up/Down: Select next/previous item
|
||||||
|
-- C-e: Hide menu
|
||||||
|
-- C-k: Toggle signature help (if signature.enabled = true)
|
||||||
|
--
|
||||||
|
-- See :h blink-cmp-config-keymap for defining your own keymap
|
||||||
|
keymap = { preset = "enter" },
|
||||||
|
|
||||||
|
appearance = {
|
||||||
|
-- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
|
||||||
|
-- Adjusts spacing to ensure icons are aligned
|
||||||
|
nerd_font_variant = "mono",
|
||||||
|
},
|
||||||
|
|
||||||
|
-- (Default) Only show the documentation popup when manually triggered
|
||||||
|
completion = { documentation = { auto_show = false } },
|
||||||
|
|
||||||
|
-- Default list of enabled providers defined so that you can extend it
|
||||||
|
-- elsewhere in your config, without redefining it, due to `opts_extend`
|
||||||
|
sources = {
|
||||||
|
default = { "lsp", "path", "snippets" },
|
||||||
|
},
|
||||||
|
|
||||||
|
-- (Default) Rust fuzzy matcher for typo resistance and significantly better performance
|
||||||
|
-- You may use a lua implementation instead by using `implementation = "lua"` or fallback to the lua implementation,
|
||||||
|
-- when the Rust fuzzy matcher is not available, by using `implementation = "prefer_rust"`
|
||||||
|
--
|
||||||
|
-- See the fuzzy documentation for more information
|
||||||
|
fuzzy = { implementation = "prefer_rust_with_warning" },
|
||||||
|
},
|
||||||
|
opts_extend = { "sources.default" },
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"sindrets/diffview.nvim",
|
"sindrets/diffview.nvim",
|
||||||
},
|
},
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
* {
|
* {
|
||||||
font-family: "SpaceMono Nerd Font";
|
font-family: "SpaceMono Nerd Font";
|
||||||
font-size: 20px;
|
font-size: 16px;
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user