servostar/Neovim
servostar
/
Neovim
1
0
Fork 0
Code Issues 18 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: servostar:5060fc3cb0b120c308d5a2d30492fd6ae78041b3
Branches Tags
servostar:main
servostar:devel
servostar:rework
..
compare: servostar:4258701c98dfeb5d1ed3666bfd83c75addeab049
Branches Tags
servostar:devel
servostar:rework
servostar:main

No commits in common. "5060fc3cb0b120c308d5a2d30492fd6ae78041b3" and "4258701c98dfeb5d1ed3666bfd83c75addeab049" have entirely different histories.
5060fc3cb0 ... 4258701c98

25 changed files with 383 additions and 679 deletions
Show Stats Expand all files Collapse all files

8
init.lua
View File

@ -1,13 +1,13 @@
require('bootstrap')
-- load options -- load options
local options = require("options") local options = require('options')
-- set neovim options -- set neovim options
for k, v in pairs(options.vim) do for k, v in pairs(options.vim) do
vim.opt[k] = v vim.opt[k] = v
end end
require("bootstrap")
-- apply color theme -- apply color theme
local status, _ = pcall(vim.cmd, "colorscheme " .. options.ui.theme) local status, _ = pcall(vim.cmd, "colorscheme " .. options.ui.theme)
if not status then if not status then
@ -16,7 +16,7 @@ if not status then
end end
-- apply keymap -- apply keymap
local keymap = require("keymap") local keymap = require('keymap')
for _, v in pairs(keymap) do for _, v in pairs(keymap) do
vim.keymap.set(v[1], v[2], v[3], v[4]) vim.keymap.set(v[1], v[2], v[3], v[4])
end end

20
lua/bootstrap.lua
View File

@ -17,22 +17,22 @@ local options = require("options")
require("lazy").setup({ require("lazy").setup({
spec = { spec = {
{ {
import = "plugins", import = "plugins"
}, }
}, },
install = { install = {
missing = options.lazy.install_missing, missing = options.lazy.install_missing,
colorscheme = { colorscheme = {
options.ui.theme, options.ui.theme
}, }
}, },
ui = { ui = {
size = { size = {
width = options.ui.popup.width, width = options.ui.popup.width,
height = options.ui.popup.height, height = options.ui.popup.height
}, },
border = options.ui.border, border = options.ui.border,
wrap = true, wrap = true,
icons = options.lazy.icons, icons = options.lazy.icons,
}, }
}) })

126
lua/keymap.lua
View File

