Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dotfiles
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tim van Deurzen
dotfiles
Commits
0cf479db
Commit
0cf479db
authored
May 17, 2021
by
Tim van Deurzen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update neovim and git configurations.
parent
63540859
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
87 additions
and
4 deletions
+87
-4
gitconfig
gitconfig
+14
-0
neovim/lua/core/init.lua
neovim/lua/core/init.lua
+2
-2
neovim/lua/keybindings/which_key.lua
neovim/lua/keybindings/which_key.lua
+4
-0
neovim/lua/lsp/init.lua
neovim/lua/lsp/init.lua
+29
-0
neovim/lua/plugins/init.lua
neovim/lua/plugins/init.lua
+38
-2
No files found.
gitconfig
View file @
0cf479db
[user]
[user]
email = tim@kompiler.org
email = tim@kompiler.org
name = Tim van Deurzen
name = Tim van Deurzen
[alias]
[alias]
co = checkout
co = checkout
br = branch
br = branch
ci = commit
ci = commit
st = status
st = status
di = diff --word-diff=plain --color-moved=plain
di = diff --word-diff=plain --color-moved=plain
[pull]
[pull]
rebase = true
rebase = true
[url "ssh://git@gitlab.dopey.blockport.io"]
[url "ssh://git@gitlab.dopey.blockport.io"]
insteadOf = https://gitlab.dopey.blockport.io
insteadOf = https://gitlab.dopey.blockport.io
[core]
[core]
editor = nvim
editor = nvim
pager = delta
[delta]
features = line-numbers decorations side-by-side
plus-style = "syntax bold auto"
minus-style = "syntax bold italic auto"
syntax-theme = "gruvbox-light"
navigate = true
[interactive]
diffFilter = delta --color-only
neovim/lua/core/init.lua
View file @
0cf479db
...
@@ -9,7 +9,7 @@ local function apply_buffer_window_options(options)
...
@@ -9,7 +9,7 @@ local function apply_buffer_window_options(options)
end
end
local
function
basic_configuration
()
local
function
basic_configuration
()
options
=
{
local
options
=
{
hidden
=
true
;
hidden
=
true
;
fileformats
=
"unix,mac,dos"
;
fileformats
=
"unix,mac,dos"
;
modeline
=
true
;
modeline
=
true
;
...
@@ -72,7 +72,7 @@ local function basic_configuration()
...
@@ -72,7 +72,7 @@ local function basic_configuration()
langnoremap
=
true
;
langnoremap
=
true
;
}
}
buffer_window_options
=
{
local
buffer_window_options
=
{
formatoptions
=
"qroctn"
;
formatoptions
=
"qroctn"
;
shiftwidth
=
4
;
shiftwidth
=
4
;
tabstop
=
4
;
tabstop
=
4
;
...
...
neovim/lua/keybindings/which_key.lua
View file @
0cf479db
...
@@ -26,6 +26,9 @@ local keymap = {
...
@@ -26,6 +26,9 @@ local keymap = {
s
=
{
'<Cmd>Lspsaga lsp_finder<CR>'
,
'find'
},
s
=
{
'<Cmd>Lspsaga lsp_finder<CR>'
,
'find'
},
p
=
{
'<Cmd>Lspsaga preview_definition<CR>'
,
'preview definition'
},
p
=
{
'<Cmd>Lspsaga preview_definition<CR>'
,
'preview definition'
},
f
=
{
'<Cmd>lua vim.lsp.buf.formatting()<CR>'
,
'format'
},
f
=
{
'<Cmd>lua vim.lsp.buf.formatting()<CR>'
,
'format'
},
d
=
{
'<Cmd>lua vim.lsp.buf.definition()<CR>'
,
'go to definition'
},
i
=
{
'<Cmd>lua vim.lsp.buf.implementation()<CR>'
,
'go to definition'
},
t
=
{
'<Cmd>LspTroubleToggle lsp_workspace_diagnostics<CR>'
,
'open LspTrouble'
},
},
},
...
@@ -33,6 +36,7 @@ local keymap = {
...
@@ -33,6 +36,7 @@ local keymap = {
name
=
'+telescope'
,
name
=
'+telescope'
,
p
=
{
'<Cmd>Telescope project<CR>'
,
'projects'
},
p
=
{
'<Cmd>Telescope project<CR>'
,
'projects'
},
d
=
{
'<Cmd>Telescope lsp_workspace_diagnostics<CR>'
,
'diagnostics'
},
}
}
}
}
...
...
neovim/lua/lsp/init.lua
View file @
0cf479db
...
@@ -19,6 +19,16 @@ lsp_config.rust_analyzer.setup{
...
@@ -19,6 +19,16 @@ lsp_config.rust_analyzer.setup{
capabilities
=
capabilities
,
capabilities
=
capabilities
,
}
}
lsp_config
.
yamlls
.
setup
{
capabilities
=
capabilities
,
}
lsp_config
.
dartls
.
setup
{}
lsp_config
.
ccls
.
setup
{
capabilities
=
capabilities
,
}
lsp_config
.
sumneko_lua
.
setup
{
lsp_config
.
sumneko_lua
.
setup
{
cmd
=
{
'/usr/bin/lua-language-server'
},
cmd
=
{
'/usr/bin/lua-language-server'
},
capabilities
=
capabilities
,
capabilities
=
capabilities
,
...
@@ -61,3 +71,22 @@ vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
...
@@ -61,3 +71,22 @@ vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
update_in_insert
=
true
,
update_in_insert
=
true
,
}
}
)
)
do
local
default_handler
=
vim
.
lsp
.
handlers
[
"textdocument/publishdiagnostics"
]
vim
.
lsp
.
handlers
[
"textdocument/publishdiagnostics"
]
=
function
(
err
,
method
,
result
,
client_id
,
bufnr
,
config
)
default_handler
(
err
,
method
,
result
,
client_id
,
bufnr
,
config
)
local
diagnostics
=
vim
.
lsp
.
diagnostic
.
get_all
()
local
qflist
=
{}
for
bufnr_
,
diagnostic
in
pairs
(
diagnostics
)
do
for
_
,
d
in
ipairs
(
diagnostic
)
do
d
.
bufnr
=
bufnr_
d
.
lnum
=
d
.
range
.
start
.
line
+
1
d
.
col
=
d
.
range
.
start
.
character
+
1
d
.
text
=
d
.
message
table.insert
(
qflist
,
d
)
end
end
vim
.
lsp
.
util
.
set_qflist
(
qflist
)
end
end
neovim/lua/plugins/init.lua
View file @
0cf479db
...
@@ -10,7 +10,8 @@ return require('packer').startup(function()
...
@@ -10,7 +10,8 @@ return require('packer').startup(function()
requires
=
{
'tjdevries/colorbuddy.vim'
},
requires
=
{
'tjdevries/colorbuddy.vim'
},
config
=
function
()
config
=
function
()
require
(
'colorbuddy'
).
colorscheme
(
'gruvbuddy'
)
--require('colorbuddy').colorscheme('gruvbox')
vim
.
cmd
[[colo gruvbox]]
end
end
}
}
...
@@ -165,7 +166,7 @@ return require('packer').startup(function()
...
@@ -165,7 +166,7 @@ return require('packer').startup(function()
},
},
}
}
vim
.
api
.
nvim_command
[[autocmd CursorHold,CursorHoldI * :lua require('lspsaga.signaturehelp').signature_help()]]
--
vim.api.nvim_command [[autocmd CursorHold,CursorHoldI * :lua require('lspsaga.signaturehelp').signature_help()]]
end
end
}
}
use
{
use
{
...
@@ -185,4 +186,39 @@ return require('packer').startup(function()
...
@@ -185,4 +186,39 @@ return require('packer').startup(function()
}
}
end
end
}
}
use
{
"folke/lsp-trouble.nvim"
,
requires
=
"kyazdani42/nvim-web-devicons"
,
config
=
function
()
require
(
"trouble"
).
setup
{
-- your configuration comes here
-- or leave it empty to use the default settings
-- refer to the configuration section below
}
end
}
use
{
"ray-x/lsp_signature.nvim"
,
config
=
function
()
require
(
'lsp_signature'
).
on_attach
({
bind
=
true
,
handler_opts
=
{
border
=
"single"
}
})
end
}
use
{
'lewis6991/gitsigns.nvim'
,
requires
=
{
'nvim-lua/plenary.nvim'
},
config
=
function
()
require
(
'gitsigns'
).
setup
()
end
}
end
)
end
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment