Archived
0
0
Fork 0

Compare commits

..

10 commits

17 changed files with 108 additions and 31 deletions

View file

@ -49,7 +49,3 @@ vim.cmd("set iskeyword+=-")
vim.cmd("set formatoptions-=cro") vim.cmd("set formatoptions-=cro")
vim.cmd("set foldmethod=expr") vim.cmd("set foldmethod=expr")
vim.cmd("set foldexpr=nvim_treesitter#foldexpr()") vim.cmd("set foldexpr=nvim_treesitter#foldexpr()")
vim.cmd(
"let g:clipboard = { 'copy': { '+': 'xsel', '*': 'xsel' }, 'paste': { '+': 'xsel', '*': 'xsel' }, 'cache_enabled': 0 }"
)

View file

@ -0,0 +1,30 @@
local bufferline = require("bufferline")
bufferline.setup({
options = {
numbers = "ordinal",
close_command = "Bdelete! %d",
right_mouse_command = "Bdelete! %d",
left_mouse_command = "buffer %d",
middle_mouse_command = nil,
buffer_close_icon = "",
modified_icon = "",
close_icon = "",
left_trunc_marker = "",
right_trunc_marker = "",
max_name_length = 30,
max_prefix_length = 30,
tab_size = 21,
diagnostics = "nvim_lsp",
diagnostics_update_in_insert = true,
show_buffer_icons = true,
show_buffer_close_icons = true,
show_close_icon = true,
show_tab_indicators = true,
persist_buffer_sort = true,
separator_style = "thin",
enforce_regular_tabs = true,
always_show_bufferline = true,
},
})

View file

@ -22,6 +22,22 @@ if present then
lsp_saga = true, lsp_saga = true,
treesitter_context = true, treesitter_context = true,
ts_rainbow = true, ts_rainbow = true,
native_lsp = {
enabled = true,
virtual_text = {
errors = { "italic" },
hints = { "italic" },
warnings = { "italic" },
information = { "italic" },
},
underlines = {
errors = { "underline" },
hints = { "underline" },
warnings = { "underline" },
information = { "underline" },
},
},
which_key = true,
}, },
}) })

View file

@ -14,6 +14,7 @@ cmp.setup({
{ name = "vsnip" }, { name = "vsnip" },
{ name = "buffer" }, { name = "buffer" },
{ name = "path" }, { name = "path" },
{ name = "crates" },
}, },
confirm_opts = { confirm_opts = {
behavior = cmp.ConfirmBehavior.Replace, behavior = cmp.ConfirmBehavior.Replace,

View file

@ -81,6 +81,6 @@ capabilities.textDocument.completion.completionItem.snippetSupport = true
local cmp_lsp = require("cmp_nvim_lsp") local cmp_lsp = require("cmp_nvim_lsp")
M.capabilities = cmp_lsp.update_capabilities(capabilities) M.capabilities = cmp_lsp.default_capabilities(capabilities)
return M return M

View file

@ -5,3 +5,4 @@ require("plugins.configs.lsp.mason")
require("plugins.configs.lsp.lspsaga") require("plugins.configs.lsp.lspsaga")
require("plugins.configs.lsp.signature") require("plugins.configs.lsp.signature")
require("plugins.configs.lsp.lsplines") require("plugins.configs.lsp.lsplines")
require("plugins.configs.lsp.manual")

View file

@ -1,3 +1,3 @@
local lspsaga = require("lspsaga") local lspsaga = require("lspsaga")
lspsaga.init_lsp_saga({}) lspsaga.setup({})

View file

@ -0,0 +1,3 @@
local lspconfig = require("lspconfig")
lspconfig.lua_ls.setup({})

View file

@ -10,7 +10,9 @@ null_ls.setup({
formatting.stylua, formatting.stylua,
diagnostics.markdownlint, diagnostics.markdownlint,
formatting.markdownlint, formatting.markdownlint,
formatting.stylelint,
diagnostics.yamllint, diagnostics.yamllint,
diagnostics.actionlint, diagnostics.actionlint,
diagnostics.stylelint,
}, },
}) })

