Merge pull request 'mini' (#3) from mini into master
Reviewed-on: https://git.lucymeow.gay/lucy/nvim/pulls/3
This commit is contained in:
commit
1dab8545ce
3 changed files with 46 additions and 85 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,2 +1 @@
|
||||||
nvim-pack-lock.json
|
nvim-pack-lock.json
|
||||||
.luarc.json
|
|
||||||
|
|
|
||||||
7
.luarc.json
Normal file
7
.luarc.json
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
{
|
||||||
|
"diagnostics.globals": [
|
||||||
|
"vim",
|
||||||
|
"Snacks",
|
||||||
|
"MiniStatusline"
|
||||||
|
]
|
||||||
|
}
|
||||||
127
init.lua
127
init.lua
|
|
@ -1,21 +1,9 @@
|
||||||
-- general options
|
|
||||||
local opt = vim.opt
|
local opt = vim.opt
|
||||||
vim.g.mapleader = " "
|
|
||||||
vim.g.maplocalleader = "\\"
|
|
||||||
opt.number = true
|
|
||||||
opt.relativenumber = true
|
opt.relativenumber = true
|
||||||
|
|
||||||
opt.cursorline = false
|
|
||||||
opt.termguicolors = true
|
|
||||||
opt.winborder = "rounded"
|
|
||||||
opt.signcolumn = "yes"
|
|
||||||
vim.lsp.inlay_hint.enable = true
|
vim.lsp.inlay_hint.enable = true
|
||||||
opt.tabstop = 8
|
opt.tabstop = 8
|
||||||
vim.opt.expandtab = true
|
vim.opt.expandtab = true
|
||||||
vim.g.tinted_background_transparent = 1
|
|
||||||
opt.swapfile = false
|
opt.swapfile = false
|
||||||
opt.winborder = "single"
|
|
||||||
|
|
||||||
opt.shiftwidth = 8
|
opt.shiftwidth = 8
|
||||||
vim.diagnostic.config({
|
vim.diagnostic.config({
|
||||||
virtual_text = {
|
virtual_text = {
|
||||||
|
|
@ -25,65 +13,31 @@ vim.diagnostic.config({
|
||||||
})
|
})
|
||||||
-- add plugins
|
-- add plugins
|
||||||
vim.pack.add({
|
vim.pack.add({
|
||||||
"https://github.com/folke/snacks.nvim",
|
|
||||||
"https://github.com/nvim-lualine/lualine.nvim",
|
|
||||||
"https://github.com/tinted-theming/tinted-vim",
|
|
||||||
"https://github.com/nvimdev/lspsaga.nvim",
|
|
||||||
"https://github.com/neovim/nvim-lspconfig",
|
|
||||||
"https://github.com/nvim-treesitter/nvim-treesitter",
|
"https://github.com/nvim-treesitter/nvim-treesitter",
|
||||||
|
"https://github.com/nvim-lualine/lualine.nvim",
|
||||||
|
"https://github.com/RRethy/base16-nvim",
|
||||||
|
"https://github.com/tinted-theming/tinted-nvim.git",
|
||||||
|
"https://github.com/neovim/nvim-lspconfig",
|
||||||
"https://github.com/vyfor/cord.nvim",
|
"https://github.com/vyfor/cord.nvim",
|
||||||
"https://github.com/mason-org/mason-lspconfig.nvim.git",
|
"https://github.com/nvim-mini/mini.nvim"
|
||||||
"https://github.com/mason-org/mason.nvim.git",
|
|
||||||
"https://github.com/Saghen/blink.cmp",
|
|
||||||
"https://github.com/saghen/blink.lib",
|
|
||||||
})
|
})
|
||||||
-- function to set colorsceme
|
-- function to set colorsceme
|
||||||
|
require('tinted-nvim').setup({
|
||||||
|
ui = {
|
||||||
|
transparent = false
|
||||||
|
},
|
||||||
|
highlights = {
|
||||||
|
integrations = {
|
||||||
|
lualine = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
vim.cmd("colorscheme " .. vim.fn.system("cat /home/lucy/.local/share/tinted-theming/tinty/current_scheme"))
|
vim.cmd("colorscheme " .. vim.fn.system("cat /home/lucy/.local/share/tinted-theming/tinty/current_scheme"))
|
||||||
-- setup superior (?) lsp
|
-- setup mini
|
||||||
vim.lsp.config("qml-language-server", {
|
require('mini.basics').setup()
|
||||||
cmd = { "qml-language-server" },
|
require('mini.icons').setup()
|
||||||
filetypes = { "qml" },
|
require('mini.pick').setup()
|
||||||
root_markers = { { "qmldir", "shell.qml" }, ".git" },
|
require('mini.git').setup()
|
||||||
})
|
|
||||||
|
|
||||||
vim.lsp.enable("qml-language-server")
|
|
||||||
vim.lsp.enable("clangd")
|
|
||||||
require("blink.cmp").setup({
|
|
||||||
fuzzy = { implementation = "prefer_rust_with_warning" },
|
|
||||||
completion = {
|
|
||||||
menu = {
|
|
||||||
auto_show = false,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
sources = {
|
|
||||||
default = { "lsp", "path", "snippets", "buffer" },
|
|
||||||
},
|
|
||||||
})
|
|
||||||
require("mason").setup()
|
|
||||||
require("mason-lspconfig").setup()
|
|
||||||
require("snacks").setup({
|
|
||||||
notifier = { enabled = true },
|
|
||||||
statuscolumn = { enabled = true },
|
|
||||||
picker = {},
|
|
||||||
})
|
|
||||||
require("lspsaga").setup({
|
|
||||||
symbol_in_winbar = { enable = true },
|
|
||||||
lightbulb = {
|
|
||||||
enable = true,
|
|
||||||
sign = false,
|
|
||||||
},
|
|
||||||
hover = {
|
|
||||||
max_width = 0.6,
|
|
||||||
open_link = "gx",
|
|
||||||
open_browser = "!google-chrome",
|
|
||||||
},
|
|
||||||
})
|
|
||||||
require("cord").setup({
|
|
||||||
display = {
|
|
||||||
theme = "atom",
|
|
||||||
},
|
|
||||||
editor = { tooltip = "ur gay x3" },
|
|
||||||
})
|
|
||||||
require("lualine").setup({
|
require("lualine").setup({
|
||||||
options = {
|
options = {
|
||||||
section_separators = { left = "", right = "" },
|
section_separators = { left = "", right = "" },
|
||||||
|
|
@ -109,15 +63,33 @@ require("lualine").setup({
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
-- setup superior lsp
|
||||||
|
vim.lsp.config("qml-language-server", {
|
||||||
|
cmd = { "qml-language-server" },
|
||||||
|
filetypes = { "qml" },
|
||||||
|
root_markers = { { "qmldir", "shell.qml" }, ".git" },
|
||||||
|
})
|
||||||
|
vim.lsp.enable("lua_ls")
|
||||||
|
|
||||||
|
vim.lsp.enable("qml-language-server")
|
||||||
|
vim.lsp.enable("clangd")
|
||||||
|
vim.lsp.enable("lua-language-server")
|
||||||
|
require("cord").setup({
|
||||||
|
display = {
|
||||||
|
theme = "atom",
|
||||||
|
},
|
||||||
|
editor = { tooltip = "ur gay x3" },
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
-- keymaps
|
-- keymaps
|
||||||
local map = vim.keymap.set
|
local map = vim.keymap.set
|
||||||
|
|
||||||
map("n", "<leader>ff", function()
|
map("n", "<leader>ff", function()
|
||||||
Snacks.picker.files()
|
MiniPick.builtin.files()
|
||||||
end)
|
end)
|
||||||
map("n", "<leader>lg", function()
|
map("n", "<leader>lg", function()
|
||||||
Snacks.picker.grep()
|
MiniPick.builtin.grep_live()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
map("n", "<C-h>", "<C-w>h")
|
map("n", "<C-h>", "<C-w>h")
|
||||||
|
|
@ -129,29 +101,12 @@ map("n", "<C-S-Right>", ":vertical resize +5<CR>", { silent = true })
|
||||||
map("n", "<C-S-Up>", ":resize +5<CR>", { silent = true })
|
map("n", "<C-S-Up>", ":resize +5<CR>", { silent = true })
|
||||||
map("n", "<C-S-Down>", ":resize -5<CR>", { silent = true })
|
map("n", "<C-S-Down>", ":resize -5<CR>", { silent = true })
|
||||||
-- lsp keybinds
|
-- lsp keybinds
|
||||||
map("n", "K", "<cmd> Lspsaga hover_doc<cr>")
|
|
||||||
map("n", "go", "<cmd> Lspsaga goto_definition<cr>")
|
|
||||||
map("n", "gr", "<cmd> Lspsaga finder<cr>")
|
|
||||||
map("n", "<leader>qf", "<cmd> Lspsaga code_action<cr>")
|
|
||||||
map("n", "<C-f>", function()
|
map("n", "<C-f>", function()
|
||||||
vim.lsp.buf.format()
|
vim.lsp.buf.format()
|
||||||
end)
|
end)
|
||||||
-- buffer keybinds
|
|
||||||
map("n", "<A-1>", "<cmd> LualineBuffersJump! 1 <cr>")
|
|
||||||
map("n", "<A-2>", "<cmd> LualineBuffersJump! 2 <cr>")
|
|
||||||
map("n", "<A-3>", "<cmd> LualineBuffersJump! 3 <cr>")
|
|
||||||
map("n", "<A-4>", "<cmd> LualineBuffersJump! 4 <cr>")
|
|
||||||
map("n", "<A-5>", "<cmd> LualineBuffersJump! 5 <cr>")
|
|
||||||
map("n", "<A-6>", "<cmd> LualineBuffersJump! 6 <cr>")
|
|
||||||
map("n", "<A-7>", "<cmd> LualineBuffersJump! 7 <cr>")
|
|
||||||
map("n", "<A-8>", "<cmd> LualineBuffersJump! 8 <cr>")
|
|
||||||
map("n", "<A-9>", "<cmd> LualineBuffersJump! 9 <cr>")
|
|
||||||
map("n", "<A-0>", "<cmd> LualineBuffersJump! last <cr>")
|
|
||||||
map("n", "<leader>w", "<cmd> bdelete! <cr>")
|
|
||||||
|
|
||||||
-- util keybinds
|
-- util keybinds
|
||||||
map("n", "<leader>t", "<cmd> terminal <cr>")
|
map("n", "<leader>t", "<cmd> terminal <cr>")
|
||||||
map("n", "<A-t>", "<cmd>Lspsaga term_toggle<cr>")
|
map("n", "<A-t>", "<cmd>Lspsaga term_toggle<cr>")
|
||||||
map("t", "<esc>", "<c-\\><c-n>")
|
map("t", "<esc>", "<c-\\><c-n>")
|
||||||
map("i", "<C-space>", vim.lsp.completion.get, { desc = "trigger autocompletion" })
|
map("i", "<C-space>", "<C-X><C-O>")
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue