not sure what I was up to here

master
Jordan Orelli 7 months ago
parent 066642b243
commit 8f89531a3c

@ -25,3 +25,7 @@ let g:terminal_color_15 = '#ffffff'
lua require('term')
lua require('git')
lua require('lsp')
if exists("g:neovide")
lua require('neovide')
endif

@ -1,9 +1,5 @@
local lspconfig = require('lspconfig')
-- global configurations
-- vim.api.nvim_set_keymap("n", "<F2>", vim.diagnostic.open_float, {noremap = true, silent = false })
vim.keymap.set('n', '<space>e', vim.diagnostic.open_float)
-- rust-specific configurations
-- lspconfig.rust_analyzer.setup {
-- settings = {
@ -11,7 +7,6 @@ vim.keymap.set('n', '<space>e', vim.diagnostic.open_float)
-- },
-- }
vim.api.nvim_create_autocmd('LspAttach', {
group = vim.api.nvim_create_augroup('UserLspConfig', {}),
callback = function(ev)
@ -21,23 +16,26 @@ vim.api.nvim_create_autocmd('LspAttach', {
-- Buffer local mappings.
-- See `:help vim.lsp.*` for documentation on any of the below functions
local opts = { buffer = ev.buf }
vim.keymap.set('n', '<F2>', vim.lsp.buf.rename, opts)
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, opts)
vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, opts)
vim.keymap.set('n', '<space>wl', function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, opts)
-- The rest are recommended keybindings from the lsp documentation
-- vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
-- vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, opts)
-- vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, opts)
-- vim.keymap.set('n', '<space>wl', function()
-- print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-- end, opts)
-- vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, opts)
vim.keymap.set('n', '<F2>', vim.lsp.buf.rename, opts)
vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, opts)
vim.keymap.set({ 'n', 'v' }, '<space>ca', vim.lsp.buf.code_action, opts)
vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
vim.keymap.set('n', '<space>f', function()
vim.lsp.buf.format { async = true }
end, opts)
-- vim.keymap.set({ 'n', 'v' }, '<space>ca', vim.lsp.buf.code_action, opts)
-- vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
-- vim.keymap.set('n', '<space>f', function()
-- vim.lsp.buf.format { async = true }
-- end, opts)
end,
})

@ -0,0 +1,29 @@
-- Full Neovide config options can be found here:
-- https://neovide.dev/configuration.html
vim.o.guifont = "Monaspace Neon:h12"
vim.g.neovide_scale_factor = 1.0
vim.g.neovide_padding_top = 0
vim.g.neovide_padding_bottom = 0
vim.g.neovide_padding_right = 0
vim.g.neovide_padding_left = 0
-- controls the blur radius on the axes of floating windows
vim.g.neovide_floagin_blur_amount_x = 2.0
vim.g.neovide_floagin_blur_amount_y = 2.0
-- whether or not floating windows should have a shadow border
vim.g.neovide_floating_shadow = true
-- the logical stacking height of floating windows
vim.g.neovide_floating_z_height = 10
-- how long it takes for scrolling text to animate
vim.g.neovide_scroll_animation_length = 0.15
vim.g.neovide_hide_mouse_when_typing = true
-- always use dark mode
vim.g.neovide_theme = 'dark'
vim.api.nvim_set_keymap('n', '<F11>', ":let g:neovide_fullscreen = !g:neovide_fullscreen<CR>", {})

@ -371,9 +371,9 @@ xmap ic <plug>(signify-motion-inner-visual)
omap ac <plug>(signify-motion-outer-pending)
xmap ac <plug>(signify-motion-outer-visual)
nmap <F9> :Git<CR>
nmap <F10> :Git pull --rebase<CR>
nmap <F11> :Gi push<CR>
" nmap <F9> :Git<CR>
" nmap <F10> :Git pull --rebase<CR>
" nmap <F11> :Git push<CR>
" ---------------------------------------------------------------------------}}}
" Insert Mode ---------------------------------------------------------------{{{
@ -541,9 +541,6 @@ let g:terraform_fmt_on_save=1
let g:NERDDefaultAlign='left'
" insert a space after comment markers
let g:NERDSpaceDelims=1
" vmap K <Plug>NERDCommenterToggle('n', 'Toggle')<Cr>
" nmap KK <Plug>NERDCommenterToggle('n', 'Toggle')<Cr>
" ---------------------------------------------------------------------------}}}
" Misc ----------------------------------------------------------------------{{{

Loading…
Cancel
Save