View file

@ -0,0 +1,4 @@
{
"csharp.format.enable": true,
"omnisharp.organizeImportsOnFormat": true
}

View file

@ -25,12 +25,4 @@ lualine.setup({
lualine_y = {}, lualine_y = {},
lualine_z = { "location" }, lualine_z = { "location" },
}, },
tabline = {
lualine_a = { "buffers" },
lualine_b = {},
lualine_c = {},
lualine_x = {},
lualine_y = {},
lualine_z = { "tabs" },
},
}) })

View file

@ -1,5 +0,0 @@
local present, _ = pcall(require, "nightfox")
if present then
vim.cmd("colorscheme nordfox")
end

View file

@ -0,0 +1,3 @@
local rt = require("rust-tools")
rt.setup({})

View file

@ -1,7 +1,7 @@
local treesitter = require("nvim-treesitter.configs") local treesitter = require("nvim-treesitter.configs")
treesitter.setup({ treesitter.setup({
sync_install = false, ensure_installed = "all",
auto_install = true, auto_install = true,
highlight = { highlight = {
enable = true, enable = true,

View file

@ -1,7 +1,12 @@
local M = {} local M = {}
local navic = require("nvim-navic") local navic = require("nvim-navic")
local gps = require("nvim-gps")
local present, gps = pcall(require, "nvim-gps")
if not present then
return
end
gps.setup() gps.setup()
navic.setup({ navic.setup({

View file

@ -26,7 +26,7 @@ vim.api.nvim_create_autocmd("User", {
callback = function() callback = function()
vim.cmd("CatppuccinCompile") vim.cmd("CatppuccinCompile")
vim.defer_fn(function() vim.defer_fn(function()
vim.cmd("colorscheme catppuccin") require("plugins.configs.catppuccin")
end, 0) end, 0)
end, end,
}) })
@ -81,13 +81,6 @@ return packer.startup(function(use)
}) })
-- Colorscheme -- Colorscheme
use({
"EdenEast/nightfox.nvim",
run = ":NightfoxCompile",
config = function()
-- require("plugins.configs.nightfox")
end,
})
use({ use({
"catppuccin/nvim", "catppuccin/nvim",
config = function() config = function()
@ -115,7 +108,7 @@ return packer.startup(function(use)
end, end,
}) })
use({ use({
"p00f/nvim-ts-rainbow", "HiPhish/nvim-ts-rainbow2",
after = "nvim-treesitter", after = "nvim-treesitter",
}) })
use({ use({
@ -247,7 +240,6 @@ return packer.startup(function(use)
-- Statusline -- Statusline
use({ use({
"nvim-lualine/lualine.nvim", "nvim-lualine/lualine.nvim",
event = "BufReadPre",
config = function() config = function()
require("plugins.configs.lualine") require("plugins.configs.lualine")
end, end,
@ -268,6 +260,43 @@ return packer.startup(function(use)
event = "BufReadPre", event = "BufReadPre",
}) })
-- WhichKey
use({
"folke/which-key.nvim",
event = "BufReadPre",
config = function()
require("which-key").setup({})
end,
})
-- Rust tooling
use({
"simrat39/rust-tools.nvim",
event = "BufReadPre",
config = function()
require("plugins.configs.rust-tools")
end,
})
use({
"Saecki/crates.nvim",
event = { "BufRead Cargo.toml" },
config = function()
require("crates").setup()
end,
})
-- Bufferline
use({
"akinsho/bufferline.nvim",
config = function()
require("plugins.configs.bufferline")
end,
})
use({
"moll/vim-bbye",
after = "bufferline.nvim",
})
if PACKER_BOOTSTRAP then if PACKER_BOOTSTRAP then
require("packer").sync() require("packer").sync()
end end