@ -1,146 +1,66 @@
return { return {
{ {
{ "i", "x", "n", "s" }, { 'i', 'x', 'n', 's' }, "<C-s>", "<cmd>w<cr><esc>", { desc = "Save file" }
"<C-s>",
"<cmd>w<cr><esc>",
{ desc = "Save file" },
}, },
{ {
{ "n" }, { 'n' }, "<C-t>", "<cmd>enew<cr>", { desc = "New File" }
"<C-t>",
"<cmd>enew<cr>",
{ desc = "New File" },
}, },
{ {
{ "n", "i" }, { 'n', 'i' }, '<C-z>', '<cmd>u<CR>', { desc = "Undo" }
"<C-z>",
"<cmd>u<CR>",
{ desc = "Undo" },
}, },
{ {
{ "n", "i" }, { 'n', 'i' }, '<C-y>', '<cmd>redo<CR>', { desc = "Undo" }
"<C-y>",
"<cmd>redo<CR>",
{ desc = "Undo" },
}, },
{ {
{ "n", "i" }, { 'n', 'i' }, '<S-tab>', '<cmd><<CR>', { desc = "Remove Tab" }
"<S-tab>",
"<cmd><<CR>",
{ desc = "Remove Tab" },
}, },
{ {
{ "n", "i" }, { 'n', 'i' }, '<C-g>', '<cmd>Telescope<CR>', { desc = "Open Telescope" }
"<C-g>",
"<cmd>Telescope<CR>",
{ desc = "Open Telescope" },
}, },
{ {
{ "n", "i" }, { 'n', 'i' }, '<S-ScrollWheelUp>', '<ScrollWheelLeft>', { desc = "Scroll sideways" }
"<S-ScrollWheelUp>",
"<ScrollWheelLeft>",
{ desc = "Scroll sideways" },
}, },
{ {
{ "n", "i" }, { 'n', 'i' }, '<S-ScrollWheelDown>', '<ScrollWheelRight>', { desc = "Scroll sideways" }
"<S-ScrollWheelDown>",
"<ScrollWheelRight>",
{ desc = "Scroll sideways" },
}, },
{ {
{ "n" }, { 'n' }, "<S-Tab>", "<cmd>BufferPrevious<CR>", { desc = "Next Tab", silent = false }
"<S-Tab>",
"<cmd>BufferPrevious<CR>",
{ desc = "Next Tab", silent = false },
}, },
{ {
{ "n" }, { 'n' }, "<Tab>", "<cmd>BufferNext<CR>", { desc = "Previous Tab", silent = false }
"<Tab>",
"<cmd>BufferNext<CR>",
{ desc = "Previous Tab", silent = false },
}, },
{ {
{ "n" }, { 'n' }, '<C-w>', '', { desc = "Disable STRG+w" }
"<C-w>",
"",
{ desc = "Disable STRG+w" },
}, },
{ {
{ "n" }, { 'n' }, '<C-w>v', '<cmd>vsplit<CR>', { desc = "Split Vertical", noremap = true }
"<C-w>v",
"<cmd>vsplit<CR>",
{ desc = "Split Vertical", noremap = true },
}, },
{ {
{ "n" }, { 'n' }, '<C-w>h', '<cmd>split<CR>', { desc = "Split Horizontal", noremap = true }
"<C-w>h",
"<cmd>split<CR>",
{ desc = "Split Horizontal", noremap = true },
}, },
{ {
{ "n" }, { 'n' }, '<C-w>q', '<cmd>BufferClose<CR>', { desc = "Quit Window" }
"q",
"<cmd>BufferClose<CR>",
{ desc = "Quit Buffer" },
}, },
{ {
{ "n" }, { 'n' }, '<C-w><Left>', '<cmd>wincmd h<CR>', { desc = "Window Left" }
"<C-w>q",
"<cmd>quit<CR>",
{ desc = "Quit Window" },
}, },
{ {
{ "n" }, { 'n' }, '<C-w><Down>', '<cmd>wincmd j<CR>', { desc = "Window Down" }
"<C-w><Left>",
"<cmd>wincmd h<CR>",
{ desc = "Window Left" },
}, },
{ {
{ "n" }, { 'n' }, '<C-w><Up>', '<cmd>wincmd k<CR>', { desc = "Window Up" }
"<C-w><Down>",
"<cmd>wincmd j<CR>",
{ desc = "Window Down" },
}, },
{ {
{ "n" }, { 'n' }, '<C-w><Right>', '<cmd>wincmd l<CR>', { desc = "Window Right" }
"<C-w><Up>",
"<cmd>wincmd k<CR>",
{ desc = "Window Up" },
}, },
{ {
{ "n" }, { 'n', 'i' }, '<C-b>', '<cmd>NvimTreeToggle<CR>', { desc = "Toggle Neotree" }
"<C-w><Right>",
"<cmd>wincmd l<CR>",
{ desc = "Window Right" },
}, },
{ {
{ "n", "i" }, { 'n' }, ':', '<cmd>Telescope cmdline<CR>', { noremap = true, desc = "Open Cmdline" }
"<C-b>",
"<cmd>NvimTreeToggle<CR>",
{ desc = "Toggle Neotree" },
}, },
{ {
{ "n" }, { 'n' }, '<leader><leader>', '<cmd>Telescope cmdline<CR>', { noremap = true, desc = "Open Cmdline" }
":", }
"<cmd>Telescope cmdline<CR>",
{ noremap = true, desc = "Open Cmdline" },
},
{
{ "n" },
"<leader><leader>",
"<cmd>Telescope cmdline<CR>",
{ noremap = true, desc = "Open Cmdline" },
},
{
{ "v" },
"i",
"<esc>i",
{ noremap = true, desc = "Switch from Visual to Insert mode" },
},
{
{ "n" },
"<C-f>",
"<cmd>Telescope current_buffer_fuzzy_find<CR>",
{ noremap = true, desc = "Find" },
},
} }

68
lua/options.lua
View File

