remove dead code
This commit is contained in:
parent
0e98db206c
commit
1561cbb941
45 changed files with 0 additions and 2318 deletions
|
|
@ -1,53 +0,0 @@
|
|||
-- setup completion menu
|
||||
vim.cmd([[
|
||||
set completeopt=menu,menuone,noselect
|
||||
]])
|
||||
|
||||
-- setup cmp proper: pretty much default config
|
||||
local cmp = require'cmp'
|
||||
|
||||
cmp.setup({
|
||||
window = {
|
||||
completion = cmp.config.window.bordered(winhighlight),
|
||||
documentation = cmp.config.window.bordered(winhighlight),
|
||||
},
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
require'snippy'.expand_snippet(args.body)
|
||||
end,
|
||||
},
|
||||
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
['<C-b>'] = cmp.mapping.scroll_docs(-4),
|
||||
['<C-f>'] = cmp.mapping.scroll_docs(4),
|
||||
['<C-Space>'] = cmp.mapping.complete(),
|
||||
['<C-e>'] = cmp.mapping.abort(),
|
||||
['<CR>'] = cmp.mapping.confirm({
|
||||
behavior = cmp.ConfirmBehavior.Insert,
|
||||
select = false,
|
||||
})
|
||||
}),
|
||||
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'nvim_lsp' },
|
||||
{ name = 'snippy' }, -- For snippy users.
|
||||
{ name = 'buffer' },
|
||||
{ name = 'path' },
|
||||
{ name = 'nvim_lua' },
|
||||
}),
|
||||
|
||||
formatting = {
|
||||
format = function(entry, vim_item)
|
||||
vim_item.kind = string.format('%s', vim_item.kind)
|
||||
vim_item.menu = ({
|
||||
nvim_lsp = '[LSP]',
|
||||
buffer = '[B]',
|
||||
path = '[F]',
|
||||
snippy = '[S]',
|
||||
nvim_lua = '[vim]',
|
||||
})[entry.source.name]
|
||||
|
||||
return vim_item
|
||||
end,
|
||||
}
|
||||
})
|
||||
|
|
@ -1,90 +0,0 @@
|
|||
local nvim_lsp = require'lspconfig'
|
||||
local cmp_lsp = require'cmp_nvim_lsp'
|
||||
|
||||
-- General LSP config
|
||||
-- Limit capabilities to advertised by cmp
|
||||
local capabilities = cmp_lsp.default_capabilities()
|
||||
|
||||
-- default lsp config
|
||||
-- Mappings.
|
||||
-- See `:help vim.diagnostic.*` for documentation on any of the below functions
|
||||
local opts = { noremap=true, silent=true }
|
||||
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, opts)
|
||||
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
|
||||
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
|
||||
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, opts)
|
||||
|
||||
-- Use an on_attach function to only map the following keys
|
||||
-- after the language server attaches to the current buffer
|
||||
local on_attach = function(client, bufnr)
|
||||
-- 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', '<leader>wa', vim.lsp.buf.add_workspace_folder, bufopts)
|
||||
vim.keymap.set('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder, bufopts)
|
||||
vim.keymap.set('n', '<leader>wl', function()
|
||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||
end, bufopts)
|
||||
vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, bufopts)
|
||||
vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, bufopts)
|
||||
vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action, bufopts)
|
||||
vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
|
||||
vim.keymap.set('n', '<leader>f', function() vim.lsp.buf.format { async = true } end, bufopts)
|
||||
end
|
||||
|
||||
local lsp_flags = {
|
||||
-- This is the default in Nvim 0.7+
|
||||
debounce_text_changes = 150,
|
||||
}
|
||||
-- always show sign column
|
||||
vim.cmd([[set signcolumn=yes]])
|
||||
|
||||
vim.g.moonflyNormalFloat = true
|
||||
vim.lsp.handlers['textDocument/hover'] = vim.lsp.with(
|
||||
vim.lsp.handlers.hover, {
|
||||
border = "single"
|
||||
}
|
||||
)
|
||||
vim.lsp.handlers['textDocument/signatureHelp'] = vim.lsp.with(
|
||||
vim.lsp.handlers.signatureHelp, {
|
||||
border = "single"
|
||||
}
|
||||
)
|
||||
vim.diagnostic.config({ float = { border = "single" } })
|
||||
|
||||
-- Setting up servers per language
|
||||
-- Default nvim-lsp setup: nil, clangd
|
||||
local servers = { 'nil_ls', 'clangd', 'texlab' }
|
||||
|
||||
for _, serv in ipairs(servers) do
|
||||
nvim_lsp[serv].setup{
|
||||
on_attach = on_attach,
|
||||
flags = lsp_flags,
|
||||
capabilities = capabilities,
|
||||
}
|
||||
end
|
||||
|
||||
-- Rust: using rust tools package
|
||||
local rt = require("rust-tools")
|
||||
rt.setup({
|
||||
server = {
|
||||
on_attach = on_attach,
|
||||
flags = lsp_flags,
|
||||
capabilities = capabilities,
|
||||
settings = {
|
||||
["rust-analyzer"] = {
|
||||
cargo = {
|
||||
allFeatures = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
-- this now handled by the lualine
|
||||
vim.cmd([[set noshowmode]])
|
||||
|
||||
return require('lualine').setup {
|
||||
options = {
|
||||
icons_enabled = true,
|
||||
--theme = 'everforest',
|
||||
-- section_separators = '',
|
||||
-- component_seaparators = '',
|
||||
}
|
||||
}
|
||||
|
|
@ -1,214 +0,0 @@
|
|||
local ensure_packer = function()
|
||||
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
|
||||
fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
|
||||
vim.cmd [[packadd packer.nvim]]
|
||||
return true
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
local setup_fzf = function()
|
||||
vim.api.nvim_set_keymap('n', '<c-P>', "<cmd>lua require('fzf-lua').files()<CR>", { noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap('n', '<leader>g', "<cmd>lua require('fzf-lua').git_files()<CR>", { noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap('n', '<leader>b', "<cmd>lua require('fzf-lua').buffers()<CR>", { noremap = true, silent = true })
|
||||
end
|
||||
|
||||
local packer_bootstrap = ensure_packer()
|
||||
|
||||
return require('packer').startup(function(use)
|
||||
use 'wbthomason/packer.nvim'
|
||||
|
||||
-- insert images into markdown automagically
|
||||
use {
|
||||
'ferrine/md-img-paste.vim',
|
||||
ft = { 'markdown' },
|
||||
config = vim.cmd([[
|
||||
" insert images into markdown automagically
|
||||
autocmd FileType markdown nmap <buffer><silent> <localleader>p :call mdip#MarkdownClipboardImage()<CR>
|
||||
let g:mdip_imgdir = 'static'
|
||||
let g:mdip_imgname = 'image'
|
||||
]])
|
||||
}
|
||||
|
||||
--Better syntax
|
||||
use 'rust-lang/rust.vim'
|
||||
use 'LnL7/vim-nix'
|
||||
use 'cespare/vim-toml'
|
||||
use 'JuliaEditorSupport/julia-vim'
|
||||
use {
|
||||
'lervag/vimtex',
|
||||
ft = { 'tex' },
|
||||
-- do not conceal stuff
|
||||
config = function() vim.cmd([[
|
||||
let g:tex_conceal = ''
|
||||
autocmd FileType tex nnoremap <localleader>= :VimtexTocToggle<CR>
|
||||
]]) end,
|
||||
}
|
||||
use 'lepture/vim-jinja'
|
||||
use 'neomutt/neomutt.vim'
|
||||
use 'godlygeek/tabular'
|
||||
use 'preservim/vim-markdown'
|
||||
-- treesitter
|
||||
use {
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
run = function()
|
||||
local ts_update = require('nvim-treesitter.install').update({ with_sync = true })
|
||||
ts_update()
|
||||
end,
|
||||
config = function()
|
||||
require('ts_setup')
|
||||
end,
|
||||
}
|
||||
|
||||
-- pretty bits
|
||||
-- use {
|
||||
-- '/home/grue/projects/zen-footburn.nvim',
|
||||
-- config = function()
|
||||
-- vim.cmd([[
|
||||
-- set termguicolors
|
||||
-- colorscheme zenburn
|
||||
-- ]])
|
||||
-- end,
|
||||
-- }
|
||||
-- use {
|
||||
-- 'sainnhe/everforest',
|
||||
-- config = function()
|
||||
-- vim.cmd([[
|
||||
-- set termguicolors
|
||||
-- let g:everforest_transparent_background = 2
|
||||
-- colorscheme everforest
|
||||
-- ]])
|
||||
-- end,
|
||||
-- }
|
||||
use {
|
||||
'jeffkreeftmeijer/vim-dim',
|
||||
config = function()
|
||||
vim.cmd([[
|
||||
colorscheme dim
|
||||
]])
|
||||
end,
|
||||
}
|
||||
use {
|
||||
'johnfrankmorgan/whitespace.nvim',
|
||||
config = function ()
|
||||
require('whitespace-nvim').setup({
|
||||
ignored_filetypes = { 'TelescopePrompt', 'Trouble', 'help' },
|
||||
})
|
||||
|
||||
-- remove trailing whitespace with a keybinding
|
||||
vim.keymap.set('n', '<Leader>t', require('whitespace-nvim').trim)
|
||||
end
|
||||
}
|
||||
-- use {
|
||||
-- 'nvim-lualine/lualine.nvim',
|
||||
-- requires = { 'kyazdani42/nvim-web-devicons', opt = true },
|
||||
-- after = { 'zen-footburn.nvim' },
|
||||
-- config = function()
|
||||
-- -- this now handled by the lualine
|
||||
-- vim.cmd([[set noshowmode]])
|
||||
|
||||
-- return require('lualine').setup {
|
||||
-- options = {
|
||||
-- icons_enabled = true,
|
||||
-- theme = 'zenburn',
|
||||
-- -- section_separators = '',
|
||||
-- -- component_seaparators = '',
|
||||
-- }
|
||||
-- }
|
||||
-- end,
|
||||
-- }
|
||||
|
||||
-- Git
|
||||
use 'tpope/vim-fugitive'
|
||||
use {
|
||||
'lewis6991/gitsigns.nvim',
|
||||
config = function()
|
||||
vim.cmd([[set signcolumn=yes]])
|
||||
require('gitsigns').setup()
|
||||
end,
|
||||
}
|
||||
|
||||
-- Nifty stuff
|
||||
use 'tpope/vim-surround'
|
||||
-- use 'airblade/vim-rooter'
|
||||
-- use {
|
||||
-- 'nvim-telescope/telescope.nvim',
|
||||
-- branch = '0.1.x',
|
||||
-- requires = { { 'nvim-lua/plenary.nvim' } },
|
||||
-- config = function()
|
||||
-- require('telescope').setup{
|
||||
-- pickers = {
|
||||
-- find_files = {
|
||||
-- theme = "dropdown",
|
||||
-- }
|
||||
-- }
|
||||
-- }
|
||||
-- local builtin = require('telescope.builtin')
|
||||
-- vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
|
||||
-- vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
|
||||
-- vim.keymap.set('n', '<leader>b', builtin.buffers, {})
|
||||
-- vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
|
||||
-- end,
|
||||
-- }
|
||||
|
||||
|
||||
-- completion
|
||||
-- use {
|
||||
-- 'hrsh7th/nvim-cmp',
|
||||
-- requires = {
|
||||
-- -- completion sources
|
||||
-- 'hrsh7th/cmp-nvim-lsp',
|
||||
-- 'hrsh7th/cmp-buffer',
|
||||
-- 'hrsh7th/cmp-path',
|
||||
-- 'hrsh7th/cmp-nvim-lua',
|
||||
-- 'dcampos/nvim-snippy',
|
||||
-- 'dcampos/cmp-snippy'
|
||||
-- },
|
||||
-- config = function()
|
||||
-- require('completion')
|
||||
-- end,
|
||||
-- }
|
||||
|
||||
-- use {
|
||||
-- 'dcampos/nvim-snippy',
|
||||
-- config = function()
|
||||
-- require'snippy'.setup({
|
||||
-- mappings = {
|
||||
-- is = {
|
||||
-- ['<Tab>'] = 'expand_or_advance',
|
||||
-- ['<S-Tab>'] = 'previous',
|
||||
-- },
|
||||
-- nx = {
|
||||
-- ['<leader>x'] = 'cut_text',
|
||||
-- },
|
||||
-- },
|
||||
-- })
|
||||
-- end,
|
||||
-- }
|
||||
-- use 'dcampos/cmp-snippy'
|
||||
-- use 'honza/vim-snippets'
|
||||
|
||||
-- neovim VSCode edition
|
||||
-- use {
|
||||
-- 'neovim/nvim-lspconfig',
|
||||
-- after = { 'nvim-cmp' },
|
||||
-- requires = { 'simrat39/rust-tools.nvim' },
|
||||
-- config = function()
|
||||
-- require'lsp_setup'
|
||||
-- end,
|
||||
-- }
|
||||
|
||||
use {
|
||||
'jamessan/vim-gnupg',
|
||||
}
|
||||
|
||||
-- Automatically set up your configuration after cloning packer.nvim
|
||||
-- Put this at the end after all plugins
|
||||
if packer_bootstrap then
|
||||
require('packer').sync()
|
||||
end
|
||||
end)
|
||||
|
||||
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
local ts_conf = require('nvim-treesitter.configs')
|
||||
|
||||
ts_conf.setup {
|
||||
ensure_installed = { "vim", "vimdoc", "rust", "nix", "latex" },
|
||||
highlight = {
|
||||
enable = true,
|
||||
},
|
||||
indent = {
|
||||
enable = true,
|
||||
},
|
||||
incremental_selection = {
|
||||
enable = true,
|
||||
},
|
||||
textobjects = {
|
||||
enable = true,
|
||||
},
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue