tiyn
/
dotfiles
mirror of https://github.com/tiyn/dotfiles
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

nvim: swapped explorer and tagger for new lua plugins

Browse Source
master
tiyn 1 year ago
parent edd82ee7d9
commit a065c3d401
10 changed files with 309 additions and 253 deletions
Show Stats Download Patch File Download Diff File

1
.config/nvim/init.lua
Unescape View File

@ -66,4 +66,3 @@ require('keymap')
-- load general colorscheme
require('colorscheme')

142
.config/nvim/lua/autocmd.lua
Unescape View File

@ -2,7 +2,7 @@
-- read files correctly
vim.filetype.add({
extension = {
extension = {
c = 'c',
h = 'c',
html = 'html',
@ -13,96 +13,112 @@ extension = {
nim = 'nim',
py = 'python',
tex = 'tex',
}})
}
})
-- delete trailing whitespaces on save
vim.api.nvim_create_autocmd({'BufWritePre'},
{pattern = {'*'},
command = [[%s/\s\+$//e]],
})
vim.api.nvim_create_autocmd({ 'BufWritePre' },
{
pattern = { '*' },
command = [[%s/\s\+$//e]],
})
-- settings for filetype: c
vim.api.nvim_create_autocmd({'VimLeave'},
{pattern = {'c'},
command = '!cclear'
})
vim.api.nvim_create_autocmd({ 'VimLeave' },
{
pattern = { 'c' },
command = '!cclear'
})
vim.api.nvim_create_autocmd({'BufEnter', 'FileType'},
{pattern = {'c'},
command = 'set colorcolumn=80'
})
vim.api.nvim_create_autocmd({ 'BufEnter', 'FileType' },
{
pattern = { 'c' },
command = 'set colorcolumn=80'
})
-- settings for filetype: java
vim.api.nvim_create_autocmd({'FileType'},
{pattern = {'java'},
command = 'setlocal shiftwidth=2 softtabstop=2',
})
vim.api.nvim_create_autocmd({ 'FileType' },
{
pattern = { 'java' },
command = 'setlocal shiftwidth=2 softtabstop=2',
})
vim.api.nvim_create_autocmd({'BufEnter', 'FileType'},
{pattern = {'java'},
command = 'set colorcolumn=100'
})
vim.api.nvim_create_autocmd({ 'BufEnter', 'FileType' },
{
pattern = { 'java' },
command = 'set colorcolumn=100'
})
-- settings for filetype: javascript
vim.api.nvim_create_autocmd({'FileType'},
{pattern = {'javascript'},
command = 'setlocal shiftwidth=2 softtabstop=2',
})
vim.api.nvim_create_autocmd({ 'FileType' },
{
pattern = { 'javascript' },
command = 'setlocal shiftwidth=2 softtabstop=2',
})
-- settings for filetype: lua
vim.api.nvim_create_autocmd({'FileType'},
{pattern = {'lua'},
command = 'setlocal shiftwidth=2 softtabstop=2',
})
vim.api.nvim_create_autocmd({ 'FileType' },
{
pattern = { 'lua' },
command = 'setlocal shiftwidth=2 softtabstop=2',
})
vim.api.nvim_create_autocmd({'BufEnter', 'FileType'},
{pattern = {'lua'},
command = 'set colorcolumn=100'
})
vim.api.nvim_create_autocmd({ 'BufEnter', 'FileType' },
{
pattern = { 'lua' },
command = 'set colorcolumn=100'
})
-- settings for filetype: markdown
vim.api.nvim_create_autocmd({'FileType'},
{pattern = {'markdown'},
command = 'setlocal shiftwidth=2 softtabstop=2',
})
vim.api.nvim_create_autocmd({ 'FileType' },
{
pattern = { 'markdown' },
command = 'setlocal shiftwidth=2 softtabstop=2',
})
vim.api.nvim_create_autocmd({'BufEnter', 'FileType'},
{pattern = {'markdown'},
command = 'set colorcolumn=100'
})
vim.api.nvim_create_autocmd({ 'BufEnter', 'FileType' },
{
pattern = { 'markdown' },
command = 'set colorcolumn=100'
})
vim.api.nvim_create_autocmd({'BufEnter', 'FileType'},
{pattern = {'markdown'},
command = 'set conceallevel=2'
})
vim.api.nvim_create_autocmd({ 'BufEnter', 'FileType' },
{
pattern = { 'markdown' },
command = 'set conceallevel=2'
})
-- settings for filetype: nim
vim.api.nvim_create_autocmd({'BufEnter', 'FileType'},
{pattern = {'nim'},
command = 'set colorcolumn=80'
})
vim.api.nvim_create_autocmd({ 'BufEnter', 'FileType' },
{
pattern = { 'nim' },
command = 'set colorcolumn=80'
})
-- settings for filetype: python
vim.api.nvim_create_autocmd({'BufEnter', 'FileType'},
{pattern = {'python'},
command = 'set colorcolumn=80'
})
vim.api.nvim_create_autocmd({ 'BufEnter', 'FileType' },
{
pattern = { 'python' },
command = 'set colorcolumn=80'
})
-- settings for filetype: tex
vim.api.nvim_create_autocmd({'VimLeave'},
{pattern = {'tex'},
command = '!texclear %'
})
vim.api.nvim_create_autocmd({'BufEnter', 'FileType'},
{pattern = {'tex'},
command = 'set colorcolumn=80'
})
vim.api.nvim_create_autocmd({ 'VimLeave' },
{
pattern = { 'tex' },
command = '!texclear %'
})
vim.api.nvim_create_autocmd({ 'BufEnter', 'FileType' },
{
pattern = { 'tex' },
command = 'set colorcolumn=80'
})

2
.config/nvim/lua/colorscheme.lua
Unescape View File

@ -3,4 +3,4 @@
-- basic color settings
vim.o.background = 'dark'
vim.cmd('colorscheme tccs')
vim.api.nvim_set_hl(0, 'colorcolumn', {bg='#772222'})
vim.api.nvim_set_hl(0, 'colorcolumn', { bg = '#772222' })

60
.config/nvim/lua/keymap.lua
Unescape View File

@ -4,56 +4,56 @@
vim.g.mapleader = ","
-- shortcut for split navigation
vim.api.nvim_set_keymap('n', '<C-h>', '<C-w>h', {noremap = true})
vim.api.nvim_set_keymap('n', '<C-j>', '<C-w>j', {noremap = true})
vim.api.nvim_set_keymap('n', '<C-k>', '<C-w>k', {noremap = true})
vim.api.nvim_set_keymap('n', '<C-l>', '<C-w>l', {noremap = true})
vim.api.nvim_set_keymap('n', '<C-h>', '<C-w>h', { noremap = true })
vim.api.nvim_set_keymap('n', '<C-j>', '<C-w>j', { noremap = true })
vim.api.nvim_set_keymap('n', '<C-k>', '<C-w>k', { noremap = true })
vim.api.nvim_set_keymap('n', '<C-l>', '<C-w>l', { noremap = true })
-- unmap unwanted commands
vim.api.nvim_set_keymap('n', '<F1>', '<NOP>', {noremap = true})
vim.api.nvim_set_keymap('n', '<F4>', '<NOP>', {noremap = true})
vim.api.nvim_set_keymap('n', '<F9>', '<NOP>', {noremap = true})
vim.api.nvim_set_keymap('n', '<F10>', '<NOP>', {noremap = true})
vim.api.nvim_set_keymap('n', '<F11>', '<NOP>', {noremap = true})
vim.api.nvim_set_keymap('n', '<F12>', '<NOP>', {noremap = true})
vim.api.nvim_set_keymap('i', '<F2>', '<NOP>', {noremap = true})
vim.api.nvim_set_keymap('i', '<F3>', '<NOP>', {noremap = true})
vim.api.nvim_set_keymap('i', '<F4>', '<NOP>', {noremap = true})
vim.api.nvim_set_keymap('i', '<F5>', '<NOP>', {noremap = true})
vim.api.nvim_set_keymap('i', '<F6>', '<NOP>', {noremap = true})
vim.api.nvim_set_keymap('i', '<F7>', '<NOP>', {noremap = true})
vim.api.nvim_set_keymap('i', '<F8>', '<NOP>', {noremap = true})
vim.api.nvim_set_keymap('i', '<F9>', '<NOP>', {noremap = true})
vim.api.nvim_set_keymap('i', '<F10>', '<NOP>', {noremap = true})
vim.api.nvim_set_keymap('i', '<F11>', '<NOP>', {noremap = true})
vim.api.nvim_set_keymap('i', '<F12>', '<NOP>', {noremap = true})
vim.api.nvim_set_keymap('n', '<F1>', '<NOP>', { noremap = true })
vim.api.nvim_set_keymap('n', '<F4>', '<NOP>', { noremap = true })
vim.api.nvim_set_keymap('n', '<F9>', '<NOP>', { noremap = true })
vim.api.nvim_set_keymap('n', '<F10>', '<NOP>', { noremap = true })
vim.api.nvim_set_keymap('n', '<F11>', '<NOP>', { noremap = true })
vim.api.nvim_set_keymap('n', '<F12>', '<NOP>', { noremap = true })
vim.api.nvim_set_keymap('i', '<F2>', '<NOP>', { noremap = true })
vim.api.nvim_set_keymap('i', '<F3>', '<NOP>', { noremap = true })
vim.api.nvim_set_keymap('i', '<F4>', '<NOP>', { noremap = true })
vim.api.nvim_set_keymap('i', '<F5>', '<NOP>', { noremap = true })
vim.api.nvim_set_keymap('i', '<F6>', '<NOP>', { noremap = true })
vim.api.nvim_set_keymap('i', '<F7>', '<NOP>', { noremap = true })
vim.api.nvim_set_keymap('i', '<F8>', '<NOP>', { noremap = true })
vim.api.nvim_set_keymap('i', '<F9>', '<NOP>', { noremap = true })
vim.api.nvim_set_keymap('i', '<F10>', '<NOP>', { noremap = true })
vim.api.nvim_set_keymap('i', '<F11>', '<NOP>', { noremap = true })
vim.api.nvim_set_keymap('i', '<F12>', '<NOP>', { noremap = true })
-- mapping Dictionaries
vim.api.nvim_set_keymap('n', '<F6>', ':setlocal spell! spelllang=de_de<CR>', {noremap = true})
vim.api.nvim_set_keymap('n', '<F7>', ':setlocal spell! spelllang=en_us<CR>', {noremap = true})
vim.api.nvim_set_keymap('n', '<F6>', ':setlocal spell! spelllang=de_de<CR>', { noremap = true })
vim.api.nvim_set_keymap('n', '<F7>', ':setlocal spell! spelllang=en_us<CR>', { noremap = true })
-- compiler for languages
vim.api.nvim_set_keymap('n', '<leader>c', ':w! | !compiler <c-r>%<CR>', {noremap = true})
vim.api.nvim_set_keymap('n', '<leader>c', ':w! | !compiler <c-r>%<CR>', { noremap = true })
-- open corresponding file (pdf/html/...)
vim.api.nvim_set_keymap('n', '<leader>p', ':!opout <c-r>%<CR><CR>', {noremap = true})
vim.api.nvim_set_keymap('n', '<leader>p', ':!opout <c-r>%<CR><CR>', { noremap = true })
-- save file as sudo on files that require root permission
vim.api.nvim_set_keymap('c', 'w!!', '"silent! write !sudo tee % >/dev/null" <bar> edit!', {noremap = true})
vim.api.nvim_set_keymap('c', 'w!!', '"silent! write !sudo tee % >/dev/null" <bar> edit!', { noremap = true })
-- alias for replacing
vim.api.nvim_set_keymap('n', '<leader>ss', ':%s//gI<Left><Left><Left>', {noremap = true})
vim.api.nvim_set_keymap('n', '<leader>ss', ':%s//gI<Left><Left><Left>', { noremap = true })
-- irc compatibility for interactivity
vim.api.nvim_set_keymap('n', '<leader>is', ':.w >> in<cr>dd', {noremap = true})
vim.api.nvim_set_keymap('n', '<leader>is', ':.w >> in<cr>dd', { noremap = true })
-- majutsushi/tagbar
vim.api.nvim_set_keymap('n', '<F3>', ':TagbarToggle<CR>', {})
vim.api.nvim_set_keymap('n', '<F3>', ':Navbuddy<CR>', {})
-- scrooloose/nerdtree
vim.api.nvim_set_keymap('n', '<F2>', ':NERDTreeToggle<CR>', {})
vim.api.nvim_set_keymap('n', '<F2>', ':Neotree toggle<CR>', {})
-- tpope/vim-fugitive
vim.api.nvim_set_keymap('n', '<leader>ga', ':Git add %:p<CR><CR>', { noremap = true })

99
.config/nvim/lua/loadplugins.lua
Unescape View File

@ -3,9 +3,9 @@
-- bootstrap packer
local ensure_packer = function()
local fn = vim.fn
local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
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})
fn.system({ 'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path })
vim.cmd [[packadd packer.nvim]]
return true
end
@ -17,37 +17,47 @@ local packer_bootstrap = ensure_packer()
-- load plugins with packer
return require("packer").startup(function(use)
-- package manager (first entry)
use {'wbthomason/packer.nvim'}
use { 'wbthomason/packer.nvim' }
-- improved java syntax highlighting
use {'uiiaoo/java-syntax.vim',
ft = {'java'}}
use { 'uiiaoo/java-syntax.vim',
ft = { 'java' } }
-- custom statusline
use {'itchyny/lightline.vim',
require = {"tiyn/vim-tccs"}}
use { 'itchyny/lightline.vim',
require = { "tiyn/vim-tccs" } }
-- latex asynchronous pdf rendering
use {'donRaphaco/neotex',
ft = {'tex'}}
-- show signature while typing
use { 'ray-x/lsp_signature.nvim' }
-- navigating folders with a file tree
use {'scrooloose/nerdtree',
cmd = 'NERDTreeToggle',
requires = 'ryanoasis/vim-devicons'}
-- latex asynchronous pdf rendering
use { 'donRaphaco/neotex',
ft = { 'tex' } }
-- fileexplorer on the side
use {
"nvim-neo-tree/neo-tree.nvim",
branch = "v3.x",
requires = {
"nvim-lua/plenary.nvim",
"nvim-tree/nvim-web-devicons",
"MunifTanjim/nui.nvim",
}
}
-- nim language support
use {'zah/nim.vim',
ft = {'nim'}}
use { 'zah/nim.vim',
ft = { 'nim' } }
-- automatic closing of brackets
use {'windwp/nvim-autopairs'}
use { 'windwp/nvim-autopairs' }
-- autocompletion and its sources
use {'hrsh7th/nvim-cmp',
requires = {'hrsh7th/cmp-buffer',
use { 'hrsh7th/nvim-cmp',
requires = { 'hrsh7th/cmp-buffer',
'hrsh7th/cmp-path',
'hrsh7th/cmp-nvim-lsp',
'lukas-reineke/cmp-under-comparator',
'antoinemadec/fixcursorhold.nvim',
'l3mon4d3/luasnip',
'saadparwaiz1/cmp_luasnip',
@ -58,56 +68,61 @@ return require("packer").startup(function(use)
'jose-elias-alvarez/null-ls.nvim',
'LostNeophyte/null-ls-embedded',
'nvim-lua/plenary.nvim',
'jay-babu/mason-null-ls.nvim'}}
'jay-babu/mason-null-ls.nvim' } }
-- showing color of hex values, etc
use {'norcalli/nvim-colorizer.lua'}
use { 'norcalli/nvim-colorizer.lua' }
-- show tags
use {
"SmiteshP/nvim-navbuddy",
requires = {
"neovim/nvim-lspconfig",
"SmiteshP/nvim-navic",
"MunifTanjim/nui.nvim",
}
}
-- better language highlighting by improved parsing
use {'nvim-treesitter/nvim-treesitter'}
use { 'nvim-treesitter/nvim-treesitter' }
-- automatically close html-tags
use {'windwp/nvim-ts-autotag',
requires = {'nvim-treesitter/nvim-treesitter'}}
use { 'windwp/nvim-ts-autotag',
requires = { 'nvim-treesitter/nvim-treesitter' } }
-- colorful brackets
use {'luochen1990/rainbow'}
-- show tags
use {'majutsushi/tagbar',
cmd = 'TagbarToggle'}
use { 'luochen1990/rainbow' }
-- todo symbols and highlighting
use {'folke/todo-comments.nvim',
requires = {'nvim-lua/plenary.nvim'}}
use { 'folke/todo-comments.nvim',
requires = { 'nvim-lua/plenary.nvim' } }
-- git wrapper
use {'tpope/vim-fugitive'}
use { 'tpope/vim-fugitive' }
-- indicate git diff status of line
use {'airblade/vim-gitgutter'}
use { 'airblade/vim-gitgutter' }
-- golang language support
use {'fatih/vim-go',
ft = {'go'}}
use { 'fatih/vim-go',
ft = { 'go' } }
-- markdown language support
use {'preservim/vim-markdown',
ft = {'md'},
requires = {'godlygeek/tabular'}}
use { 'preservim/vim-markdown',
ft = { 'md' },
requires = { 'godlygeek/tabular' } }
-- bulk renamer
use {'qpkorr/vim-renamer'}
use { 'qpkorr/vim-renamer' }
-- additional quote/parantheses funtions
use {'tpope/vim-surround'}
use { 'tpope/vim-surround' }
-- colorscheme
use {'tiyn/vim-tccs'}
use { 'tiyn/vim-tccs' }
-- package manager sync (last entry)
if packer_bootstrap then
require('packer').sync()
end
end)

2
.config/nvim/plugin/lightline.lua
Unescape View File

@ -1,2 +1,2 @@
-- itchyny/lightline.vim
vim.g.lightline = { colorscheme = 'tccs'}
vim.g.lightline = { colorscheme = 'tccs' }

2
.config/nvim/plugin/nerdtree.lua
Unescape View File

@ -1,2 +0,0 @@
-- scrooloose/nerdtree
vim.g.NERDTreeWinPos = 'left'

56
.config/nvim/plugin/nvim-cmp.lua
Unescape View File

@ -1,12 +1,5 @@
-- hrsh7th/nvim-cmp
-- mason package manager
require("mason").setup()
require("mason-lspconfig").setup({
-- automatically install language servers setup below for lspconfig
automatic_setup = true,
})
-- jose-elias-alvarez/null-ls.nvim
local null_ls = require("null-ls")
@ -27,6 +20,14 @@ require("null-ls").setup({
},
})
-- mason package manager
require("mason").setup()
require("mason-lspconfig").setup({
-- automatically install language servers setup below for lspconfig
automatic_setup = true,
})
require("mason-null-ls").setup({
automatic_installation = true,
ensure_installed = {}
@ -43,6 +44,18 @@ local cmp = require("cmp")
local luasnip = require("luasnip")
local lspkind = require("lspkind")
cmp.setup {
sorting = {
comparators = {
cmp.config.compare.offset,
cmp.config.compare.exact,
cmp.config.compare.score,
require "cmp-under-comparator".under,
cmp.config.compare.kind,
cmp.config.compare.sort_text,
cmp.config.compare.length,
cmp.config.compare.order,
},
},
snippet = {
expand = function(args)
luasnip.lsp_expand(args.body)
@ -71,7 +84,8 @@ cmp.setup {
['<CR>'] = cmp.mapping.confirm {
behavior = cmp.ConfirmBehavior.Replace,
select = true,
}},
}
},
sources = {
{ name = 'nvim_lsp' },
{ name = 'path' },
@ -124,13 +138,26 @@ require("luasnip.loaders.from_snipmate").lazy_load()
-- neovim/nvim-lspconfig
local nvim_lsp = require('lspconfig')
require "lsp_signature".setup({
bind = true,
handler_opts = {
border = "rounded"
}
})
local navbuddy = require("nvim-navbuddy")
local attach_func = function(client, bufnr)
navbuddy.attach(client, bufnr)
end
-- Use a loop to conveniently call 'setup' on multiple servers and
-- map buffer local keybindings when the language server attaches
local servers = { "pyright", "bashls", "texlab", "ccls", "nimls", "marksman" }
for _, lsp in ipairs(servers) do
nvim_lsp[lsp].setup {
on_attach=on_attach,
capabilities=capabilities,
on_attach = attach_func,
capabilities = capabilities,
flags = {
debounce_text_changes = 150
}
@ -138,19 +165,20 @@ for _, lsp in ipairs(servers) do
end
require'lspconfig'.jdtls.setup{
on_attach=on_attach,
require 'lspconfig'.jdtls.setup {
on_attach = attach_func,
flags = {
debounce_text_changes = 150
},
cmd = { 'jdtls' }
}
require'lspconfig'.lua_ls.setup {
require 'lspconfig'.lua_ls.setup {
on_attach = attach_func,
settings = {
Lua = {
runtime = { version = 'LuaJIT' },
diagnostics = { globals = {'vim'} },
diagnostics = { globals = { 'vim' } },
workspace = { library = vim.api.nvim_get_runtime_file("", true) },
telemetry = { enable = false },
},

4
.config/nvim/plugin/nvim-colorizer.lua
Unescape View File

@ -1,5 +1,5 @@
-- norcalli/nvim-colorizer.lua
require 'colorizer'.setup {
'*';
'!markdown';
'*',
'!markdown',
}

12
.config/nvim/plugin/todo-comments.lua
Unescape View File

@ -5,13 +5,13 @@ require 'todo-comments'.setup {
sign_priority = 8, -- sign priority
-- keywords recognized as todo comments
keywords = {
ERRO = { icon = "", color = "error"},
ERRO = { icon = "", color = "error" },
TODO = { icon = "", color = "info" },
HACK = { icon = "", color = "warning"},
WARN = { icon = "", color = "warning"},
PERF = { icon = "", color = "default"},
NOTE = { icon = "", color = "hint"},
TEST = { icon = "", color = "test"},
HACK = { icon = "", color = "warning" },
WARN = { icon = "", color = "warning" },
PERF = { icon = "", color = "default" },
NOTE = { icon = "", color = "hint" },
TEST = { icon = "", color = "test" },
},
gui_style = {
fg = "NONE", -- The gui style to use for the fg highlight group.

Write Preview
Loading…
Cancel
Save