@ -1,24 +1,24 @@
return { return {
vim = { vim = {
swapfile = false, -- disable swap files cuz they are garbage swapfile = false, -- disable swap files cuz they are garbage
clipboard = "unnamedplus", -- Sync with system clipboard clipboard = "unnamedplus", -- Sync with system clipboard
expandtab = true, -- spaces instead of tabs expandtab = true, -- spaces instead of tabs
shiftwidth = 4, -- tab width in spaces shiftwidth = 4, -- tab width in spaces
tabstop = 4, -- Number of spaces tabs count for tabstop = 4, -- Number of spaces tabs count for
completeopt = "menu,menuone,noselect", completeopt = "menu,menuone,noselect",
confirm = true, -- Confirm to save changes before exiting modified buffer confirm = true, -- Confirm to save changes before exiting modified buffer
cursorline = true, -- Enable highlighting of the current line cursorline = true, -- Enable highlighting of the current line
ignorecase = true, -- Ignore case ignorecase = true, -- Ignore case
mouse = "a", -- Enable mouse mode mouse = "a", -- Enable mouse mode
number = true, -- Print line number number = true, -- Print line number
pumblend = 0, -- Popup pseudo transparency pumblend = 0, -- Popup pseudo transparency
pumheight = 12, -- Popup height pumheight = 12, -- Popup height
showmode = false, -- Dont show mode since we have a statusline showmode = false, -- Dont show mode since we have a statusline
smartindent = true, -- Insert indents automatically smartindent = true, -- Insert indents automatically
termguicolors = true, -- True color support termguicolors = true, -- True color support
virtualedit = "block", -- Allow cursor to move where there is no text in visual block mode virtualedit = "block", -- Allow cursor to move where there is no text in visual block mode
wrap = false, wrap = false,
foldcolumn = "1", foldcolumn = '1',
foldlevel = 99, foldlevel = 99,
foldlevelstart = 99, foldlevelstart = 99,
foldenable = true, foldenable = true,
@ -27,43 +27,43 @@ return {
foldclose = "", foldclose = "",
fold = " ", fold = " ",
foldsep = " ", foldsep = " ",
diff = "╱", diff = "╱",
eob = " ", eob = " ",
horiz = "─", horiz = '─',
horizup = "─", horizup = '─',
horizdown = "─", horizdown = '─',
vert = "▎", vert = '▎',
vertleft = "▎", vertleft = '▎',
vertright = "▎", vertright = '▎',
verthoriz = "▎", verthoriz = '▎',
}, },
mousemoveevent = true, mousemoveevent = true,
laststatus = 3, -- global statusline laststatus = 3, -- global statusline
}, },
ui = { ui = {
theme = "vscode", theme = "vscode",
border = "rounded", border = "rounded",
popup = { popup = {
width = 0.6, width = 0.6,
height = 0.8, height = 0.8
}, }
}, },
lsp = { lsp = {
icons = { icons = {
Error = "", Error = "",
Warn = "", Warn = "",
Hint = "", Hint = "",
Info = "", Info = "",
}, },
}, },
git = { git = {
icons = { icons = {
add = "│", add = "│",
change = "¦", change = "┆",
delete = "", delete = "",
topdelete = "", topdelete = "",
changedelete = "¦", changedelete = "│",
untracked = "│", untracked = "│"
}, },
}, },
lazy = { lazy = {

59
lua/plugins/barbar.lua
View File

@ -1,35 +1,32 @@
return { return {
{ {
"romgrk/barbar.nvim", 'romgrk/barbar.nvim',
init = function() init = function() vim.g.barbar_auto_setup = false end,
vim.g.barbar_auto_setup = false opts = function ()
end, local options = require('options')
opts = function() return {
local options = require("options") animation = true,
return { tabpages = true,
animation = true, insert_at_end = true,
tabpages = true, maximum_padding = 4,
insert_at_end = true, sidebar_filetypes = {
maximum_padding = 4, NvimTree = true,
sidebar_filetypes = { },
NvimTree = true, clickable = true,
}, pinned = {
clickable = true, button = '',
pinned = { filename = true
button = "", },
filename = true, icons = {
}, separator = {left = '▎', right = ''},
icons = { diagnostics = {
separator = { left = "▎", right = "" }, [vim.diagnostic.severity.ERROR] = {enabled = true, icon = options.lsp.icons.Error},
diagnostics = { [vim.diagnostic.severity.WARN] = {enabled = false, icon = options.lsp.icons.Warn},
[vim.diagnostic.severity.ERROR] = { enabled = true, icon = options.lsp.icons.Error }, [vim.diagnostic.severity.INFO] = {enabled = false, icon = options.lsp.icons.Info},
[vim.diagnostic.severity.WARN] = { enabled = false, icon = options.lsp.icons.Warn }, [vim.diagnostic.severity.HINT] = {enabled = true}, icon = options.lsp.icons.Hint},
[vim.diagnostic.severity.INFO] = { enabled = false, icon = options.lsp.icons.Info },
[vim.diagnostic.severity.HINT] = { enabled = true },
icon = options.lsp.icons.Hint,
},
},
} }
end, }
}, end
}
} }

3
lua/plugins/blankline.lua
View File

@ -23,6 +23,7 @@ return {
"lazyterm", "lazyterm",
}, },
}, },
}, }
}, },
} }

99
lua/plugins/cmp.lua
View File

