Compare commits
No commits in common. "f0f214c43b7aabe9587cb6535923f20209616f88" and "0137ffed8ff8da1822a3bbe03cfb2d064f66d847" have entirely different histories.
f0f214c43b
...
0137ffed8f
17 changed files with 31 additions and 108 deletions
|
@ -49,3 +49,7 @@ vim.cmd("set iskeyword+=-")
|
|||
vim.cmd("set formatoptions-=cro")
|
||||
vim.cmd("set foldmethod=expr")
|
||||
vim.cmd("set foldexpr=nvim_treesitter#foldexpr()")
|
||||
|
||||
vim.cmd(
|
||||
"let g:clipboard = { 'copy': { '+': 'xsel', '*': 'xsel' }, 'paste': { '+': 'xsel', '*': 'xsel' }, 'cache_enabled': 0 }"
|
||||
)
|
||||
|
|
|
@ -1,30 +0,0 @@
|
|||
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,
|
||||
},
|
||||
})
|
||||
|
|
@ -22,22 +22,6 @@ if present then
|
|||
lsp_saga = true,
|
||||
treesitter_context = 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,
|
||||
},
|
||||
})
|
||||
|
||||
|
|
|
@ -14,7 +14,6 @@ cmp.setup({
|
|||
{ name = "vsnip" },
|
||||
{ name = "buffer" },
|
||||
{ name = "path" },
|
||||
{ name = "crates" },
|
||||
},
|
||||
confirm_opts = {
|
||||
behavior = cmp.ConfirmBehavior.Replace,
|
||||
|
|
|
@ -81,6 +81,6 @@ capabilities.textDocument.completion.completionItem.snippetSupport = true
|
|||
|
||||
local cmp_lsp = require("cmp_nvim_lsp")
|
||||
|
||||
M.capabilities = cmp_lsp.default_capabilities(capabilities)
|
||||
M.capabilities = cmp_lsp.update_capabilities(capabilities)
|
||||
|
||||
return M
|
||||
|
|
|
@ -5,4 +5,3 @@ require("plugins.configs.lsp.mason")
|
|||
require("plugins.configs.lsp.lspsaga")
|
||||
require("plugins.configs.lsp.signature")
|
||||
require("plugins.configs.lsp.lsplines")
|
||||
require("plugins.configs.lsp.manual")
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
local lspsaga = require("lspsaga")
|
||||
|
||||
lspsaga.setup({})
|
||||
lspsaga.init_lsp_saga({})
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
local lspconfig = require("lspconfig")
|
||||
|
||||
lspconfig.lua_ls.setup({})
|
|
@ -10,9 +10,7 @@ null_ls.setup({
|
|||
formatting.stylua,
|
||||
diagnostics.markdownlint,
|
||||
formatting.markdownlint,
|
||||
formatting.stylelint,
|
||||
diagnostics.yamllint,
|
||||
diagnostics.actionlint,
|
||||
diagnostics.stylelint,
|
||||
},
|
||||
})
|
||||
|
|
|
@ -1,4 +0,0 @@
|
|||
{
|
||||
"csharp.format.enable": true,
|
||||
"omnisharp.organizeImportsOnFormat": true
|
||||
}
|
|
@ -25,4 +25,12 @@ lualine.setup({
|
|||
lualine_y = {},
|
||||
lualine_z = { "location" },
|
||||
},
|
||||
tabline = {
|
||||
lualine_a = { "buffers" },
|
||||
lualine_b = {},
|
||||
lualine_c = {},
|
||||
lualine_x = {},
|
||||
lualine_y = {},
|
||||
lualine_z = { "tabs" },
|
||||
},
|
||||
})
|
||||
|
|
5
lua/plugins/configs/nightfox.lua
Normal file
5
lua/plugins/configs/nightfox.lua
Normal file
|
@ -0,0 +1,5 @@
|
|||
local present, _ = pcall(require, "nightfox")
|
||||
|
||||
if present then
|
||||
vim.cmd("colorscheme nordfox")
|
||||
end
|
|
@ -1,3 +0,0 @@
|
|||
local rt = require("rust-tools")
|
||||
|
||||
rt.setup({})
|
|
@ -1,7 +1,7 @@
|
|||
local treesitter = require("nvim-treesitter.configs")
|
||||
|
||||
treesitter.setup({
|
||||
ensure_installed = "all",
|
||||
sync_install = false,
|
||||
auto_install = true,
|
||||
highlight = {
|
||||
enable = true,
|
||||
|
|
|
@ -1,12 +1,7 @@
|
|||
local M = {}
|
||||
|
||||
local navic = require("nvim-navic")
|
||||
|
||||
local present, gps = pcall(require, "nvim-gps")
|
||||
|
||||
if not present then
|
||||
return
|
||||
end
|
||||
local gps = require("nvim-gps")
|
||||
|
||||
gps.setup()
|
||||
navic.setup({
|
||||
|
|
|
@ -26,7 +26,7 @@ vim.api.nvim_create_autocmd("User", {
|
|||
callback = function()
|
||||
vim.cmd("CatppuccinCompile")
|
||||
vim.defer_fn(function()
|
||||
require("plugins.configs.catppuccin")
|
||||
vim.cmd("colorscheme catppuccin")
|
||||
end, 0)
|
||||
end,
|
||||
})
|
||||
|
@ -81,6 +81,13 @@ return packer.startup(function(use)
|
|||
})
|
||||
|
||||
-- Colorscheme
|
||||
use({
|
||||
"EdenEast/nightfox.nvim",
|
||||
run = ":NightfoxCompile",
|
||||
config = function()
|
||||
-- require("plugins.configs.nightfox")
|
||||
end,
|
||||
})
|
||||
use({
|
||||
"catppuccin/nvim",
|
||||
config = function()
|
||||
|
@ -108,7 +115,7 @@ return packer.startup(function(use)
|
|||
end,
|
||||
})
|
||||
use({
|
||||
"HiPhish/nvim-ts-rainbow2",
|
||||
"p00f/nvim-ts-rainbow",
|
||||
after = "nvim-treesitter",
|
||||
})
|
||||
use({
|
||||
|
@ -240,6 +247,7 @@ return packer.startup(function(use)
|
|||
-- Statusline
|
||||
use({
|
||||
"nvim-lualine/lualine.nvim",
|
||||
event = "BufReadPre",
|
||||
config = function()
|
||||
require("plugins.configs.lualine")
|
||||
end,
|
||||
|
@ -260,43 +268,6 @@ return packer.startup(function(use)
|
|||
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
|
||||
require("packer").sync()
|
||||
end
|
||||
|
|
Reference in a new issue