Config update

This commit is contained in:
Daan Vanoverloop 2021-12-02 10:35:31 +01:00
parent 3198fcf967
commit 7b6ca96859
Signed by: Danacus
GPG Key ID: F2272B50E129FC5C
6 changed files with 53 additions and 23 deletions

View File

@ -17,38 +17,33 @@ capabilities.textDocument.completion.completionItem.resolveSupport = {
},
}
-- Enable some language servers with the additional completion capabilities offered by nvim-cmp
local servers = { 'clangd', 'pyright', 'tsserver', 'svelte', 'bashls' }
for _, lsp in ipairs(servers) do
lspconfig[lsp].setup {
on_attach = function(client, bufnr)
local on_attach = function(client, bufnr)
local basics = require('lsp_basics')
basics.make_lsp_commands(client, bufnr)
basics.make_lsp_mappings(client, bufnr)
end,
end
-- Enable some language servers with the additional completion capabilities offered by nvim-cmp
local servers = { 'clangd', 'pyright', 'tsserver', 'svelte', 'bashls', 'gopls', 'zls' }
for _, lsp in ipairs(servers) do
lspconfig[lsp].setup {
on_attach = on_attach,
capabilities = capabilities,
}
end
lspconfig['arduino_language_server'].setup({
on_attach = function(client, bufnr)
local basics = require('lsp_basics')
basics.make_lsp_commands(client, bufnr)
basics.make_lsp_mappings(client, bufnr)
end,
on_attach = on_attach,
capabilities = capabilities,
cmd = { "arduino-language-server", "-cli-config", "/home/daan/.arduino15/arduino-cli.yaml" },
cmd = { "arduino-language-server"
, "-cli-config", "/home/daan/.arduino15/arduino-cli.yaml"
, "-fqbn", "BSFrance-avr-master:avr:lora32u4II"
},
})
lspconfig['rust_analyzer'].setup({
on_attach = function(client, bufnr)
local basics = require('lsp_basics')
basics.make_lsp_commands(client, bufnr)
basics.make_lsp_mappings(client, bufnr)
end,
on_attach = on_attach,
capabilities = capabilities,
settings = {
["rust-analyzer"] = {
@ -62,6 +57,12 @@ lspconfig['rust_analyzer'].setup({
}
})
lspconfig['texlab'].setup({
on_attach = on_attach,
capabilities = capabilities,
filetypes = { "tex", "bib", "md" }
})
--[[
require'lspconfig'.java_language_server.setup{
cmd = {'java-language-server'}

View File

@ -33,12 +33,21 @@ require('formatter').setup({
}
end
},
zig = {
-- zig fmt
function ()
return {
exe = "zig fmt",
stdin = false
}
end
},
}
})
vim.api.nvim_exec([[
augroup FormatAutogroup
autocmd!
autocmd BufWritePost *.svelte,*.js,*.rs FormatWrite
autocmd BufWritePost *.svelte,*.js,*.rs,*.zig FormatWrite
augroup END
]], true)

View File

@ -25,3 +25,5 @@ o.swapfile = false
o.showmode = true
o.termguicolors = true
o.updatetime = 1000
vim.api.nvim_exec('let g:languagetool_cmd="/usr/bin/languagetool"', true)

View File

@ -43,6 +43,10 @@ return require('packer').startup(function()
requires = {'kyazdani42/nvim-web-devicons'}
}
-- Make
use 'neomake/neomake'
use 'tpope/vim-dispatch'
-- Scrolling
use {
'karb94/neoscroll.nvim',

View File

@ -7,7 +7,6 @@ configuration {
/* lines: 15;*/
font: "Open Sans 10";
/*theme: "sidetab";*/
theme: "~/.config/rofi/sidebar.rasi";
/* bw: 1;*/
/* location: 0;*/
/* padding: 5;*/
@ -134,3 +133,5 @@ configuration {
/* me-accept-entry: "MouseDPrimary";*/
/* me-accept-custom: "Control+MouseDPrimary";*/
}
@theme "~/.config/rofi/sidebar.rasi"

View File

@ -59,7 +59,7 @@ exec_always --no-startup-id indicator-kdeconnect
#exec_always --no-startup-id ~/.config/i3/auto-xrandr
#
#exec_always --no-startup-id ~/.config/picom/launch.sh
exec_always --no-startup-id waybar
#exec_always --no-startup-id waybar
#exec_always --no-startup-id /home/daan/.screenlayout/HDMI.sh
exec_always --no-startup-id ~/Scripts/setbg_wl.sh &
#exec_always --no-startup-id hsetroot -solid "#ffffff"
@ -67,6 +67,8 @@ exec_always --no-startup-id mako &
#exec_always --no-startup-id ~/.config/i3/oneko.sh
exec_always --no-startup-id ~/.config/sway/lisgd_gestures.sh
exec_always --no-startup-id easyeffects --gapplication-service &
#bindsym $mod+w exec --no-startup-id guake-toggle &
@ -80,6 +82,8 @@ bindsym $mod+c exec --no-startup-id rofi-pass-wl
bindsym $mod+m exec --no-startup-id mpc toggle
bindsym $mod+Shift+p exec --no-startup-id ~/Scripts/pause.sh
# window border size
default_border pixel 0
default_floating_border pixel 0
@ -183,6 +187,15 @@ bindsym $mod+Shift+r swaymsg restart
# exit i3 (logs you out of your X session)
#bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
bar {
status_command exec i3status
position top
colors {
background #00000000
statusline #ffffff
}
}
# resize window (you can also use the mouse for that)
mode "resize" {
# These bindings trigger as soon as you enter the resize mode