@ -1,90 +1,85 @@
return { return {
{ {
"hrsh7th/nvim-cmp", 'hrsh7th/nvim-cmp',
dependencies = { dependencies = {
-- extra completion plugins -- extra completion plugins
"hrsh7th/cmp-cmdline", 'hrsh7th/cmp-cmdline',
"hrsh7th/cmp-path", 'hrsh7th/cmp-path',
"hrsh7th/cmp-buffer", 'hrsh7th/cmp-buffer',
"hrsh7th/cmp-nvim-lsp", 'hrsh7th/cmp-nvim-lsp',
"hrsh7th/cmp-calc", 'hrsh7th/cmp-calc',
"hrsh7th/cmp-emoji", 'hrsh7th/cmp-emoji',
"kdheepak/cmp-latex-symbols", 'kdheepak/cmp-latex-symbols',
-- snippets -- snippets
"saadparwaiz1/cmp_luasnip", 'hrsh7th/cmp-vsnip',
"L3MON4D3/LuaSnip", 'hrsh7th/vim-vsnip',
"onsails/lspkind.nvim", 'onsails/lspkind.nvim'
}, },
config = function(_, _) config = function(_, _)
local cmp = require("cmp") local cmp = require("cmp");
cmp.setup({ cmp.setup({
window = { window = {
completion = { completion = {
border = "single", border = "single",
scrollbar = false, scrollbar = false,
winhighlight = "Normal:CmpPmenu,FloatBorder:FloatBorder,Search:None", winhighlight = "Normal:CmpPmenu,FloatBorder:FloatBorder,Search:None"
}, },
documentation = { documentation = {
border = "single", border = "single",
scrollbar = false, scrollbar = false,
winhighlight = "Normal:CmpPmenu,FloatBorder:FloatBorder,Search:None", winhighlight = "Normal:CmpPmenu,FloatBorder:FloatBorder,Search:None"
}, },
}, },
snippet = { snippet = {
expand = function(args) expand = function(args)
require("luasnip").lsp_expand(args.body) vim.fn["vsnip#anonymous"](args.body)
end, end,
}, },
completion = { completion = {
preselect = "none", preselect = 'none',
completeopt = "menu,menuone,noinser", completeopt = "menu,menuone,noinser,noselectt",
}, },
sources = cmp.config.sources({ sources = cmp.config.sources({
{ name = "nvim_lsp" }, { name = 'nvim_lsp' },
{ name = "nvim_lsp_signature_help" }, { name = 'nvim_lsp_signature_help' },
{ name = "vsnip" }, { name = 'vsnip' },
{ name = "buffer" }, { name = 'buffer' },
{ name = "path" }, { name = "path" },
{ name = "calc" }, { name = 'calc' },
}, { }, {
{ name = "emoji" }, { name = 'emoji' },
{ name = "cmdline" }, { name = "cmdline" },
{ name = "latex_symbols" }, { name = "latex_symbols" }
}), }),
mapping = cmp.mapping.preset.insert({ mapping = cmp.mapping.preset.insert({
["<C-b>"] = cmp.mapping.scroll_docs(-4), ['<C-b>'] = cmp.mapping.scroll_docs(-4),
["<C-f>"] = cmp.mapping.scroll_docs(4), ['<C-f>'] = cmp.mapping.scroll_docs(4),
["<C-Space>"] = cmp.mapping.complete(), ['<C-Space>'] = cmp.mapping.complete(),
["<C-e>"] = cmp.mapping.abort(), ['<C-e>'] = cmp.mapping.abort(),
["<CR>"] = cmp.mapping({ ["<CR>"] = cmp.mapping({
i = function(fallback) i = function(fallback)
if cmp.visible() and cmp.get_active_entry() then if cmp.visible() and cmp.get_active_entry() then
cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = false }) cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = false })
else else
fallback() fallback()
end end
end, end,
s = cmp.mapping.confirm({ select = true }), s = cmp.mapping.confirm({ select = true }),
c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }), c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }),
}), }),
}), }),
formatting = { formatting = {
fields = { "kind", "abbr", "menu" }, fields = { "abbr", "kind", "menu" },
format = function(entry, item) format = function(entry, item)
local kind = require("lspkind").cmp_format({ mode = "symbol_text", maxwidth = 50 })(entry, item) return require("lspkind").cmp_format()(entry, item)
local strings = vim.split(kind.kind, "%s", { trimempty = true }) end
kind.kind = (strings[1] or "") .. " "
kind.menu = " (" .. (strings[2] or "") .. ")"
return kind
end,
}, },
experimental = { experimental = {
ghost_text = { ghost_text = {
hl_group = "NonText", hl_group = "NonText",
}, },
}, },
}) })
end, end
}, }
} }

19
lua/plugins/conform.lua
View File

@ -1,19 +0,0 @@
return {
{
"stevearc/conform.nvim",
opts = {
format_on_save = {
-- These options will be passed to conform.format()
timeout_ms = 500,
lsp_fallback = true,
},
formatters = {
injected = { options = { ignore_errors = true } },
},
formatters_by_ft = {
lua = { "stylua" },
sh = { "shfmt" },
},
},
},
}

94
lua/plugins/dashboard.lua
View File

