Compare commits
10 Commits
4fda6dc596
...
535541eb45
Author | SHA1 | Date | |
---|---|---|---|
|
535541eb45 | ||
4b371ef91c | |||
|
006f59f6d0 | ||
df0b053e05 | |||
ac966e45c3 | |||
|
513d192548 | ||
3dbf38f875 | |||
88512f8b37 | |||
9d67555f2e | |||
d402ba0699 |
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
.netrwhist
|
.netrwhist
|
||||||
|
spell
|
||||||
|
@ -1 +1,3 @@
|
|||||||
vim.diagnostic.disable()
|
vim.diagnostic.disable()
|
||||||
|
|
||||||
|
vim.b.argwrap_wrap_closing_brace = 0
|
||||||
|
@ -1 +1,3 @@
|
|||||||
vim.diagnostic.disable()
|
vim.diagnostic.disable()
|
||||||
|
|
||||||
|
vim.b.argwrap_wrap_closing_brace = 0
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash -e
|
||||||
git submodule update --init --recursive
|
git submodule update --init --recursive
|
||||||
|
2
link.sh
2
link.sh
@ -1,4 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash -e
|
||||||
if [ ! -d ~/.config/nvim ]; then
|
if [ ! -d ~/.config/nvim ]; then
|
||||||
ln -s $PWD ~/.config/nvim
|
ln -s $PWD ~/.config/nvim
|
||||||
fi
|
fi
|
||||||
|
@ -1,19 +1,16 @@
|
|||||||
vim.api.nvim_create_autocmd(
|
vim.api.nvim_create_autocmd({'BufRead', 'BufNewFile'}, {
|
||||||
'BufRead,BufNewFile', {
|
|
||||||
pattern = '*.gohtml',
|
pattern = '*.gohtml',
|
||||||
command = 'set filetype=html'
|
command = 'set filetype=html'
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd(
|
vim.api.nvim_create_autocmd({'BufRead', 'BufNewFile'}, {
|
||||||
'BufRead,BufNewFile', {
|
|
||||||
pattern = '*.man',
|
pattern = '*.man',
|
||||||
command = 'set filetype=xml'
|
command = 'set filetype=xml'
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd(
|
vim.api.nvim_create_autocmd({'BufRead', 'BufNewFile'}, {
|
||||||
'BufRead,BufNewFile', {
|
|
||||||
pattern = '*.w',
|
pattern = '*.w',
|
||||||
command = 'set filetype=cpp'
|
command = 'set filetype=cpp'
|
||||||
}
|
}
|
||||||
|
@ -41,12 +41,13 @@ vim.keymap.set('n', '<c-c><c-c>', '<cmd>nohlsearch<cr>')
|
|||||||
vim.keymap.set('n', '<leader><leader>', '<cmd>b#<cr>')
|
vim.keymap.set('n', '<leader><leader>', '<cmd>b#<cr>')
|
||||||
vim.keymap.set('n', '<leader>w', '<cmd>w<cr>')
|
vim.keymap.set('n', '<leader>w', '<cmd>w<cr>')
|
||||||
vim.keymap.set('n', '<leader>x', '<cmd>x<cr>')
|
vim.keymap.set('n', '<leader>x', '<cmd>x<cr>')
|
||||||
|
vim.keymap.set('n', 'Y', 'y$')
|
||||||
vim.keymap.set('n', 'j', 'gj')
|
vim.keymap.set('n', 'j', 'gj')
|
||||||
vim.keymap.set('n', 'k', 'gk')
|
vim.keymap.set('n', 'k', 'gk')
|
||||||
|
|
||||||
-- clipboard keymaps
|
-- clipboard keymaps
|
||||||
vim.keymap.set({'n', 'v'}, '<leader>P', '"+P')
|
vim.keymap.set({'n', 'v'}, '<leader>P', '"+P')
|
||||||
vim.keymap.set({'n', 'v'}, '<leader>Y', '"+Y')
|
vim.keymap.set({'n', 'v'}, '<leader>Y', '"+y$')
|
||||||
vim.keymap.set({'n', 'v'}, '<leader>d', '"+d')
|
vim.keymap.set({'n', 'v'}, '<leader>d', '"+d')
|
||||||
vim.keymap.set({'n', 'v'}, '<leader>p', '"+p')
|
vim.keymap.set({'n', 'v'}, '<leader>p', '"+p')
|
||||||
vim.keymap.set({'n', 'v'}, '<leader>y', '"+y')
|
vim.keymap.set({'n', 'v'}, '<leader>y', '"+y')
|
||||||
|
@ -8,19 +8,22 @@ local capabilities = cmp_nvim_lsp.default_capabilities({snippetSupport = false})
|
|||||||
|
|
||||||
-- nvim-lspconfig
|
-- nvim-lspconfig
|
||||||
local nvim_lspconfig = require('lspconfig')
|
local nvim_lspconfig = require('lspconfig')
|
||||||
if vim.fn.executable('clangd') then
|
if vim.fn.executable('clangd') == 1 then
|
||||||
nvim_lspconfig.clangd.setup({capabilities = capabilities})
|
nvim_lspconfig.clangd.setup({
|
||||||
|
capabilities = capabilities,
|
||||||
|
cmd = {'clangd', '--header-insertion=never'},
|
||||||
|
})
|
||||||
end
|
end
|
||||||
if vim.fn.executable('gopls') then
|
if vim.fn.executable('gopls') == 1 then
|
||||||
nvim_lspconfig.gopls.setup({capabilities = capabilities})
|
nvim_lspconfig.gopls.setup({capabilities = capabilities})
|
||||||
end
|
end
|
||||||
if vim.fn.executable('jedi-language-server') then
|
if vim.fn.executable('jedi-language-server') == 1 then
|
||||||
nvim_lspconfig.jedi_language_server.setup({capabilities = capabilities})
|
nvim_lspconfig.jedi_language_server.setup({capabilities = capabilities})
|
||||||
end
|
end
|
||||||
if vim.fn.executable('typescript-language-server') then
|
if vim.fn.executable('typescript-language-server') == 1 then
|
||||||
nvim_lspconfig.tsserver.setup({capabilities = capabilities})
|
nvim_lspconfig.tsserver.setup({capabilities = capabilities})
|
||||||
end
|
end
|
||||||
if vim.fn.executable('lua-language-server') then
|
if vim.fn.executable('lua-language-server') == 1 then
|
||||||
local runtime_path = vim.split(package.path, ';', {})
|
local runtime_path = vim.split(package.path, ';', {})
|
||||||
table.insert(runtime_path, 'lua/?.lua')
|
table.insert(runtime_path, 'lua/?.lua')
|
||||||
table.insert(runtime_path, 'lua/?/init.lua')
|
table.insert(runtime_path, 'lua/?/init.lua')
|
||||||
|
@ -2,9 +2,7 @@
|
|||||||
require('Comment').setup()
|
require('Comment').setup()
|
||||||
|
|
||||||
-- fzf.vim
|
-- fzf.vim
|
||||||
if vim.fn.executable('fzf') then
|
if vim.fn.executable('fzf') == 1 then
|
||||||
vim.g['$FZF_DEFAULT_COMMAND'] = 'ag --hidden --ignore .git -f -g "" 2> /dev/null'
|
|
||||||
|
|
||||||
vim.cmd([[
|
vim.cmd([[
|
||||||
command! -bang -nargs=* Fs
|
command! -bang -nargs=* Fs
|
||||||
\ call fzf#vim#grep(
|
\ call fzf#vim#grep(
|
||||||
@ -86,7 +84,7 @@ vim.keymap.set('v', '<cr>', '<plug>(EasyAlign)')
|
|||||||
|
|
||||||
-- vim-go
|
-- vim-go
|
||||||
vim.g.go_diagnostics_enabled = 0
|
vim.g.go_diagnostics_enabled = 0
|
||||||
vim.g.go_imports_autosave = 0
|
vim.g.go_imports_autosave = 1
|
||||||
vim.g.go_metalinter_enabled = {}
|
vim.g.go_metalinter_enabled = {}
|
||||||
vim.g.go_null_module_warning = 0
|
vim.g.go_null_module_warning = 0
|
||||||
vim.g.go_version_warning = 0
|
vim.g.go_version_warning = 0
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 488a236b7a4d01e910e0ac80b4794a7a054fb3a8
|
Subproject commit d7d2ac39513f2068f70fbe717d212c9bce8750ed
|
@ -1 +1 @@
|
|||||||
Subproject commit f3b82091a651a643ef18b220cd3e154d76a54462
|
Subproject commit 1e054c1d075d87903647db9320116d360eb8b024
|
@ -1 +1 @@
|
|||||||
Subproject commit 45e27ca739c7be6c49e5496d14fcf45a303c3a63
|
Subproject commit 2248ef254d0a1488a72041cfb45ca9caada6d994
|
@ -1 +1 @@
|
|||||||
Subproject commit ee960afffdb95472f719a72a1edb494ffea09c92
|
Subproject commit b2881eeb395d2b268de5fe9b5e201a8f1816beb8
|
@ -1 +1 @@
|
|||||||
Subproject commit fe2fc7b93d66349eff2c5baa6cec922ee3958f56
|
Subproject commit 6a6076bd678f825ffbe16ec97807793c3167f1a7
|
@ -1 +1 @@
|
|||||||
Subproject commit 5dce1b778b85c717f6614e3f4da45e9f19f54435
|
Subproject commit 0b751f6beef40fd47375eaf53d3057e0bfa317e4
|
@ -1 +1 @@
|
|||||||
Subproject commit 71b39616b14c152da34fcc787fa27f09bf280e72
|
Subproject commit 7384e7149e79365c96dc623d9fa3444737776982
|
@ -1 +1 @@
|
|||||||
Subproject commit 9ce85b0f7dcfe5358c0be937ad23e456907d410b
|
Subproject commit 50012918b2fc8357b87cff2a7f7f0446e47da174
|
@ -1 +1 @@
|
|||||||
Subproject commit bbf53b30ca1e718625b9b84b1d32379e470ddad7
|
Subproject commit babbf69f7bb5274f0461e04a59d3e059bee27314
|
@ -1 +1 @@
|
|||||||
Subproject commit 99db68d9b3304580bd383da7aaee05c7a954a344
|
Subproject commit 46eaf8918b347906789df296143117774e827616
|
@ -1 +1 @@
|
|||||||
Subproject commit be277461265f1e5c7db470aa479f30956597ea9e
|
Subproject commit 8eebdf6ab4a880d845893f210fd20516d2e2384f
|
@ -1,2 +1,2 @@
|
|||||||
#!/bin/sh
|
#!/bin/bash -e
|
||||||
git submodule update --remote --merge
|
git submodule update --remote --merge
|
||||||
|
Loading…
Reference in New Issue
Block a user