update neovim config to use lazy, fix some issues with screens in general
This commit is contained in:
@@ -1,2 +0,0 @@
|
||||
let g:neovide_refresh_rate=140
|
||||
let g:coq_settings = { 'auto_start': 'shut-up' }
|
||||
+40
-626
@@ -1,9 +1,11 @@
|
||||
-- some basic options
|
||||
local vim = vim
|
||||
local fn = vim.fn
|
||||
vim.g.mapleader = "\\"
|
||||
vim.g.maplocalleader = "\\"
|
||||
|
||||
-- nvim tree said to disable netrw
|
||||
vim.g.loaded_netrw = 1
|
||||
vim.g.loaded_netrwPlugin = 1
|
||||
vim.g.noswapfile = true
|
||||
vim.g.python3_host_prog = fn.exepath("python3")
|
||||
|
||||
vim.opt.tabstop = 4
|
||||
vim.opt.shiftwidth = 4
|
||||
@@ -14,36 +16,30 @@ vim.opt.autoindent = true
|
||||
vim.opt.smartindent = true
|
||||
vim.opt.smarttab = true
|
||||
vim.opt.number = true
|
||||
vim.o.hidden = true
|
||||
vim.o.signcolumn = 'auto'
|
||||
-- vim.o.breakindent = false -- I think this looks bad
|
||||
vim.o.errorbells = true
|
||||
vim.o.clipboard = "unnamedplus"
|
||||
vim.g.noswapfile = true
|
||||
vim.cmd [[set mouse=a]] -- enable mouse
|
||||
vim.wo.cursorline = true
|
||||
vim.opt.hlsearch = false
|
||||
vim.opt.wrap = true
|
||||
vim.opt.linebreak = true
|
||||
vim.opt.showmatch = true
|
||||
vim.opt.completeopt = { 'menu', 'menuone', 'noselect', 'noinsert' }
|
||||
vim.opt.shortmess = vim.opt.shortmess + "c"
|
||||
|
||||
vim.o.laststatus = 3
|
||||
vim.o.cmdheight = 0 -- hides commandbar when not in use, looks ok
|
||||
|
||||
vim.opt.autochdir = true
|
||||
vim.opt.spelllang = 'en_us'
|
||||
|
||||
vim.g.python3_host_prog = '/home/frosty/.dotfiles/nvim/env/bin/python'
|
||||
|
||||
vim.api.nvim_create_user_command('W', 'write', {})
|
||||
|
||||
vim.opt.foldmethod = "expr"
|
||||
vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
|
||||
-- hit zc to enable folding
|
||||
vim.o.foldenable = false
|
||||
|
||||
vim.g.neomake_open_list = 2
|
||||
vim.o.foldenable = false
|
||||
vim.o.laststatus = 3
|
||||
vim.o.cmdheight = 0 -- hides commandbar when not in use, looks ok
|
||||
vim.o.hidden = true
|
||||
vim.o.signcolumn = 'auto'
|
||||
-- vim.o.breakindent = false -- I think this looks bad
|
||||
vim.o.errorbells = true
|
||||
vim.o.clipboard = "unnamedplus"
|
||||
vim.o.mouse = 'a'
|
||||
vim.o.mousemoveevent = true
|
||||
vim.wo.cursorline = true
|
||||
|
||||
vim.api.nvim_create_user_command('W', 'write', {})
|
||||
|
||||
function map(mode, shortcut, command)
|
||||
vim.api.nvim_set_keymap(mode, shortcut, command, { noremap = true, silent = true })
|
||||
@@ -59,615 +55,33 @@ function imap(shortcut, command)
|
||||
map('i', shortcut, command)
|
||||
end
|
||||
|
||||
vim.opt.guifont = "Hack Nerd Font:h12"
|
||||
if vim.g.neovide then
|
||||
vim.g.neovide_refresh_rate = 140
|
||||
-- change to whatever font you prefer
|
||||
-- can check font with fc-cache on linux
|
||||
vim.g.neovide_hide_mouse_when_typing = true
|
||||
vim.g.neovide_refresh_rate_idle = 140
|
||||
vim.g.neovide_scale_factor = 1.0
|
||||
-- zoom with CTRL - and CTRL +
|
||||
local change_scale_factor = function(delta)
|
||||
vim.g.neovide_scale_factor = vim.g.neovide_scale_factor * delta
|
||||
end
|
||||
vim.keymap.set("n", "<C-=>", function()
|
||||
change_scale_factor(1.25)
|
||||
end)
|
||||
vim.keymap.set("n", "<C-->", function()
|
||||
change_scale_factor(1 / 1.25)
|
||||
end)
|
||||
end
|
||||
nmap("<leader>ec", ':edit ' .. vim.fn.stdpath('config') .. '/init.lua<CR>')
|
||||
|
||||
|
||||
-- <leader> is leader key; default is \
|
||||
nmap("<leader>v", "<cmd>NvimTreeToggle<cr>")
|
||||
nmap("<leader>ec", "<cmd>e ~/.config/nvim/init.lua<cr>")
|
||||
nmap("<leader>sc", "<cmd>source ~/.config/nvim/init.lua<cr><cmd>PackerClean<cr><cmd>PackerCompile<cr>")
|
||||
|
||||
-- buffer commands
|
||||
nmap("<leader>b", "<cmd>BufferLineCyclePrev<cr>")
|
||||
nmap("<leader>n", "<cmd>BufferLineCycleNext<cr>")
|
||||
nmap("<leader>gb", "<cmd>BufferLinePick<cr>")
|
||||
nmap("<leader>w", "<cmd>bdelete!<cr>")
|
||||
nmap("<leader>f", "<cmd>Telescope live_grep<cr>")
|
||||
-- toggle terminal in both modes
|
||||
nmap("<leader>t", "<cmd>FloatermToggle<cr>")
|
||||
map("t", "<leader>t", "<cmd>FloatermToggle<cr>")
|
||||
nmap("<leader>dd", "<cmd>lua vim.diagnostic.open_float() <CR>")
|
||||
|
||||
nmap("<leader>dd", "<cmd> lua vim.diagnostic.open_float() <CR>")
|
||||
|
||||
vim.keymap.set("n", "<C-a>", function()
|
||||
require("dial.map").manipulate("increment", "normal")
|
||||
end)
|
||||
vim.keymap.set("n", "<C-x>", function()
|
||||
require("dial.map").manipulate("decrement", "normal")
|
||||
end)
|
||||
|
||||
local augroup = vim.api.nvim_create_augroup("Lspformatting", {})
|
||||
|
||||
-- lsp on_attach mappings
|
||||
local on_attach = function(client, bufnr)
|
||||
if (not bufnr) then
|
||||
return
|
||||
end
|
||||
-- Enable completion triggered by <c-x><c-o>
|
||||
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
|
||||
|
||||
-- Mappings.
|
||||
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
||||
local bufopts = { noremap = true, silent = true, buffer = bufnr }
|
||||
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
|
||||
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
|
||||
vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
|
||||
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
|
||||
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
|
||||
vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, bufopts)
|
||||
vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, bufopts)
|
||||
vim.keymap.set('n', '<space>wl', function()
|
||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||
end, bufopts)
|
||||
vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
|
||||
vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
|
||||
vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
|
||||
vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
|
||||
vim.keymap.set('n', '<space>f', '<cmd>lua vim.lsp.buf.format({ async = true })<CR>', bufopts)
|
||||
|
||||
-- require "coq".lsp_ensure_capabilities {}
|
||||
require 'illuminate'.on_attach(client)
|
||||
|
||||
-- format on save does not work for python for some reason
|
||||
if client.supports_method("textDocument/formatting") then
|
||||
vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
|
||||
vim.api.nvim_create_autocmd("BufWritePre", {
|
||||
group = augroup,
|
||||
buffer = bufnr,
|
||||
callback = function()
|
||||
vim.lsp.buf.format({
|
||||
bufnr = bufnr,
|
||||
})
|
||||
end
|
||||
})
|
||||
-- Bootstrap lazy.nvim
|
||||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
if not (vim.uv or vim.loop).fs_stat(lazypath) then
|
||||
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
|
||||
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
|
||||
if vim.v.shell_error ~= 0 then
|
||||
vim.api.nvim_echo({
|
||||
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
|
||||
{ out, "WarningMsg" },
|
||||
{ "\nPress any key to exit..." },
|
||||
}, true, {})
|
||||
vim.fn.getchar()
|
||||
os.exit(1)
|
||||
end
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
local lsp = require "lspconfig"
|
||||
local lsp_defaults = lsp.util.default_config
|
||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
capabilities.offsetEncoding = { "utf-16" }
|
||||
|
||||
lsp.clangd.setup { on_attach = on_attach, capabilities = capabilities }
|
||||
lsp.ts_ls.setup { on_attach = on_attach, capabilities = capabilities }
|
||||
lsp.hls.setup { on_attach = on_attach, capabilities = capabilities } -- haskell language server
|
||||
lsp.pyright.setup { on_attach = on_attach, capabilities = capabilities }
|
||||
lsp.svelte.setup { on_attach = on_attach, capabilities = capabilities }
|
||||
lsp.marksman.setup { on_attach = on_attach, capabilities = capabilities }
|
||||
lsp.rust_analyzer.setup { on_attach = on_attach,
|
||||
capabilities = capabilities,
|
||||
settings = {
|
||||
["rust-analyzer"] = {
|
||||
checkOnSave = true,
|
||||
check = {
|
||||
enable = true,
|
||||
command = "clippy",
|
||||
features = "all"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
lsp.lua_ls.setup { on_attach = on_attach,
|
||||
capabilities = capabilities,
|
||||
settings = {
|
||||
Lua = {
|
||||
diagnostics = {
|
||||
globals = { 'vim' }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
lsp.tailwindcss.setup { on_attach = on_attach,
|
||||
capabilities = capabilities
|
||||
}
|
||||
|
||||
lsp.julials.setup {
|
||||
capabilities = capabilities,
|
||||
on_new_config = function(new_config, _)
|
||||
local julia = vim.fn.expand("~/.julia/environments/nvim-lspconfig/bin/julia")
|
||||
if lsp.util.path.is_file(julia) then
|
||||
vim.notify("running julials")
|
||||
new_config.cmd[1] = julia
|
||||
end
|
||||
end,
|
||||
on_attach = on_attach
|
||||
}
|
||||
|
||||
-- kill eslint_d on exit
|
||||
local on_leave_group = vim.api.nvim_create_augroup("OnLeaveGroup", {})
|
||||
vim.api.nvim_create_autocmd("VimLeave", {
|
||||
group = on_leave_group,
|
||||
command = "silent !killall -q eslint_d",
|
||||
require("lazy").setup({
|
||||
spec = {
|
||||
{ import = "plugins" }
|
||||
},
|
||||
checker = { enabled = true }
|
||||
})
|
||||
|
||||
--[[ local vertical_help = vim.api.nvim_create_augroup("vertical_help", {})
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
pattern = 'help',
|
||||
group = vertical_help,
|
||||
command = ":windcmd L"
|
||||
})
|
||||
]]
|
||||
|
||||
-- packer boilerplate
|
||||
local fn = vim.fn
|
||||
local install_path = fn.stdpath('data') .. '/site/pack/packer/start/packer.nvim'
|
||||
if fn.empty(fn.glob(install_path)) > 0 then
|
||||
packer_bootstrap = fn.system({ 'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim',
|
||||
install_path })
|
||||
end
|
||||
|
||||
vim.cmd("colorscheme iceberg")
|
||||
|
||||
return require('packer').startup(function(use)
|
||||
use 'wbthomason/packer.nvim'
|
||||
use 'nvim-lua/plenary.nvim'
|
||||
use 'neovim/nvim-lspconfig'
|
||||
use {
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
run = ':TSUpdate',
|
||||
config = function()
|
||||
require('nvim-treesitter.configs').setup {
|
||||
highlight = {
|
||||
enable = true
|
||||
},
|
||||
}
|
||||
end
|
||||
}
|
||||
use {
|
||||
'echasnovski/mini.icons'
|
||||
}
|
||||
use {
|
||||
'nvim-tree/nvim-web-devicons',
|
||||
}
|
||||
use {
|
||||
'nvim-tree/nvim-tree.lua',
|
||||
after = "nvim-web-devicons",
|
||||
requires = "nvim-tree/nvim-web-devicons",
|
||||
config = function()
|
||||
require('nvim-tree').setup {
|
||||
hijack_cursor = true,
|
||||
disable_netrw = true,
|
||||
select_prompts = true,
|
||||
renderer = {
|
||||
add_trailing = true,
|
||||
hidden_display = "all",
|
||||
highlight_opened_files = "icon"
|
||||
}
|
||||
}
|
||||
end
|
||||
}
|
||||
use {
|
||||
"hrsh7th/nvim-cmp",
|
||||
requires = {
|
||||
"hrsh7th/cmp-buffer", "hrsh7th/cmp-nvim-lsp",
|
||||
"L3MON4D3/LuaSnip", "rafamadriz/friendly-snippets",
|
||||
'hrsh7th/cmp-nvim-lua', 'hrsh7th/cmp-path',
|
||||
'hrsh7th/cmp-calc', 'hrsh7th/cmp-cmdline', 'f3fora/cmp-spell',
|
||||
},
|
||||
config = function()
|
||||
local cmp = require("cmp")
|
||||
local luasnip = require('luasnip')
|
||||
|
||||
cmp.setup({
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
luasnip.lsp_expand(args.body)
|
||||
end
|
||||
},
|
||||
sources = {
|
||||
{ name = 'path' },
|
||||
{ name = 'nvim_lsp', keyword_length = 1 },
|
||||
{ name = 'buffer', keyword_length = 3 },
|
||||
{ name = 'luasnip', keyword_length = 2 },
|
||||
},
|
||||
window = {
|
||||
completion = cmp.config.window.bordered(),
|
||||
documentation = cmp.config.window.bordered()
|
||||
},
|
||||
formatting = {
|
||||
fields = { 'menu', 'abbr', 'kind' },
|
||||
format = function(entry, item)
|
||||
local menu_icon = {
|
||||
nvim_lsp = 'λ',
|
||||
luasnip = '⋗',
|
||||
buffer = 'Ω',
|
||||
path = '🖫',
|
||||
}
|
||||
|
||||
item.menu = menu_icon[entry.source.name]
|
||||
return item
|
||||
end,
|
||||
},
|
||||
mapping = {
|
||||
['<Up>'] = cmp.mapping.select_prev_item(select_opts),
|
||||
['<Down>'] = cmp.mapping.select_next_item(select_opts),
|
||||
|
||||
['<C-u>'] = cmp.mapping.scroll_docs(-4),
|
||||
['<C-d>'] = cmp.mapping.scroll_docs(4),
|
||||
|
||||
['<C-e>'] = cmp.mapping.abort(),
|
||||
['<C-y>'] = cmp.mapping.confirm({ select = true }),
|
||||
['<CR>'] = cmp.mapping.confirm({ select = false }),
|
||||
|
||||
['<C-f>'] = cmp.mapping(function(fallback)
|
||||
if luasnip.jumpable(1) then
|
||||
luasnip.jump(1)
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end, { 'i', 's' }),
|
||||
|
||||
['<C-b>'] = cmp.mapping(function(fallback)
|
||||
if luasnip.jumpable(-1) then
|
||||
luasnip.jump(-1)
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end, { 'i', 's' }),
|
||||
}
|
||||
})
|
||||
|
||||
cmp.setup.cmdline({ '/', '?' }, {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = {
|
||||
{ name = 'buffer' }
|
||||
}
|
||||
})
|
||||
|
||||
-- to select something in the cmdline need to use <C-n>
|
||||
cmp.setup.cmdline(':', {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'path' }
|
||||
}, {
|
||||
{ name = 'cmdline' }
|
||||
}),
|
||||
matching = { disallow_symbol_nonprefix_matching = false }
|
||||
})
|
||||
end,
|
||||
}
|
||||
use {
|
||||
'nvimtools/none-ls.nvim',
|
||||
config = function()
|
||||
local null_ls = require("null-ls")
|
||||
local lsp_conf = require("lspconfig")
|
||||
|
||||
-- util.root_pattern returns a function
|
||||
local find_pyproject = lsp_conf.util.root_pattern('pyproject.toml')
|
||||
local find_flake8 = lsp_conf.util.root_pattern('.flake8')
|
||||
-- local find_eslint = lsp_conf.util.root_pattern('eslint.config.js')
|
||||
|
||||
local isort = null_ls.builtins.formatting.isort.with({
|
||||
cwd = function(params)
|
||||
return find_pyproject(params.root) or params.root
|
||||
end
|
||||
})
|
||||
|
||||
local black = null_ls.builtins.formatting.black.with({
|
||||
cwd = function(params)
|
||||
return find_pyproject(params.root) or params.root
|
||||
end
|
||||
})
|
||||
|
||||
local flake8 = require("none-ls.diagnostics.flake8").with({
|
||||
cwd = function(params)
|
||||
return find_flake8(params.root) or params.root
|
||||
end
|
||||
})
|
||||
|
||||
local eslint_format = require("none-ls.formatting.eslint_d").with({
|
||||
extra_filetypes = { "svelte" },
|
||||
})
|
||||
|
||||
local eslint_diag = require("none-ls.diagnostics.eslint_d").with({
|
||||
extra_filetypes = { "svelte" },
|
||||
})
|
||||
|
||||
local eslint_code_actions = require("none-ls.code_actions.eslint_d").with({
|
||||
extra_filetypes = { "svelte" },
|
||||
})
|
||||
|
||||
local spellcheck = null_ls.builtins.completion.spell.with({
|
||||
filetypes = { "markdown" }
|
||||
})
|
||||
|
||||
null_ls.setup {
|
||||
on_attach = on_attach,
|
||||
sources = {
|
||||
eslint_format,
|
||||
eslint_diag,
|
||||
eslint_code_actions,
|
||||
null_ls.builtins.code_actions.gitsigns,
|
||||
null_ls.builtins.completion.luasnip,
|
||||
null_ls.builtins.completion.tags,
|
||||
spellcheck,
|
||||
flake8,
|
||||
isort,
|
||||
black,
|
||||
flake8
|
||||
}
|
||||
}
|
||||
end,
|
||||
requires = { "nvim-lua/plenary.nvim",
|
||||
"nvimtools/none-ls-extras.nvim"
|
||||
},
|
||||
}
|
||||
use {
|
||||
'folke/trouble.nvim',
|
||||
config = function()
|
||||
require("trouble").setup {
|
||||
nmap("<leader>xx", "<cmd>Trouble<cr>"),
|
||||
}
|
||||
end
|
||||
}
|
||||
use {
|
||||
"hedyhli/outline.nvim",
|
||||
config = function()
|
||||
nmap("<leader>o", "<cmd>Outline<CR>")
|
||||
require("outline").setup {
|
||||
-- Your setup opts here (leave empty to use defaults)
|
||||
}
|
||||
end,
|
||||
}
|
||||
use {
|
||||
'akinsho/bufferline.nvim',
|
||||
tag = "*",
|
||||
requires = 'nvim-tree/nvim-web-devicons',
|
||||
config = function()
|
||||
require("bufferline").setup {
|
||||
options = {
|
||||
offsets = {
|
||||
{
|
||||
filetype = "NvimTree",
|
||||
text = "Neovim - Files",
|
||||
highlight = "Directory",
|
||||
separator = true
|
||||
},
|
||||
},
|
||||
separator_style = "slope",
|
||||
diagnostics = "nvim_lsp",
|
||||
}
|
||||
}
|
||||
end
|
||||
}
|
||||
use {
|
||||
"nvim-lualine/lualine.nvim",
|
||||
event = "VimEnter",
|
||||
config = function()
|
||||
require("lualine").setup {
|
||||
extensions = { 'nvim-tree', 'fzf', 'symbols-outline' },
|
||||
options = {
|
||||
component_separators = '',
|
||||
section_separators = { left = '', right = '' },
|
||||
theme = 'iceberg_dark',
|
||||
globalstatus = true,
|
||||
},
|
||||
sections = {
|
||||
-- would be nice to open code actions but w/e
|
||||
lualine_b = {
|
||||
{
|
||||
'diff',
|
||||
},
|
||||
},
|
||||
lualine_c = {
|
||||
{
|
||||
'diagnostics',
|
||||
sources = { 'nvim_diagnostic', 'nvim_lsp' },
|
||||
sections = { 'hint', 'warn', 'error' },
|
||||
colored = true,
|
||||
update_in_insert = true,
|
||||
always_visible = false,
|
||||
on_click = function()
|
||||
require("trouble").toggle("diagnostics")
|
||||
end
|
||||
}
|
||||
},
|
||||
lualine_x = { 'filetype' }
|
||||
}
|
||||
}
|
||||
end,
|
||||
requires = { 'nvim-tree/nvim-web-devicons', opt = true }
|
||||
}
|
||||
use {
|
||||
"startup-nvim/startup.nvim",
|
||||
after = "nvim-web-devicons",
|
||||
requires = {
|
||||
"nvim-tree/nvim-web-devicons",
|
||||
"nvim-telescope/telescope.nvim",
|
||||
"nvim-lua/plenary.nvim"
|
||||
},
|
||||
config = function()
|
||||
local startup = require("startup")
|
||||
local headers = require("startup.headers")
|
||||
local start_fn = require("startup.functions")
|
||||
startup.setup({
|
||||
banner = {
|
||||
type = "text",
|
||||
align = "center",
|
||||
title = "Header",
|
||||
content = headers.hydra_header,
|
||||
highlight = "Statement",
|
||||
},
|
||||
quote = {
|
||||
type = "text",
|
||||
align = "center",
|
||||
fold_section = false,
|
||||
title = "Quote",
|
||||
margin = 5,
|
||||
content = require("startup.functions").quote(),
|
||||
highlight = "Constant",
|
||||
default_color = "",
|
||||
},
|
||||
body = {
|
||||
type = "mapping",
|
||||
align = "center",
|
||||
fold_section = false,
|
||||
title = "Basic Commands",
|
||||
margin = 5,
|
||||
content = {
|
||||
{ " New File", "lua require'startup'.new_file()", "<leader>nf" },
|
||||
{ " Recent Files", "Telescope oldfiles", "<leader>of" },
|
||||
{ " Find File", "Telescope find_files", "<leader>ff" },
|
||||
},
|
||||
highlight = "String",
|
||||
default_color = "",
|
||||
},
|
||||
plugin_info = {
|
||||
type = "text",
|
||||
content = require("startup.functions").packer_plugins(),
|
||||
align = "center",
|
||||
fold_section = false,
|
||||
title = "",
|
||||
margin = 5,
|
||||
highlight = "TSString",
|
||||
default_color = "#FFFFFF",
|
||||
},
|
||||
options = {
|
||||
mapping_keys = true,
|
||||
},
|
||||
parts = { "banner", "quote", "body", "plugin_info" }
|
||||
})
|
||||
end
|
||||
}
|
||||
use 'RRethy/vim-illuminate'
|
||||
use {
|
||||
'nvim-telescope/telescope.nvim',
|
||||
requires = { 'nvim-lua/plenary.nvim' },
|
||||
config = function()
|
||||
require("telescope").setup {}
|
||||
end
|
||||
}
|
||||
use {
|
||||
'j-hui/fidget.nvim',
|
||||
config = function()
|
||||
require('fidget').setup {}
|
||||
end
|
||||
}
|
||||
use 'voldikss/vim-floaterm'
|
||||
use { 'norcalli/nvim-colorizer.lua',
|
||||
config = function()
|
||||
require('colorizer').setup {
|
||||
'css',
|
||||
'scss',
|
||||
'javascript',
|
||||
'toml'
|
||||
}
|
||||
end,
|
||||
}
|
||||
use { 'lewis6991/gitsigns.nvim',
|
||||
config = function()
|
||||
require('gitsigns').setup {
|
||||
on_attach = function()
|
||||
nmap('<leader>hd', '<cmd>Gitsigns diffthis<cr>')
|
||||
nmap('<leader>hr', '<cmd>Gitsigns reset_hunk<cr>')
|
||||
nmap('<leader>td', '<cmd>Gitsigns toggle_deleted<cr>')
|
||||
end
|
||||
}
|
||||
end
|
||||
}
|
||||
use { 'sudormrfbin/cheatsheet.nvim',
|
||||
-- default toggle is <leader>?
|
||||
requires = {
|
||||
{ 'nvim-telescope/telescope.nvim' },
|
||||
{ 'nvim-lua/popup.nvim' },
|
||||
{ 'nvim-lua/plenary.nvim' },
|
||||
}
|
||||
}
|
||||
use { 'stevearc/dressing.nvim' }
|
||||
if packer_bootstrap then
|
||||
require('packer').sync()
|
||||
end
|
||||
use {
|
||||
"danymat/neogen",
|
||||
config = function()
|
||||
local neogen = require('neogen')
|
||||
neogen.setup({
|
||||
snippet_engine = "luasnip",
|
||||
placeholders_hl = "None" -- fixes weird bug where the entire page gets colored with this color
|
||||
})
|
||||
nmap('<leader>d', ":lua require('neogen').generate()<CR>")
|
||||
end
|
||||
}
|
||||
use {
|
||||
"folke/which-key.nvim",
|
||||
config = function()
|
||||
local which_key = require('which-key')
|
||||
which_key.setup({
|
||||
preset = "modern"
|
||||
})
|
||||
end
|
||||
,
|
||||
}
|
||||
use {
|
||||
'numToStr/Comment.nvim',
|
||||
config = function()
|
||||
require('Comment').setup()
|
||||
end
|
||||
}
|
||||
use({
|
||||
"kylechui/nvim-surround",
|
||||
tag = "*", -- Use for stability; omit to use `main` branch for the latest features
|
||||
config = function()
|
||||
require("nvim-surround").setup({
|
||||
-- Configuration here, or leave empty to use defaults
|
||||
})
|
||||
end
|
||||
})
|
||||
use {
|
||||
'pwntester/octo.nvim',
|
||||
requires = {
|
||||
'nvim-lua/plenary.nvim',
|
||||
'nvim-telescope/telescope.nvim',
|
||||
'nvim-tree/nvim-web-devicons',
|
||||
},
|
||||
config = function()
|
||||
require "octo".setup()
|
||||
end
|
||||
}
|
||||
use {
|
||||
"monaqa/dial.nvim",
|
||||
config = function()
|
||||
local augend = require("dial.augend")
|
||||
local dial = require("dial.config")
|
||||
local d_map = require("dial.map")
|
||||
|
||||
dial.augends:register_group {
|
||||
default = {
|
||||
augend.integer.alias.decimal,
|
||||
augend.date.alias["%m/%d"],
|
||||
augend.constant.alias.alpha,
|
||||
}
|
||||
}
|
||||
end
|
||||
}
|
||||
use "cocopon/iceberg.vim"
|
||||
end)
|
||||
|
||||
@@ -0,0 +1,672 @@
|
||||
-- some basic options
|
||||
local vim = vim
|
||||
local fn = vim.fn
|
||||
|
||||
-- nvim tree said to disable netrw
|
||||
vim.g.loaded_netrw = 1
|
||||
vim.g.loaded_netrwPlugin = 1
|
||||
|
||||
vim.opt.tabstop = 4
|
||||
vim.opt.shiftwidth = 4
|
||||
vim.opt.softtabstop = 2
|
||||
vim.opt.expandtab = true
|
||||
vim.opt.termguicolors = true
|
||||
vim.opt.autoindent = true
|
||||
vim.opt.smartindent = true
|
||||
vim.opt.smarttab = true
|
||||
vim.opt.number = true
|
||||
vim.o.hidden = true
|
||||
vim.o.signcolumn = 'auto'
|
||||
-- vim.o.breakindent = false -- I think this looks bad
|
||||
vim.o.errorbells = true
|
||||
vim.o.clipboard = "unnamedplus"
|
||||
vim.g.noswapfile = true
|
||||
vim.cmd [[set mouse=a]] -- enable mouse
|
||||
vim.wo.cursorline = true
|
||||
vim.opt.hlsearch = false
|
||||
vim.opt.wrap = true
|
||||
vim.opt.linebreak = true
|
||||
vim.opt.showmatch = true
|
||||
vim.opt.completeopt = { 'menu', 'menuone', 'noselect', 'noinsert' }
|
||||
vim.opt.shortmess = vim.opt.shortmess + "c"
|
||||
vim.opt.autochdir = true
|
||||
|
||||
vim.o.laststatus = 3
|
||||
vim.o.cmdheight = 0 -- hides commandbar when not in use, looks ok
|
||||
|
||||
vim.opt.spelllang = 'en_us'
|
||||
|
||||
vim.g.python3_host_prog = fn.exepath("python3")
|
||||
vim.api.nvim_create_user_command('W', 'write', {})
|
||||
|
||||
vim.opt.foldmethod = "expr"
|
||||
vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
|
||||
-- hit zc to enable folding
|
||||
vim.o.foldenable = false
|
||||
|
||||
vim.g.neomake_open_list = 2
|
||||
|
||||
function map(mode, shortcut, command)
|
||||
vim.api.nvim_set_keymap(mode, shortcut, command, { noremap = true, silent = true })
|
||||
end
|
||||
|
||||
-- normal mode map
|
||||
function nmap(shortcut, command)
|
||||
map('n', shortcut, command)
|
||||
end
|
||||
|
||||
-- insert mode map
|
||||
function imap(shortcut, command)
|
||||
map('i', shortcut, command)
|
||||
end
|
||||
|
||||
vim.opt.guifont = "Hack Nerd Font:h12"
|
||||
if vim.g.neovide then
|
||||
vim.g.neovide_refresh_rate = 140
|
||||
-- change to whatever font you prefer
|
||||
-- can check font with fc-cache on linux
|
||||
vim.g.neovide_hide_mouse_when_typing = true
|
||||
vim.g.neovide_refresh_rate_idle = 140
|
||||
vim.g.neovide_scale_factor = 1.0
|
||||
-- zoom with CTRL - and CTRL +
|
||||
local change_scale_factor = function(delta)
|
||||
vim.g.neovide_scale_factor = vim.g.neovide_scale_factor * delta
|
||||
end
|
||||
vim.keymap.set("n", "<C-=>", function()
|
||||
change_scale_factor(1.25)
|
||||
end)
|
||||
vim.keymap.set("n", "<C-->", function()
|
||||
change_scale_factor(1 / 1.25)
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
-- <leader> is leader key; default is \
|
||||
nmap("<leader>v", "<cmd>NvimTreeToggle<cr>")
|
||||
nmap("<leader>ec", "<cmd>e ~/.config/nvim/init.lua<cr>")
|
||||
nmap("<leader>sc", "<cmd>source ~/.config/nvim/init.lua<cr><cmd>PackerClean<cr><cmd>PackerCompile<cr>")
|
||||
|
||||
-- buffer commands
|
||||
nmap("<leader>b", "<cmd>BufferLineCyclePrev<cr>")
|
||||
nmap("<leader>n", "<cmd>BufferLineCycleNext<cr>")
|
||||
nmap("<leader>gb", "<cmd>BufferLinePick<cr>")
|
||||
nmap("<leader>w", "<cmd>bdelete!<cr>")
|
||||
nmap("<leader>f", "<cmd>Telescope live_grep<cr>")
|
||||
-- toggle terminal in both modes
|
||||
nmap("<leader>t", "<cmd>FloatermToggle<cr>")
|
||||
map("t", "<leader>t", "<cmd>FloatermToggle<cr>")
|
||||
|
||||
nmap("<leader>dd", "<cmd> lua vim.diagnostic.open_float() <CR>")
|
||||
|
||||
vim.keymap.set("n", "<C-a>", function()
|
||||
require("dial.map").manipulate("increment", "normal")
|
||||
end)
|
||||
vim.keymap.set("n", "<C-x>", function()
|
||||
require("dial.map").manipulate("decrement", "normal")
|
||||
end)
|
||||
|
||||
local augroup = vim.api.nvim_create_augroup("Lspformatting", {})
|
||||
|
||||
-- lsp on_attach mappings
|
||||
local on_attach = function(client, bufnr)
|
||||
if (not bufnr) then
|
||||
return
|
||||
end
|
||||
-- Enable completion triggered by <c-x><c-o>
|
||||
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
|
||||
|
||||
-- Mappings.
|
||||
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
||||
local bufopts = { noremap = true, silent = true, buffer = bufnr }
|
||||
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
|
||||
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
|
||||
vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
|
||||
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
|
||||
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
|
||||
vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, bufopts)
|
||||
vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, bufopts)
|
||||
vim.keymap.set('n', '<space>wl', function()
|
||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||
end, bufopts)
|
||||
vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
|
||||
vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
|
||||
vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
|
||||
vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
|
||||
vim.keymap.set('n', '<space>f', '<cmd>lua vim.lsp.buf.format({ async = true })<CR>', bufopts)
|
||||
|
||||
-- require "coq".lsp_ensure_capabilities {}
|
||||
require 'illuminate'.on_attach(client)
|
||||
|
||||
-- format on save does not work for python for some reason
|
||||
if client.supports_method("textDocument/formatting") then
|
||||
vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
|
||||
vim.api.nvim_create_autocmd("BufWritePre", {
|
||||
group = augroup,
|
||||
buffer = bufnr,
|
||||
callback = function()
|
||||
vim.lsp.buf.format({
|
||||
bufnr = bufnr,
|
||||
})
|
||||
end
|
||||
})
|
||||
end
|
||||
end
|
||||
|
||||
local lsp = require "lspconfig"
|
||||
local lsp_defaults = lsp.util.default_config
|
||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
capabilities.offsetEncoding = { "utf-16" }
|
||||
|
||||
lsp.clangd.setup { on_attach = on_attach, capabilities = capabilities }
|
||||
lsp.ts_ls.setup { on_attach = on_attach, capabilities = capabilities }
|
||||
lsp.hls.setup { on_attach = on_attach, capabilities = capabilities } -- haskell language server
|
||||
-- lsp.pyright.setup { on_attach = on_attach, capabilities = capabilities }
|
||||
lsp.ruff.setup { on_attach = on_attach, capabilities = capabilities }
|
||||
lsp.svelte.setup { on_attach = on_attach, capabilities = capabilities }
|
||||
lsp.marksman.setup { on_attach = on_attach, capabilities = capabilities }
|
||||
lsp.rust_analyzer.setup { on_attach = on_attach,
|
||||
capabilities = capabilities,
|
||||
settings = {
|
||||
["rust-analyzer"] = {
|
||||
checkOnSave = true,
|
||||
check = {
|
||||
enable = true,
|
||||
command = "clippy",
|
||||
features = "all"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
lsp.lua_ls.setup { on_attach = on_attach,
|
||||
capabilities = capabilities,
|
||||
settings = {
|
||||
Lua = {
|
||||
diagnostics = {
|
||||
globals = { 'vim' }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
lsp.tailwindcss.setup { on_attach = on_attach,
|
||||
capabilities = capabilities
|
||||
}
|
||||
|
||||
lsp.julials.setup {
|
||||
capabilities = capabilities,
|
||||
on_new_config = function(new_config, _)
|
||||
local julia = vim.fn.expand("~/.julia/environments/nvim-lspconfig/bin/julia")
|
||||
if lsp.util.path.is_file(julia) then
|
||||
vim.notify("running julials")
|
||||
new_config.cmd[1] = julia
|
||||
end
|
||||
end,
|
||||
on_attach = on_attach
|
||||
}
|
||||
|
||||
-- kill eslint_d on exit
|
||||
local on_leave_group = vim.api.nvim_create_augroup("OnLeaveGroup", {})
|
||||
vim.api.nvim_create_autocmd("VimLeave", {
|
||||
group = on_leave_group,
|
||||
command = "silent !killall -q eslint_d",
|
||||
})
|
||||
|
||||
--[[ local vertical_help = vim.api.nvim_create_augroup("vertical_help", {})
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
pattern = 'help',
|
||||
group = vertical_help,
|
||||
command = ":windcmd L"
|
||||
})
|
||||
]]
|
||||
|
||||
-- packer boilerplate
|
||||
local install_path = fn.stdpath('data') .. '/site/pack/packer/start/packer.nvim'
|
||||
if fn.empty(fn.glob(install_path)) > 0 then
|
||||
packer_bootstrap = fn.system({ 'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim',
|
||||
install_path })
|
||||
end
|
||||
|
||||
vim.cmd("colorscheme carbonfox")
|
||||
|
||||
return require('packer').startup(function(use)
|
||||
use 'wbthomason/packer.nvim'
|
||||
use 'nvim-lua/plenary.nvim'
|
||||
use 'neovim/nvim-lspconfig'
|
||||
use {
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
run = ':TSUpdate',
|
||||
config = function()
|
||||
require('nvim-treesitter.configs').setup {
|
||||
highlight = {
|
||||
enable = true
|
||||
},
|
||||
}
|
||||
end
|
||||
}
|
||||
use {
|
||||
'echasnovski/mini.icons'
|
||||
}
|
||||
use {
|
||||
'nvim-tree/nvim-web-devicons',
|
||||
}
|
||||
use {
|
||||
'nvim-tree/nvim-tree.lua',
|
||||
after = "nvim-web-devicons",
|
||||
requires = "nvim-tree/nvim-web-devicons",
|
||||
config = function()
|
||||
require('nvim-tree').setup {
|
||||
hijack_cursor = true,
|
||||
disable_netrw = true,
|
||||
select_prompts = true,
|
||||
renderer = {
|
||||
add_trailing = true,
|
||||
hidden_display = "all",
|
||||
highlight_opened_files = "icon"
|
||||
}
|
||||
}
|
||||
end
|
||||
}
|
||||
use {
|
||||
"hrsh7th/nvim-cmp",
|
||||
requires = {
|
||||
"hrsh7th/cmp-buffer", "hrsh7th/cmp-nvim-lsp",
|
||||
"L3MON4D3/LuaSnip", "rafamadriz/friendly-snippets",
|
||||
'hrsh7th/cmp-nvim-lua', 'hrsh7th/cmp-path',
|
||||
'hrsh7th/cmp-calc', 'hrsh7th/cmp-cmdline', 'f3fora/cmp-spell',
|
||||
},
|
||||
config = function()
|
||||
local cmp = require("cmp")
|
||||
local luasnip = require('luasnip')
|
||||
|
||||
cmp.setup({
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
luasnip.lsp_expand(args.body)
|
||||
end
|
||||
},
|
||||
sources = {
|
||||
{ name = 'path' },
|
||||
{ name = 'nvim_lsp', keyword_length = 1 },
|
||||
{ name = 'buffer', keyword_length = 3 },
|
||||
{ name = 'luasnip', keyword_length = 2 },
|
||||
},
|
||||
window = {
|
||||
completion = cmp.config.window.bordered(),
|
||||
documentation = cmp.config.window.bordered()
|
||||
},
|
||||
formatting = {
|
||||
fields = { 'menu', 'abbr', 'kind' },
|
||||
format = function(entry, item)
|
||||
local menu_icon = {
|
||||
nvim_lsp = 'λ',
|
||||
luasnip = '⋗',
|
||||
buffer = 'Ω',
|
||||
path = '🖫',
|
||||
}
|
||||
|
||||
item.menu = menu_icon[entry.source.name]
|
||||
return item
|
||||
end,
|
||||
},
|
||||
mapping = {
|
||||
['<Up>'] = cmp.mapping.select_prev_item(select_opts),
|
||||
['<Down>'] = cmp.mapping.select_next_item(select_opts),
|
||||
|
||||
['<C-u>'] = cmp.mapping.scroll_docs(-4),
|
||||
['<C-d>'] = cmp.mapping.scroll_docs(4),
|
||||
|
||||
['<C-e>'] = cmp.mapping.abort(),
|
||||
['<C-y>'] = cmp.mapping.confirm({ select = true }),
|
||||
['<CR>'] = cmp.mapping.confirm({ select = false }),
|
||||
|
||||
['<C-f>'] = cmp.mapping(function(fallback)
|
||||
if luasnip.jumpable(1) then
|
||||
luasnip.jump(1)
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end, { 'i', 's' }),
|
||||
|
||||
['<C-b>'] = cmp.mapping(function(fallback)
|
||||
if luasnip.jumpable(-1) then
|
||||
luasnip.jump(-1)
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end, { 'i', 's' }),
|
||||
}
|
||||
})
|
||||
|
||||
cmp.setup.cmdline({ '/', '?' }, {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = {
|
||||
{ name = 'buffer' }
|
||||
}
|
||||
})
|
||||
|
||||
-- to select something in the cmdline need to use <C-n>
|
||||
cmp.setup.cmdline(':', {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'path' }
|
||||
}, {
|
||||
{ name = 'cmdline' }
|
||||
}),
|
||||
matching = { disallow_symbol_nonprefix_matching = false }
|
||||
})
|
||||
end,
|
||||
}
|
||||
use {
|
||||
'nvimtools/none-ls.nvim',
|
||||
config = function()
|
||||
local null_ls = require("null-ls")
|
||||
local lsp_conf = require("lspconfig")
|
||||
|
||||
-- util.root_pattern returns a function
|
||||
local find_pyproject = lsp_conf.util.root_pattern('pyproject.toml')
|
||||
local black = null_ls.builtins.formatting.black
|
||||
|
||||
local eslint_format = require("none-ls.formatting.eslint_d").with({
|
||||
extra_filetypes = { "svelte" },
|
||||
})
|
||||
|
||||
local eslint_diag = require("none-ls.diagnostics.eslint_d").with({
|
||||
extra_filetypes = { "svelte" },
|
||||
})
|
||||
|
||||
local eslint_code_actions = require("none-ls.code_actions.eslint_d").with({
|
||||
extra_filetypes = { "svelte" },
|
||||
})
|
||||
|
||||
local spellcheck = null_ls.builtins.completion.spell.with({
|
||||
filetypes = { "markdown" }
|
||||
})
|
||||
|
||||
null_ls.setup {
|
||||
on_attach = on_attach,
|
||||
sources = {
|
||||
eslint_format,
|
||||
eslint_diag,
|
||||
eslint_code_actions,
|
||||
null_ls.builtins.code_actions.gitsigns,
|
||||
null_ls.builtins.completion.luasnip,
|
||||
null_ls.builtins.completion.tags,
|
||||
spellcheck,
|
||||
--flake8,
|
||||
--isort,
|
||||
black,
|
||||
--flake8
|
||||
}
|
||||
}
|
||||
end,
|
||||
requires = { "nvim-lua/plenary.nvim",
|
||||
"nvimtools/none-ls-extras.nvim"
|
||||
},
|
||||
}
|
||||
use {
|
||||
'folke/trouble.nvim',
|
||||
config = function()
|
||||
require("trouble").setup {
|
||||
nmap("<leader>xx", "<cmd>Trouble<cr>"),
|
||||
}
|
||||
end
|
||||
}
|
||||
use {
|
||||
"hedyhli/outline.nvim",
|
||||
config = function()
|
||||
nmap("<leader>o", "<cmd>Outline<CR>")
|
||||
require("outline").setup {
|
||||
-- Your setup opts here (leave empty to use defaults)
|
||||
}
|
||||
end,
|
||||
}
|
||||
use {
|
||||
'akinsho/bufferline.nvim',
|
||||
tag = "*",
|
||||
requires = 'nvim-tree/nvim-web-devicons',
|
||||
config = function()
|
||||
require("bufferline").setup {
|
||||
options = {
|
||||
offsets = {
|
||||
{
|
||||
filetype = "NvimTree",
|
||||
text = "Neovim - Files",
|
||||
highlight = "Directory",
|
||||
separator = true
|
||||
},
|
||||
},
|
||||
separator_style = "slope",
|
||||
diagnostics = "nvim_lsp",
|
||||
}
|
||||
}
|
||||
end
|
||||
}
|
||||
use {
|
||||
"nvim-lualine/lualine.nvim",
|
||||
event = "VimEnter",
|
||||
config = function()
|
||||
require("lualine").setup {
|
||||
extensions = { 'nvim-tree', 'fzf', 'symbols-outline' },
|
||||
options = {
|
||||
component_separators = '',
|
||||
section_separators = { left = '', right = '' },
|
||||
theme = 'iceberg_dark',
|
||||
globalstatus = true,
|
||||
},
|
||||
sections = {
|
||||
-- would be nice to open code actions but w/e
|
||||
lualine_b = {
|
||||
{
|
||||
'diff',
|
||||
},
|
||||
},
|
||||
lualine_c = {
|
||||
{
|
||||
'diagnostics',
|
||||
sources = { 'nvim_diagnostic', 'nvim_lsp' },
|
||||
sections = { 'hint', 'warn', 'error' },
|
||||
colored = true,
|
||||
update_in_insert = true,
|
||||
always_visible = false,
|
||||
on_click = function()
|
||||
require("trouble").toggle("diagnostics")
|
||||
end
|
||||
}
|
||||
},
|
||||
lualine_x = { 'filetype' }
|
||||
}
|
||||
}
|
||||
end,
|
||||
requires = { 'nvim-tree/nvim-web-devicons', opt = true }
|
||||
}
|
||||
use {
|
||||
"startup-nvim/startup.nvim",
|
||||
after = "nvim-web-devicons",
|
||||
requires = {
|
||||
"nvim-tree/nvim-web-devicons",
|
||||
"nvim-telescope/telescope.nvim",
|
||||
"nvim-lua/plenary.nvim"
|
||||
},
|
||||
config = function()
|
||||
local startup = require("startup")
|
||||
local headers = require("startup.headers")
|
||||
local start_fn = require("startup.functions")
|
||||
startup.setup({
|
||||
banner = {
|
||||
type = "text",
|
||||
align = "center",
|
||||
title = "Header",
|
||||
content = headers.hydra_header,
|
||||
highlight = "Statement",
|
||||
},
|
||||
quote = {
|
||||
type = "text",
|
||||
align = "center",
|
||||
fold_section = false,
|
||||
title = "Quote",
|
||||
margin = 5,
|
||||
content = require("startup.functions").quote(),
|
||||
highlight = "Constant",
|
||||
default_color = "",
|
||||
},
|
||||
body = {
|
||||
type = "mapping",
|
||||
align = "center",
|
||||
fold_section = false,
|
||||
title = "Basic Commands",
|
||||
margin = 5,
|
||||
content = {
|
||||
{ " New File", "lua require'startup'.new_file()", "<leader>nf" },
|
||||
{ " Recent Files", "Telescope oldfiles", "<leader>of" },
|
||||
{ " Find File", "Telescope find_files", "<leader>ff" },
|
||||
},
|
||||
highlight = "String",
|
||||
default_color = "",
|
||||
},
|
||||
plugin_info = {
|
||||
type = "text",
|
||||
content = require("startup.functions").packer_plugins(),
|
||||
align = "center",
|
||||
fold_section = false,
|
||||
title = "",
|
||||
margin = 5,
|
||||
highlight = "TSString",
|
||||
default_color = "#FFFFFF",
|
||||
},
|
||||
options = {
|
||||
mapping_keys = true,
|
||||
},
|
||||
parts = { "banner", "quote", "body", "plugin_info" }
|
||||
})
|
||||
end
|
||||
}
|
||||
use 'RRethy/vim-illuminate'
|
||||
use {
|
||||
'nvim-telescope/telescope.nvim',
|
||||
requires = { 'nvim-lua/plenary.nvim' },
|
||||
config = function()
|
||||
require("telescope").setup {}
|
||||
end
|
||||
}
|
||||
use {
|
||||
'j-hui/fidget.nvim',
|
||||
config = function()
|
||||
require('fidget').setup {}
|
||||
end
|
||||
}
|
||||
use 'voldikss/vim-floaterm'
|
||||
use { 'norcalli/nvim-colorizer.lua',
|
||||
config = function()
|
||||
require('colorizer').setup {
|
||||
'css',
|
||||
'scss',
|
||||
'javascript',
|
||||
'toml'
|
||||
}
|
||||
end,
|
||||
}
|
||||
use { 'lewis6991/gitsigns.nvim',
|
||||
config = function()
|
||||
require('gitsigns').setup {
|
||||
on_attach = function()
|
||||
nmap('<leader>hd', '<cmd>Gitsigns diffthis<cr>')
|
||||
nmap('<leader>hr', '<cmd>Gitsigns reset_hunk<cr>')
|
||||
nmap('<leader>td', '<cmd>Gitsigns toggle_deleted<cr>')
|
||||
end
|
||||
}
|
||||
end
|
||||
}
|
||||
use { 'sudormrfbin/cheatsheet.nvim',
|
||||
-- default toggle is <leader>?
|
||||
requires = {
|
||||
{ 'nvim-telescope/telescope.nvim' },
|
||||
{ 'nvim-lua/popup.nvim' },
|
||||
{ 'nvim-lua/plenary.nvim' },
|
||||
}
|
||||
}
|
||||
use { 'stevearc/dressing.nvim' }
|
||||
if packer_bootstrap then
|
||||
require('packer').sync()
|
||||
end
|
||||
use {
|
||||
"danymat/neogen",
|
||||
config = function()
|
||||
local neogen = require('neogen')
|
||||
neogen.setup({
|
||||
snippet_engine = "luasnip",
|
||||
placeholders_hl = "None", -- fixes weird bug where the entire page gets colored with this color
|
||||
languages = {
|
||||
python = {
|
||||
template = {
|
||||
annotation_convention = "google_docstrings"
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
nmap('<leader>d', ":lua require('neogen').generate()<CR>")
|
||||
end
|
||||
}
|
||||
use {
|
||||
"folke/which-key.nvim",
|
||||
config = function()
|
||||
local which_key = require('which-key')
|
||||
which_key.setup({
|
||||
preset = "modern"
|
||||
})
|
||||
end
|
||||
,
|
||||
}
|
||||
use {
|
||||
'numToStr/Comment.nvim',
|
||||
config = function()
|
||||
require('Comment').setup()
|
||||
end
|
||||
}
|
||||
use({
|
||||
"kylechui/nvim-surround",
|
||||
tag = "*", -- Use for stability; omit to use `main` branch for the latest features
|
||||
config = function()
|
||||
require("nvim-surround").setup({
|
||||
-- Configuration here, or leave empty to use defaults
|
||||
})
|
||||
end
|
||||
})
|
||||
use {
|
||||
'pwntester/octo.nvim',
|
||||
requires = {
|
||||
'nvim-lua/plenary.nvim',
|
||||
'nvim-telescope/telescope.nvim',
|
||||
'nvim-tree/nvim-web-devicons',
|
||||
},
|
||||
config = function()
|
||||
require "octo".setup()
|
||||
end
|
||||
}
|
||||
use {
|
||||
"monaqa/dial.nvim",
|
||||
config = function()
|
||||
local augend = require("dial.augend")
|
||||
local dial = require("dial.config")
|
||||
local d_map = require("dial.map")
|
||||
|
||||
dial.augends:register_group {
|
||||
default = {
|
||||
augend.integer.alias.decimal,
|
||||
augend.date.alias["%m/%d"],
|
||||
augend.constant.alias.alpha,
|
||||
}
|
||||
}
|
||||
end
|
||||
}
|
||||
use "EdenEast/nightfox.nvim"
|
||||
--[[ use {
|
||||
"benlubas/molten-nvim",
|
||||
requires = { "3rd/image.nvim" },
|
||||
config = function()
|
||||
vim.g.molten_image_provider = "image.nvim"
|
||||
vim.g.molten_output_win_max_height = 20
|
||||
nmap("<leader>q", "<cmd>MoltenEvaluateLine<cr>")
|
||||
nmap("<leader>os", "<cmd>MoltenEnterOutput<cr>")
|
||||
end,
|
||||
} ]]
|
||||
end)
|
||||
@@ -0,0 +1,38 @@
|
||||
{
|
||||
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
|
||||
"LuaSnip": { "branch": "master", "commit": "21f74f7ba8c49f95f9d7c8293b147c2901dd2d3a" },
|
||||
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
|
||||
"cheatsheet.nvim": { "branch": "master", "commit": "9716f9aaa94dd1fd6ce59b5aae0e5f25e2a463ef" },
|
||||
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
|
||||
"cmp-calc": { "branch": "main", "commit": "5947b412da67306c5b68698a02a846760059be2e" },
|
||||
"cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" },
|
||||
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
|
||||
"cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
|
||||
"cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" },
|
||||
"dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
|
||||
"fidget.nvim": { "branch": "main", "commit": "4d5858bd4c471c895060e1b9f3575f1551184dc5" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "f780609807eca1f783a36a8a31c30a48fbe150c5" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
|
||||
"mini.icons": { "branch": "main", "commit": "f9a177c11daa7829389b7b6eaaec8b8a5c47052d" },
|
||||
"neogen": { "branch": "main", "commit": "d7f9461727751fb07f82011051338a9aba07581d" },
|
||||
"nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" },
|
||||
"none-ls-extras.nvim": { "branch": "main", "commit": "52628966ffc5b49cf0dbbe4d8733bacede9e7e8b" },
|
||||
"none-ls.nvim": { "branch": "main", "commit": "f0b3dc073153a08fd1e32869ed30b87a3bb4230f" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
|
||||
"nvim-colorizer.lua": { "branch": "master", "commit": "51cf7c995ed1eb6642aecf19067ee634fa1b6ba2" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "d89f4891f0720cd2598e4bdd60010d8784b2ac8a" },
|
||||
"nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" },
|
||||
"nvim-tree.lua": { "branch": "master", "commit": "e179ad2f83b5955ab0af653069a493a1828c2697" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" },
|
||||
"outline.nvim": { "branch": "main", "commit": "6b62f73a6bf317531d15a7ae1b724e85485d8148" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
||||
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
|
||||
"vim-floaterm": { "branch": "master", "commit": "fd4bdd66eca56c6cc59f2119e4447496d8cde2ea" },
|
||||
"vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
|
||||
}
|
||||
@@ -0,0 +1,110 @@
|
||||
return {
|
||||
'nvim-lua/plenary.nvim',
|
||||
{
|
||||
'RRethy/vim-illuminate',
|
||||
event = 'LspAttach'
|
||||
},
|
||||
{
|
||||
'voldikss/vim-floaterm',
|
||||
cmd = 'FloatermToggle',
|
||||
},
|
||||
'j-hui/fidget.nvim',
|
||||
'echasnovski/mini.icons',
|
||||
'nvim-tree/nvim-web-devicons',
|
||||
'numToStr/Comment.nvim',
|
||||
'kylechui/nvim-surround',
|
||||
'stevearc/dressing.nvim',
|
||||
{
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
build = ':TSUpdate',
|
||||
opts = {
|
||||
highlight = {
|
||||
enable = true
|
||||
},
|
||||
}
|
||||
},
|
||||
{
|
||||
'nvim-tree/nvim-tree.lua',
|
||||
dependencies = "nvim-tree/nvim-web-devicons",
|
||||
init = function()
|
||||
-- disables netrw
|
||||
vim.g.loaded_netrw = 1
|
||||
vim.g.loaded_netrwPlugin = 1
|
||||
end,
|
||||
opts = {
|
||||
hijack_cursor = true,
|
||||
disable_netrw = true,
|
||||
select_prompts = true,
|
||||
renderer = {
|
||||
add_trailing = true,
|
||||
hidden_display = "all",
|
||||
highlight_opened_files = "icon"
|
||||
}
|
||||
},
|
||||
keys = {
|
||||
{ "<leader>v", "<cmd>NvimTreeToggle<cr>" }
|
||||
}
|
||||
},
|
||||
{
|
||||
"folke/which-key.nvim",
|
||||
opts = { preset = "modern" }
|
||||
},
|
||||
{
|
||||
"hedyhli/outline.nvim",
|
||||
event = "LspAttach",
|
||||
cmd = { "Outline", "OutlineOpen" },
|
||||
keys = {
|
||||
{ "<leader>o", "<cmd>Outline<CR>", desc = "Show outline" }
|
||||
},
|
||||
config = function()
|
||||
-- https://github.com/hedyhli/outline.nvim
|
||||
-- setup call required for this to work!
|
||||
require("outline").setup {}
|
||||
end
|
||||
},
|
||||
{
|
||||
'nvim-telescope/telescope.nvim',
|
||||
dependencies = { 'nvim-lua/plenary.nvim' },
|
||||
keys = {
|
||||
{ "<leader>ff", "<cmd>Telescope live_grep<cr>", desc = "Fuzzy grep across workspace" },
|
||||
{ "<leader>fb", "<cmd>Telescope buffers<cr>", desc = "Find buffer" },
|
||||
{ "<leader>fp", "<cmd>lua require'telescope.builtin'.git_files{}<cr>", desc="Find in project"},
|
||||
{ "<leader>p", "<cmd>Telescope diagnostics<cr>", desc = "Show diagnostics for buffer"}
|
||||
}
|
||||
},
|
||||
{
|
||||
'catgoose/nvim-colorizer.lua',
|
||||
opts = {
|
||||
'css',
|
||||
'scss',
|
||||
'javascript',
|
||||
'toml',
|
||||
'python'
|
||||
}
|
||||
},
|
||||
{
|
||||
'lewis6991/gitsigns.nvim',
|
||||
keys = {
|
||||
{ '<leader>hd', '<cmd>Gitsigns diffthis<cr>', desc = "Show Git diff" },
|
||||
{ '<leader>hr', '<cmd>Gitsigns reset_hunk<cr>', desc = "Git reset hunk" },
|
||||
{ '<leader>td', '<cmd>Gitsigns toggle_deleted<cr>', desc = 'Git toggle deleted' }
|
||||
}
|
||||
},
|
||||
{
|
||||
'sudormrfbin/cheatsheet.nvim',
|
||||
dependencies = {
|
||||
'nvim-telescope/telescope.nvim',
|
||||
'nvim-lua/popup.nvim',
|
||||
'nvim-lua/plenary.nvim',
|
||||
}
|
||||
},
|
||||
--[[{
|
||||
'pwntester/octo.nvim',
|
||||
event = { "BufReadPre", "BufNewFile" },
|
||||
dependencies = {
|
||||
'nvim-lua/plenary.nvim',
|
||||
'nvim-telescope/telescope.nvim',
|
||||
'nvim-tree/nvim-web-devicons',
|
||||
},
|
||||
}]]
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
return {
|
||||
'akinsho/bufferline.nvim',
|
||||
version = "*",
|
||||
event = { "BufReadPre", "BufNewFile" },
|
||||
dependencies = 'nvim-tree/nvim-web-devicons',
|
||||
config = function()
|
||||
local bufferline = require('bufferline')
|
||||
|
||||
bufferline.setup({
|
||||
options = {
|
||||
style_preset = bufferline.style_preset.no_italic,
|
||||
offsets = {
|
||||
{
|
||||
filetype = "NvimTree",
|
||||
text = "Files",
|
||||
highlight = "Directory",
|
||||
separator = true
|
||||
},
|
||||
},
|
||||
hover = {
|
||||
enabled = true,
|
||||
delay = 0,
|
||||
reveal = { 'close' }
|
||||
},
|
||||
show_close_icon = false,
|
||||
separator_style = "slope",
|
||||
diagnostics = "nvim_lsp",
|
||||
}
|
||||
})
|
||||
end
|
||||
,
|
||||
keys = {
|
||||
{ "<leader>b", "<cmd>BufferLineCyclePrev<cr>", desc = "Go to previous tab" },
|
||||
{ "<leader>n", "<cmd>BufferLineCycleNext<cr>", desc = "Go to next tab" },
|
||||
{ "<leader>gb", "<cmd>BufferLinePick<cr>", desc = "Pick tab" },
|
||||
{ "<leader>w", "<cmd>bdelete!<cr>", desc = "Close tab" }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
return {
|
||||
{
|
||||
"EdenEast/nightfox.nvim",
|
||||
priority = 1000,
|
||||
config = function()
|
||||
require("nightfox").setup({
|
||||
palettes = {
|
||||
carbonfox = {
|
||||
bg1 = "#0C0C0C",
|
||||
}
|
||||
}
|
||||
})
|
||||
vim.cmd.colorscheme("carbonfox")
|
||||
end
|
||||
},
|
||||
}
|
||||
@@ -0,0 +1,166 @@
|
||||
local augroup = vim.api.nvim_create_augroup("Lspformatting", {})
|
||||
|
||||
local on_attach = function(client, bufnr)
|
||||
if (not bufnr) then
|
||||
return
|
||||
end
|
||||
|
||||
require 'illuminate'.on_attach(client)
|
||||
|
||||
-- Enable completion triggered by <c-x><c-o>
|
||||
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
|
||||
-- Mappings.
|
||||
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
||||
local bufopts = { noremap = true, silent = true, buffer = bufnr }
|
||||
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
|
||||
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
|
||||
vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
|
||||
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
|
||||
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
|
||||
vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, bufopts)
|
||||
vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, bufopts)
|
||||
vim.keymap.set('n', '<space>wl', function()
|
||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||
end, bufopts)
|
||||
vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
|
||||
vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
|
||||
vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
|
||||
vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
|
||||
vim.keymap.set('n', '<space>f', '<cmd>lua vim.lsp.buf.format({ async = true })<CR>', bufopts)
|
||||
|
||||
-- format on save does not work for python for some reason
|
||||
if client.supports_method("textDocument/formatting") then
|
||||
vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
|
||||
vim.api.nvim_create_autocmd("BufWritePre", {
|
||||
group = augroup,
|
||||
buffer = bufnr,
|
||||
callback = function()
|
||||
vim.lsp.buf.format({
|
||||
async = false,
|
||||
bufnr = bufnr,
|
||||
})
|
||||
end
|
||||
})
|
||||
end
|
||||
end
|
||||
|
||||
local on_leave_group = vim.api.nvim_create_augroup("OnLeaveGroup", {})
|
||||
vim.api.nvim_create_autocmd("VimLeave", {
|
||||
group = on_leave_group,
|
||||
command = "silent !killall -q eslint_d",
|
||||
})
|
||||
|
||||
|
||||
return { {
|
||||
'neovim/nvim-lspconfig',
|
||||
event = { "BufReadPre", "BufNewFile" },
|
||||
dependencies = {
|
||||
'hrsh7th/nvim-cmp',
|
||||
'RRethy/vim-illuminate',
|
||||
'j-hui/fidget.nvim',
|
||||
},
|
||||
config = function()
|
||||
local lsp = require("lspconfig")
|
||||
local lspconfig_defaults = lsp.util.default_config
|
||||
lspconfig_defaults.capabilities = vim.tbl_deep_extend(
|
||||
'force',
|
||||
lspconfig_defaults.capabilities,
|
||||
require('cmp_nvim_lsp').default_capabilities()
|
||||
)
|
||||
--local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
|
||||
lsp.lua_ls.setup({
|
||||
on_attach = on_attach,
|
||||
settings = {
|
||||
Lua = {
|
||||
diagnostics = {
|
||||
globals = { 'vim' }
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
lsp.clangd.setup { on_attach = on_attach }
|
||||
lsp.ts_ls.setup { on_attach = on_attach } -- typescript
|
||||
lsp.hls.setup { on_attach = on_attach } -- haskell
|
||||
lsp.pyright.setup { on_attach = on_attach,
|
||||
settings = {
|
||||
pyright = {
|
||||
disableOrganizeImports = true, -- Using Ruff
|
||||
},
|
||||
python = {
|
||||
analysis = {
|
||||
ignore = { '*' }, -- Using Ruff
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
lsp.ruff.setup { on_attach = on_attach }
|
||||
lsp.svelte.setup { on_attach = on_attach }
|
||||
lsp.marksman.setup { on_attach = on_attach }
|
||||
lsp.rust_analyzer.setup { on_attach = on_attach,
|
||||
settings = {
|
||||
["rust-analyzer"] = {
|
||||
checkOnSave = true,
|
||||
check = {
|
||||
enable = true,
|
||||
command = "clippy",
|
||||
features = "all"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
lsp.tailwindcss.setup { on_attach = on_attach }
|
||||
|
||||
lsp.julials.setup {
|
||||
on_new_config = function(new_config, _)
|
||||
local julia = vim.fn.expand("~/.julia/environments/nvim-lspconfig/bin/julia")
|
||||
if lsp.util.path.is_file(julia) then
|
||||
vim.notify("running julials")
|
||||
new_config.cmd[1] = julia
|
||||
end
|
||||
end,
|
||||
on_attach = on_attach
|
||||
}
|
||||
end,
|
||||
},
|
||||
{
|
||||
'nvimtools/none-ls.nvim',
|
||||
|
||||
event = { "BufReadPre", "BufNewFile" },
|
||||
config = function()
|
||||
local null_ls = require("null-ls")
|
||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
--capabilities.offsetEncoding = { "utf-16" }
|
||||
|
||||
local eslint_format = require("none-ls.formatting.eslint_d").with({
|
||||
extra_filetypes = { "svelte" },
|
||||
})
|
||||
|
||||
local eslint_diag = require("none-ls.diagnostics.eslint_d").with({
|
||||
extra_filetypes = { "svelte" },
|
||||
})
|
||||
|
||||
local eslint_code_actions = require("none-ls.code_actions.eslint_d").with({
|
||||
extra_filetypes = { "svelte" },
|
||||
})
|
||||
|
||||
null_ls.setup {
|
||||
on_attach = on_attach,
|
||||
capabilities = capabilities,
|
||||
sources = {
|
||||
eslint_format,
|
||||
eslint_diag,
|
||||
eslint_code_actions,
|
||||
null_ls.builtins.code_actions.gitsigns,
|
||||
null_ls.builtins.completion.luasnip,
|
||||
null_ls.builtins.completion.tags,
|
||||
}
|
||||
}
|
||||
end,
|
||||
dependencies = { "nvim-lua/plenary.nvim",
|
||||
"nvimtools/none-ls-extras.nvim",
|
||||
'hrsh7th/nvim-cmp',
|
||||
},
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
return {
|
||||
"nvim-lualine/lualine.nvim",
|
||||
event = "VimEnter",
|
||||
dependencies = {
|
||||
'nvim-tree/nvim-web-devicons',
|
||||
},
|
||||
opts = {
|
||||
extensions = { 'nvim-tree', 'fzf', 'symbols-outline' },
|
||||
options = {
|
||||
component_separators = '',
|
||||
section_separators = { left = '', right = '' },
|
||||
theme = 'auto',
|
||||
globalstatus = true,
|
||||
},
|
||||
sections = {
|
||||
-- would be nice to open code actions but w/e
|
||||
lualine_b = {
|
||||
{
|
||||
'branch',
|
||||
'diff',
|
||||
},
|
||||
},
|
||||
lualine_c = {
|
||||
{
|
||||
'diagnostics',
|
||||
sources = { 'nvim_diagnostic', 'nvim_lsp' },
|
||||
sections = { 'hint', 'warn', 'error' },
|
||||
colored = true,
|
||||
update_in_insert = true,
|
||||
always_visible = false,
|
||||
}
|
||||
},
|
||||
lualine_x = { 'filetype' },
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
return {
|
||||
"danymat/neogen",
|
||||
config = function()
|
||||
require("neogen").setup({
|
||||
enabled = true,
|
||||
snippet_engine = "luasnip",
|
||||
placeholders_hl = "None", -- fixes weird bug where the entire page gets colored with this color
|
||||
languages = {
|
||||
python = {
|
||||
template = {
|
||||
annotation_convention = "google_docstrings"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
})
|
||||
nmap('<leader>d', ":lua require('neogen').generate()<CR>")
|
||||
end
|
||||
}
|
||||
@@ -0,0 +1,95 @@
|
||||
return {
|
||||
{
|
||||
"L3MON4D3/LuaSnip",
|
||||
build = "make install_jsregexp"
|
||||
},
|
||||
{
|
||||
"hrsh7th/nvim-cmp",
|
||||
dependencies = {
|
||||
"hrsh7th/cmp-buffer", "hrsh7th/cmp-nvim-lsp",
|
||||
"L3MON4D3/LuaSnip", "rafamadriz/friendly-snippets",
|
||||
'hrsh7th/cmp-nvim-lua', 'hrsh7th/cmp-path',
|
||||
'hrsh7th/cmp-calc', 'hrsh7th/cmp-cmdline', 'f3fora/cmp-spell',
|
||||
},
|
||||
config = function()
|
||||
local cmp = require("cmp")
|
||||
local luasnip = require('luasnip')
|
||||
|
||||
cmp.setup({
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
luasnip.lsp_expand(args.body)
|
||||
end
|
||||
},
|
||||
sources = {
|
||||
{ name = 'path' },
|
||||
{ name = 'nvim_lsp', keyword_length = 1 },
|
||||
{ name = 'buffer', keyword_length = 3 },
|
||||
{ name = 'luasnip', keyword_length = 2 },
|
||||
},
|
||||
window = {
|
||||
completion = cmp.config.window.bordered(),
|
||||
documentation = cmp.config.window.bordered()
|
||||
},
|
||||
formatting = {
|
||||
fields = { 'menu', 'abbr', 'kind' },
|
||||
format = function(entry, item)
|
||||
local menu_icon = {
|
||||
nvim_lsp = 'λ',
|
||||
luasnip = '⋗',
|
||||
buffer = 'Ω',
|
||||
path = '🖫',
|
||||
}
|
||||
|
||||
item.menu = menu_icon[entry.source.name]
|
||||
return item
|
||||
end,
|
||||
},
|
||||
mapping = {
|
||||
['<Up>'] = cmp.mapping.select_prev_item(select_opts),
|
||||
['<Down>'] = cmp.mapping.select_next_item(select_opts),
|
||||
|
||||
['<C-u>'] = cmp.mapping.scroll_docs(-4),
|
||||
['<C-d>'] = cmp.mapping.scroll_docs(4),
|
||||
|
||||
['<C-e>'] = cmp.mapping.abort(),
|
||||
['<C-y>'] = cmp.mapping.confirm({ select = true }),
|
||||
['<CR>'] = cmp.mapping.confirm({ select = false }),
|
||||
|
||||
['<C-f>'] = cmp.mapping(function(fallback)
|
||||
if luasnip.jumpable(1) then
|
||||
luasnip.jump(1)
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end, { 'i', 's' }),
|
||||
|
||||
['<C-b>'] = cmp.mapping(function(fallback)
|
||||
if luasnip.jumpable(-1) then
|
||||
luasnip.jump(-1)
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end, { 'i', 's' }),
|
||||
}
|
||||
})
|
||||
|
||||
cmp.setup.cmdline({ '/', '?' }, {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = {
|
||||
{ name = 'buffer' }
|
||||
}
|
||||
})
|
||||
|
||||
-- to select something in the cmdline need to use <C-n>
|
||||
cmp.setup.cmdline(':', {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'path' }
|
||||
}, {
|
||||
{ name = 'cmdline' }
|
||||
}),
|
||||
matching = { disallow_symbol_nonprefix_matching = false }
|
||||
})
|
||||
end,
|
||||
} }
|
||||
Reference in New Issue
Block a user