@ -1,94 +0,0 @@
local logo = [[
__ _ _
/\ \ \_ _| | ____ ___ _(_)_ __ ___
/ \/ / | | | |/ / _` \ \ / / | '_ ` _ \
/ /\ /| |_| | < (_| |\ V /| | | | | | |
\_\ \/ \__,_|_|\_\__,_| \_/ |_|_| |_| |_|
]]
logo = string.rep("\n", 8) .. logo .. "\n\n"
return {
{
"nvimdev/dashboard-nvim",
event = "VimEnter",
config = function()
require("dashboard").setup({
theme = "doom",
shortcut_type = "letter",
hide = {
statusline = true, -- hide statusline default is true
tabline = true, -- hide the tabline
winbar = true, -- hide winbar
},
config = {
header = vim.split(logo, "\n"),
center = {
{
action = "Telescope find_files",
desc = " Find File",
icon = "",
key = "f",
},
{
action = "ene | startinsert",
desc = " New File",
icon = "",
key = "n",
},
{
action = "Telescope oldfiles",
desc = " Recent Files",
icon = "",
key = "r",
},
{
action = "Telescope live_grep",
desc = " Find Text",
icon = "",
key = "g",
},
{
action = [[lua vim.cmd("cd ~/.config/nvim/") vim.cmd("Telescope fd")]],
desc = " Config",
icon = "",
key = "c",
},
{
action = 'lua require("persistence").load()',
desc = " Restore Session",
icon = "",
key = "s",
},
{
action = "Lazy",
desc = " Lazy",
icon = "󰒲 ",
key = "l",
},
{
action = "Mason",
desc = " Language Server & Formatter",
icon = "",
key = "m",
},
{
action = "qa",
desc = " Quit",
icon = "",
key = "q",
},
},
footer = function()
local stats = require("lazy").stats()
return {
"- loaded " .. stats.loaded .. "/" .. stats.count .. " plugins -",
}
end,
},
})
end,
dependencies = { { "nvim-tree/nvim-web-devicons" } },
},
}

10
lua/plugins/gitsigns.lua
View File

@ -2,7 +2,7 @@ return {
{ {
"lewis6991/gitsigns.nvim", "lewis6991/gitsigns.nvim",
opts = function() opts = function()
local options = require("options") local options = require('options')
return { return {
signs = { signs = {
add = { text = options.git.icons.add }, add = { text = options.git.icons.add },
@ -14,9 +14,11 @@ return {
}, },
signcolumn = true, signcolumn = true,
preview_config = { preview_config = {
border = "rounded", border = 'rounded'
}, },
} }
end, end
}, }
} }

10
lua/plugins/illuminate.lua
View File

@ -1,8 +1,10 @@
return { return {
{ {
"RRethy/vim-illuminate", "RRethy/vim-illuminate",
config = function(_, _) config = function (_, _)
require("illuminate").configure({}) require('illuminate').configure({
end,
}, })
end
}
} }

56
lua/plugins/lsp.lua
View File

@ -3,27 +3,27 @@ return {
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
dependencies = { dependencies = {
"williamboman/mason.nvim", "williamboman/mason.nvim",
"williamboman/mason-lspconfig.nvim", "williamboman/mason-lspconfig.nvim"
}, },
opts = { opts = {
diagnostics = { diagnostics = {
underline = true, underline = true,
update_in_insert = true, update_in_insert = true,
virtual_text = { virtual_text = {
spacing = 4, spacing = 4,
source = "if_many", source = "if_many",
prefix = "●", prefix = "●",
}, },
severity_sort = true, severity_sort = true,
signs = { signs = {
text = { text = {
[vim.diagnostic.severity.ERROR] = require("options").lsp.icons.Error, [vim.diagnostic.severity.ERROR] = require("options").lsp.icons.Error,
[vim.diagnostic.severity.WARN] = require("options").lsp.icons.Warn, [vim.diagnostic.severity.WARN] = require("options").lsp.icons.Warn,
[vim.diagnostic.severity.HINT] = require("options").lsp.icons.Hint, [vim.diagnostic.severity.HINT] = require("options").lsp.icons.Hint,
[vim.diagnostic.severity.INFO] = require("options").lsp.icons.Info, [vim.diagnostic.severity.INFO] = require("options").lsp.icons.Info,
}, },
}, },
}, },
}, },
config = function(_, opts) config = function(_, opts)
local options = require("options") local options = require("options")
@ -32,16 +32,10 @@ return {
local handlers = { local handlers = {
-- The first entry (without a key) will be the default handler -- The first entry (without a key) will be the default handler
-- and will be called for each installed server that doesn't have -- and will be called for each installed server that doesn't have
-- a dedicated handler. -- a dedicated handler.
function(server_name) -- default handler (optional) function (server_name) -- default handler (optional)
require("lspconfig")[server_name].setup({ require("lspconfig")[server_name].setup {}
on_attach = function(client, bufnr)
if client.server_capabilities["documentSymbolProvider"] then
require("nvim-navic").attach(client, bufnr)
end
end,
})
end, end,
} }
@ -54,8 +48,8 @@ return {
end end
vim.diagnostic.config(vim.deepcopy(opts.diagnostics)) vim.diagnostic.config(vim.deepcopy(opts.diagnostics))
require("lspconfig").gdscript.setup({}) require'lspconfig'.gdscript.setup{}
end, end
}, }
} }

243
lua/plugins/lualine.lua
View File

