Compare commits
8 Commits
27fd7cc0a1
...
master
Author | SHA1 | Date | |
---|---|---|---|
b49e96fab3 | |||
25127dd0c9 | |||
0c25d5c867 | |||
10f5c07a9b | |||
c47546d65a | |||
ae88f67228 | |||
38f4d21db1 | |||
c2f6aa1b45 |
2
.gitlab/merge_requests_templates/default.md
Normal file
2
.gitlab/merge_requests_templates/default.md
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
|
||||||
|
/assign_reviewer @patrick.michl
|
7
init.lua
7
init.lua
@@ -1,9 +1,13 @@
|
|||||||
require 'plugins'
|
require 'plugins'
|
||||||
|
|
||||||
|
vim.g.loaded = 1
|
||||||
|
vim.g.loaded_netrwPlugin = 1
|
||||||
|
|
||||||
require('onedark').setup {
|
require('onedark').setup {
|
||||||
style = 'warmer'
|
style = 'warmer'
|
||||||
}
|
}
|
||||||
require('onedark').load()
|
require('onedark').load()
|
||||||
|
vim.cmd('set background=dark')
|
||||||
|
|
||||||
require 'lsp'
|
require 'lsp'
|
||||||
require 'completion'
|
require 'completion'
|
||||||
@@ -11,4 +15,5 @@ require 'treesitter'
|
|||||||
require 'term'
|
require 'term'
|
||||||
require 'settings'
|
require 'settings'
|
||||||
require 'keys'
|
require 'keys'
|
||||||
|
require("symbols-outline").setup()
|
||||||
|
require"fidget".setup{}
|
||||||
|
@@ -7,7 +7,10 @@ cmp.setup {
|
|||||||
require('luasnip').lsp_expand(args.body)
|
require('luasnip').lsp_expand(args.body)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
mapping = {
|
window = {
|
||||||
|
documentation = true
|
||||||
|
},
|
||||||
|
mapping = cmp.mapping.preset.insert({
|
||||||
['<C-p>'] = cmp.mapping.select_prev_item(),
|
['<C-p>'] = cmp.mapping.select_prev_item(),
|
||||||
['<C-n>'] = cmp.mapping.select_next_item(),
|
['<C-n>'] = cmp.mapping.select_next_item(),
|
||||||
['<C-d>'] = cmp.mapping.scroll_docs(-4),
|
['<C-d>'] = cmp.mapping.scroll_docs(-4),
|
||||||
@@ -36,7 +39,7 @@ cmp.setup {
|
|||||||
fallback()
|
fallback()
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
},
|
}),
|
||||||
sources = {
|
sources = {
|
||||||
{ name = 'nvim_lsp' },
|
{ name = 'nvim_lsp' },
|
||||||
{ name = 'luasnip' },
|
{ name = 'luasnip' },
|
||||||
|
12
lua/keys.lua
12
lua/keys.lua
@@ -1,16 +1,16 @@
|
|||||||
local key = vim.api.nvim_set_keymap
|
local key = vim.api.nvim_set_keymap
|
||||||
local u = require('utils')
|
local u = require('utils')
|
||||||
|
|
||||||
vim.cmd([[autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif]])
|
|
||||||
vim.cmd([[autocmd CursorHold * lua vim.diagnostic.open_float({focusable = false})]])
|
vim.cmd([[autocmd CursorHold * lua vim.diagnostic.open_float({focusable = false})]])
|
||||||
|
|
||||||
key('n', ';', ':Telescope find_files<CR>', {})
|
key('n', ';', ':Telescope find_files<CR>', {})
|
||||||
key('', '<C-n>', ':NvimTreeToggle<CR>', {})
|
key('n', '<C-n>', ':NvimTreeToggle<CR>', {})
|
||||||
key('n', 'gh', '/<c-r>=expand("<cword>")<CR><CR>N', {})
|
key('n', 'gh', '/<c-r>=expand("<cword>")<CR><CR>N', {})
|
||||||
|
|
||||||
key('i', '<TAB>', 'pumvisible() ? "<C-n>" : "<Tab>"', { expr = true, silent = true })
|
key('i', '<TAB>', 'pumvisible() ? "<C-n>" : "<Tab>"', { expr = true, silent = true })
|
||||||
key('i', '<S-TAB>', 'pumvisible() ? "<C-p>" : "<S-Tab>"', { expr = true, silent = true })
|
key('i', '<S-TAB>', 'pumvisible() ? "<C-p>" : "<S-Tab>"', { expr = true, silent = true })
|
||||||
key('n', '<leader>g', ':lua require"telescope.builtin".live_grep{}<CR>', {})
|
key('n', '<leader>g', ':lua require"telescope.builtin".live_grep{}<CR>', {})
|
||||||
|
key('v', '<leader>c', ':w !xclip -sel c<CR><CR>', { silent = true })
|
||||||
|
|
||||||
-- Highlight on yank
|
-- Highlight on yank
|
||||||
vim.api.nvim_exec(
|
vim.api.nvim_exec(
|
||||||
@@ -23,3 +23,11 @@ vim.api.nvim_exec(
|
|||||||
false
|
false
|
||||||
)
|
)
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd("BufEnter", {
|
||||||
|
nested = true,
|
||||||
|
callback = function()
|
||||||
|
if #vim.api.nvim_list_wins() == 1 and vim.api.nvim_buf_get_name(0):match("NvimTree_") ~= nil then
|
||||||
|
vim.cmd 'quit'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
})
|
||||||
|
@@ -46,11 +46,12 @@ local on_attach = function(client, bufnr)
|
|||||||
underline = true
|
underline = true
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
require "lsp_signature".on_attach({doc_lines = 0})
|
||||||
end
|
end
|
||||||
|
|
||||||
-- nvim-cmp supports additional completion capabilities
|
-- nvim-cmp supports additional completion capabilities
|
||||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||||
capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
|
capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
|
||||||
|
|
||||||
|
|
||||||
local servers = require'nvim-lsp-installer'
|
local servers = require'nvim-lsp-installer'
|
||||||
|
@@ -1,3 +1,16 @@
|
|||||||
|
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 packer_bootstrap = ensure_packer()
|
||||||
|
|
||||||
vim.cmd([[autocmd BufWritePost plugins.lua source <afile> | PackerCompile]])
|
vim.cmd([[autocmd BufWritePost plugins.lua source <afile> | PackerCompile]])
|
||||||
|
|
||||||
return require('packer').startup({function()
|
return require('packer').startup({function()
|
||||||
@@ -44,17 +57,18 @@ return require('packer').startup({function()
|
|||||||
use 'xolox/vim-misc'
|
use 'xolox/vim-misc'
|
||||||
use 'airblade/vim-gitgutter'
|
use 'airblade/vim-gitgutter'
|
||||||
use 'akinsho/toggleterm.nvim'
|
use 'akinsho/toggleterm.nvim'
|
||||||
|
|
||||||
-- LSP Setup
|
-- LSP Setup
|
||||||
use 'neovim/nvim-lspconfig'
|
use 'neovim/nvim-lspconfig'
|
||||||
use 'williamboman/nvim-lsp-installer'
|
use 'williamboman/nvim-lsp-installer'
|
||||||
use 'nvim-lua/lsp_extensions.nvim'
|
use 'nvim-lua/lsp_extensions.nvim'
|
||||||
|
use 'ray-x/lsp_signature.nvim'
|
||||||
use 'nvim-lua/completion-nvim'
|
use 'nvim-lua/completion-nvim'
|
||||||
use 'nvim-lua/popup.nvim'
|
use 'nvim-lua/popup.nvim'
|
||||||
use {
|
use {
|
||||||
'nvim-telescope/telescope.nvim',
|
'nvim-telescope/telescope.nvim',
|
||||||
requires = { {'nvim-lua/plenary.nvim'} }
|
requires = { {'nvim-lua/plenary.nvim'} }
|
||||||
}
|
}
|
||||||
use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }
|
|
||||||
use 'nvim-lua/plenary.nvim'
|
use 'nvim-lua/plenary.nvim'
|
||||||
use 'L3MON4D3/LuaSnip' -- Snippets plugin
|
use 'L3MON4D3/LuaSnip' -- Snippets plugin
|
||||||
use 'hrsh7th/nvim-cmp' -- Autocompletion plugin
|
use 'hrsh7th/nvim-cmp' -- Autocompletion plugin
|
||||||
@@ -65,6 +79,7 @@ return require('packer').startup({function()
|
|||||||
use 'kdheepak/cmp-latex-symbols'
|
use 'kdheepak/cmp-latex-symbols'
|
||||||
use 'nvim-treesitter/nvim-treesitter'
|
use 'nvim-treesitter/nvim-treesitter'
|
||||||
use 'simrat39/symbols-outline.nvim'
|
use 'simrat39/symbols-outline.nvim'
|
||||||
|
use 'j-hui/fidget.nvim'
|
||||||
|
|
||||||
use 'kyazdani42/nvim-web-devicons'
|
use 'kyazdani42/nvim-web-devicons'
|
||||||
|
|
||||||
@@ -80,6 +95,10 @@ return require('packer').startup({function()
|
|||||||
config = function() require'plugins/nvim-tree' end
|
config = function() require'plugins/nvim-tree' end
|
||||||
}
|
}
|
||||||
use 'justinmk/vim-sneak'
|
use 'justinmk/vim-sneak'
|
||||||
|
|
||||||
|
if packer_bootstrap then
|
||||||
|
require('packer').sync()
|
||||||
|
end
|
||||||
end,
|
end,
|
||||||
config = {
|
config = {
|
||||||
display = {
|
display = {
|
||||||
|
@@ -7,6 +7,7 @@ cmd('syntax on')
|
|||||||
cmd('set number')
|
cmd('set number')
|
||||||
cmd('set completeopt=menuone,noinsert,noselect')
|
cmd('set completeopt=menuone,noinsert,noselect')
|
||||||
cmd('set shortmess+=c')
|
cmd('set shortmess+=c')
|
||||||
|
cmd("autocmd CursorHold,CursorHoldI *.rs :lua require'lsp_extensions'.inlay_hints{ only_current_line = true }")
|
||||||
|
|
||||||
o.startofline = true
|
o.startofline = true
|
||||||
wo.cursorline = true
|
wo.cursorline = true
|
||||||
|
Reference in New Issue
Block a user