@ -2,131 +2,132 @@ return {
{ {
"nvim-lualine/lualine.nvim", "nvim-lualine/lualine.nvim",
opts = function() opts = function()
local options = require("options") local options = require('options')
return { return {
options = { options = {
theme = "vscode", theme = "vscode",
component_separators = { left = "", right = "" }, component_separators = { left = '', right = '' },
section_separators = { left = "", right = "" }, section_separators = { left = '', right = '' },
globalstatus = true, globalstatus = true
},
sections = {
lualine_a = {
{
function ()
return ''
end,
separator = { left = '', right = '' },
padding = 1,
fmt = function (text)
return string.gsub(text, "%s+", "")
end
},
{
'mode',
padding = 0,
fmt = function (text)
return string.gsub(text, "%s+", "") .. ' '
end
}
}, },
sections = { lualine_b = {
lualine_a = { {
{ 'filename',
function() symbols = {
return "" modified = '', -- Text to show when the file is modified.
end, readonly = '', -- Text to show when the file is non-modifiable or readonly.
separator = { left = "", right = "" }, unnamed = '', -- Text to show for unnamed buffers.
padding = 1, newfile = '[New]', -- Text to show for newly created file before first write
fmt = function(text) }
return string.gsub(text, "%s+", "") }
end,
},
{
"mode",
padding = 0,
fmt = function(text)
return string.gsub(text, "%s+", "") .. " "
end,
},
},
lualine_b = {
{
"filename",
symbols = {
modified = "", -- Text to show when the file is modified.
readonly = "", -- Text to show when the file is non-modifiable or readonly.
unnamed = "", -- Text to show for unnamed buffers.
newfile = "[New]", -- Text to show for newly created file before first write
},
},
},
lualine_c = {
{
"branch",
icon = "󰊤",
},
{
"diff",
symbols = {
added = "+",
modified = "~",
removed = "-",
},
on_click = function()
vim.defer_fn(function()
vim.cmd("Gitsigns diffthis")
end, 100)
end,
},
},
lualine_x = {
{
function()
local client_id = vim.lsp.get_client_by_id(1)
return " LSP ~ " .. client_id.name
end,
on_click = function()
vim.defer_fn(function()
vim.cmd("LspInfo")
end, 100)
end,
color = "lualine_c_inactive",
},
{
"diagnostics",
symbols = {
error = options.lsp.icons.Error,
warn = options.lsp.icons.Warn,
info = options.lsp.icons.Info,
hint = options.lsp.icons.Hint,
},
sources = {
"nvim_diagnostic",
},
update_in_insert = true,
on_click = function()
vim.defer_fn(function()
vim.cmd("TroubleToggle")
end, 100)
end,
},
{
"filetype",
colored = true,
on_click = function(_, _)
vim.defer_fn(function()
vim.cmd("Telescope filetypes")
end, 100)
end,
},
"encoding",
"fileformat",
},
lualine_y = {
{ "progress" },
},
lualine_z = { "location" },
}, },
inactive_sections = { lualine_c = {
lualine_a = {}, {
lualine_b = {}, 'branch',
lualine_c = { icon = '󰊤'
{ },
"filename", {
symbols = { 'diff',
modified = "", -- Text to show when the file is modified. symbols = {
readonly = "", -- Text to show when the file is non-modifiable or readonly. added = '+',
unnamed = "", -- Text to show for unnamed buffers. modified = '~',
newfile = "[New]", -- Text to show for newly created file before first write removed = '-',
}, },
}, on_click = function ()
vim.defer_fn(function()
vim.cmd("Gitsigns diffthis")
end, 100)
end,
}, },
lualine_x = { "location" },
lualine_y = {},
lualine_z = {},
}, },
lualine_x = {
{
function ()
local client_id = vim.lsp.get_client_by_id(1)
return ' LSP ~ ' .. client_id.name
end,
on_click = function ()
vim.defer_fn(function()
vim.cmd("LspInfo")
end, 100)
end,
color = 'lualine_c_inactive'
},
{
'diagnostics',
symbols = {
error = options.lsp.icons.Error,
warn = options.lsp.icons.Warn,
info = options.lsp.icons.Info,
hint = options.lsp.icons.Hint,
},
sources = {
'nvim_diagnostic'
},
update_in_insert = true,
on_click = function ()
vim.defer_fn(function()
vim.cmd("TroubleToggle")
end, 100)
end,
},
{
'filetype',
colored = true,
on_click = function(_, _)
vim.defer_fn(function()
vim.cmd("Telescope filetypes")
end, 100)
end
},
'encoding',
'fileformat'
},
lualine_y = {
{ 'progress' }
},
lualine_z = {'location'}
},
inactive_sections = {
lualine_a = {},
lualine_b = {},
lualine_c = {
{
'filename',
symbols = {
modified = '', -- Text to show when the file is modified.
readonly = '', -- Text to show when the file is non-modifiable or readonly.
unnamed = '', -- Text to show for unnamed buffers.
newfile = '[New]', -- Text to show for newly created file before first write
}
}
},
lualine_x = {'location'},
lualine_y = {},
lualine_z = {}
} }
end, }
}, end
}
} }

40
lua/plugins/mini.lua
View File

@ -1,40 +0,0 @@
return {
{
"echasnovski/mini.clue", -- show next key clue
version = false,
opts = {
window = {
delay = 200,
},
triggers = {
{ mode = "n", keys = "<Leader>" },
{ mode = "n", keys = "<C-w>" },
},
},
},
{
"echasnovski/mini.pairs",
version = false,
event = "VeryLazy",
config = function(_, opts)
require("mini.pairs").setup(opts)
end,
},
{
"echasnovski/mini.move",
version = false,
opts = {
mappings = {
left = "<C-S-Left>",
right = "<C-S-Right>",
up = "<C-S-Up>",
down = "<C-S-Down>",
line_left = "<C-S-Left>",
line_right = "<C-S-Right>",
line_down = "<C-S-Down>",
line_up = "<C-S-Up>",
},
},
},
}

61
lua/plugins/navic.lua
View File

@ -1,61 +0,0 @@
return {
{
"SmiteshP/nvim-navic",
dependencies = {
"neovim/nvim-lspconfig",
},
opts = {
depth_limit_indicator = "...",
depth_limit = 8,
click = true,
},
},
{
"utilyre/barbecue.nvim",
name = "barbecue",
version = "*",
dependencies = {
"SmiteshP/nvim-navic",
"nvim-tree/nvim-web-devicons",
},
opts = {
attach_navic = false,
symbols = {
---Modification indicator.
modified = "●",
---Truncation indicator.
ellipsis = "...",
---Entry separator.
separator = "",
},
kinds = {
File = "󰈙",
Module = "",
Namespace = "󰌗",
Package = "",
Class = "󰌗",
Method = "󰆧",
Property = "",
Field = "",
Constructor = "",
Enum = "󰕘",
Interface = "󰕘",
Function = "󰊕",
Variable = "󰆧",
Constant = "󰏿",
String = "󰀬",
Number = "󰎠",
Boolean = "◩",
Array = "󰅪",
Object = "󰅩",
Key = "󰌋",
Null = "󰟢",
EnumMember = "",
Struct = "󰌗",
Event = "",
Operator = "󰆕",
TypeParameter = "󰊄",
},
},
},
}

17
lua/plugins/noice.lua
View File

@ -3,9 +3,10 @@ return {
"folke/noice.nvim", "folke/noice.nvim",
event = "VeryLazy", event = "VeryLazy",
dependencies = { dependencies = {
"rcarriga/nvim-notify", -- fancy notifications
"MunifTanjim/nui.nvim", -- gui component library "MunifTanjim/nui.nvim", -- gui component library
}, },
opts = function(_, _) opts = function(_,_)
return { return {
cmdline = { cmdline = {
enabled = true, enabled = true,
@ -13,22 +14,22 @@ return {
cmdline = { cmdline = {
pattern = "^:", pattern = "^:",
icon = "", icon = "",
lang = "vim", lang = "vim"
}, },
}, },
opts = { opts = {
win_options = { win_options = {
winhighlight = { winhighlight = {
FloatBorder = "LspInfoBorder", FloatBorder = "LspInfoBorder"
}, }
}, },
position = { position = {
row = 5, row = 5,
col = "50%", col = "50%",
}, },
}, }
}, }
} }
end, end
}, }
} }

8
lua/plugins/notify.lua
View File

@ -1,8 +0,0 @@
return {
{
"rcarriga/nvim-notify",
opts = {
render = "wrapped-compact",
},
},
}

10
lua/plugins/nvim-tree.lua
View File

@ -18,7 +18,7 @@ return {
enable = true, enable = true,
}, },
hijack_directories = { hijack_directories = {
enable = true, enable = true
}, },
renderer = { renderer = {
highlight_git = true, highlight_git = true,
@ -33,8 +33,8 @@ return {
}, },
view = { view = {
signcolumn = "no", signcolumn = "no",
width = 45, width = 45
}, }
}, }
}, }
} }

17
lua/plugins/statuscol.lua
View File

@ -9,7 +9,7 @@ return {
"toggleterm", "toggleterm",
"dashboard", "dashboard",
"aerial", "aerial",
"NvimTree", "NvimTree"
}, },
segments = { segments = {
-- diagnostic signs -- diagnostic signs
@ -17,10 +17,10 @@ return {
sign = { sign = {
name = { "Diagnostic" }, name = { "Diagnostic" },
colwidth = 2, colwidth = 2,
maxwidth = 1, maxwidth = 1
}, },
auto = true, auto = true,
click = "v:lua.ScSa", click = "v:lua.ScSa"
}, },
-- line numbers -- line numbers
{ {
@ -30,15 +30,16 @@ return {
-- folds -- folds
{ {
text = { builtin.foldfunc }, text = { builtin.foldfunc },
click = "v:lua.ScFa", click = "v:lua.ScFa"
}, },
-- git signs -- git signs
{ {
sign = { namespace = { "gitsigns" } }, sign = { namespace = { "gitsigns" } },
click = "v:lua.ScSa", click = "v:lua.ScSa"
}, }
}, }
}) })
end, end,
}, }
} }

20
lua/plugins/telescope.lua
View File

@ -4,9 +4,9 @@ return {
dependencies = { dependencies = {
"sharkdp/fd", "sharkdp/fd",
"nvim-lua/plenary.nvim", "nvim-lua/plenary.nvim",
"nvim-tree/nvim-web-devicons", 'nvim-tree/nvim-web-devicons',
-- extensionsdiff -- extensionsdiff
"jonarrien/telescope-cmdline.nvim", 'jonarrien/telescope-cmdline.nvim',
"debugloop/telescope-undo.nvim", "debugloop/telescope-undo.nvim",
}, },
tag = "0.1.6", tag = "0.1.6",
@ -14,22 +14,26 @@ return {
defaults = { defaults = {
layout_strategy = "horizontal", layout_strategy = "horizontal",
layout_config = { layout_config = {
prompt_position = "top", prompt_position = "top"
}, },
sorting_strategy = "ascending", sorting_strategy = "ascending",
winblend = 0, winblend = 0,
theme = "dropdown", theme = "dropdown"
}, },
extensions = { extensions = {
cmdline = {}, cmdline = {
undo = {}, },
undo = {
},
}, },
}, },
config = function(_, opts) config = function(_, opts)
require("telescope").setup(opts) require('telescope').setup(opts)
require("telescope").load_extension("cmdline") require("telescope").load_extension("cmdline")
require("telescope").load_extension("undo") require("telescope").load_extension("undo")
end, end
}, },
} }

10
lua/plugins/treesitter.lua
View File

@ -3,7 +3,7 @@ return {
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
build = ":TSUpdate", build = ":TSUpdate",
event = { event = {
"VeryLazy", "VeryLazy"
}, },
dependencies = { dependencies = {
"nvim-treesitter/nvim-treesitter-textobjects", "nvim-treesitter/nvim-treesitter-textobjects",
@ -30,10 +30,10 @@ return {
end, end,
}, },
indent = { indent = {
enable = true, enable = true
}, },
autotag = { autotag = {
enable = true, enable = true
}, },
textobjects = { textobjects = {
move = { move = {
@ -47,6 +47,6 @@ return {
}, },
config = function(_, opts) config = function(_, opts)
require("nvim-treesitter.configs").setup(opts) require("nvim-treesitter.configs").setup(opts)
end, end
}, }
} }

10
lua/plugins/trouble.lua
View File

@ -1,12 +1,12 @@
return { return {
"folke/trouble.nvim", "folke/trouble.nvim",
dependencies = { "nvim-tree/nvim-web-devicons" }, dependencies = { "nvim-tree/nvim-web-devicons" },
opts = function(_) opts = function (_)
local options = require("options") local options = require('options')
return { return {
padding = false, padding = false,
indent_lines = false, indent_lines = false,
auto_jump = {}, auto_jump = { },
signs = { signs = {
error = options.lsp.icons.Error, error = options.lsp.icons.Error,
warning = options.lsp.icons.Warn, warning = options.lsp.icons.Warn,
@ -15,5 +15,5 @@ return {
other = options.lsp.icons.Info, other = options.lsp.icons.Info,
}, },
} }
end, end
} }

20
lua/plugins/ufo.lua
View File

@ -2,16 +2,24 @@ return {
{ {
"kevinhwang91/nvim-ufo", "kevinhwang91/nvim-ufo",
event = { event = {
"InsertEnter", "InsertEnter"
}, },
dependencies = { dependencies = {
"kevinhwang91/promise-async", "kevinhwang91/promise-async"
}, },
opts = { opts = {
preview = {
mappings = {
scrollB = "<C-b>",
scrollF = "<C-f>",
scrollU = "<C-u>",
scrollD = "<C-d>",
},
},
-- register treesitter as source for scopes -- register treesitter as source for scopes
provider_selector = function(_, _, _) provider_selector = function(_, _, _)
return { "treesitter", "indent" } return { 'treesitter', 'indent' }
end, end
}, }
}, }
} }

4
lua/plugins/vscode-theme.lua
View File

@ -6,6 +6,6 @@ return {
style = "dark", style = "dark",
transparent = true, transparent = true,
italic_comments = false, italic_comments = false,
}, }
}, }
} }

30
setup-neovim.sh
View File

@ -2,19 +2,19 @@
printf "Continue copying files and removing current for Neovim (y/n)? " printf "Continue copying files and removing current for Neovim (y/n)? "
read -r choice read -r choice
case "$choice" in case "$choice" in
y | Y) y|Y )
echo "removing current neovim config..." echo "removing current neovim config..."
rm -rfv ~/.config/nvim/* rm -rfv ~/.config/nvim/*
echo "copying files..." echo "copying files..."
cp -rv * ~/.config/nvim/ cp -rv * ~/.config/nvim/
;; ;;
n | N) n|N )
echo "aborting..." echo "aborting..."
exit 0 exit 0
;; ;;
*) * )
echo "invalid" echo "invalid"
exit 1 exit 1
;; ;;
esac esac