Nvim config

master^2
Daan Vanoverloop 4 months ago
parent 38aac0904f
commit c8b71a2078
  1. 2
      .config/alacritty.yml
  2. 12
      .config/nvim/lua/completion.lua
  3. 16
      .config/nvim/lua/plugins.lua
  4. 4
      .config/nvim/lua/statusline.lua
  5. 20
      .config/sway/config
  6. 2
      .zprofile
  7. 2
      .zshrc

@ -135,7 +135,7 @@ font:
#style: Bold Italic
# Point size
size: 9.0
size: 10.0
# Offset is the extra space around each character. `offset.y` can be thought of
# as modifying the line spacing, and `offset.x` as modifying the letter spacing.

@ -25,7 +25,7 @@ local on_attach = function(client, bufnr)
end
-- Enable some language servers with the additional completion capabilities offered by nvim-cmp
local servers = { 'clangd', 'pyright', 'tsserver', 'svelte', 'bashls', 'gopls', 'zls' }
local servers = { 'clangd', 'pyright', 'tsserver', 'svelte', 'bashls', 'gopls', 'zls', 'terraformls' }
for _, lsp in ipairs(servers) do
lspconfig[lsp].setup {
on_attach = on_attach,
@ -49,6 +49,7 @@ lspconfig['rust_analyzer'].setup({
["rust-analyzer"] = {
cargo = {
allFeatures = true,
runBuildScripts = true,
},
procMacro = {
enable = true
@ -63,6 +64,8 @@ lspconfig['texlab'].setup({
filetypes = { "tex", "bib", "md" }
})
vim.cmd([[autocmd BufWritePre *.tf lua vim.lsp.buf.formatting_sync()]])
--[[
require'lspconfig'.java_language_server.setup{
cmd = {'java-language-server'}
@ -70,7 +73,7 @@ require'lspconfig'.java_language_server.setup{
--]]
-- Exrta features
vim.cmd([[autocmd BufEnter,BufWinEnter,TabEnter *.rs :lua require'lsp_extensions'.inlay_hints{}]])
--vim.cmd([[autocmd BufEnter,BufWinEnter,TabEnter *.rs :lua require'lsp_extensions'.inlay_hints{}]])
require('lspkind').init{}
require "lsp_signature".setup()
@ -125,7 +128,6 @@ cmp.setup {
-- Diagnostics
--[[
vim.cmd[[
" Errors in Red
hi LspDiagnosticsVirtualTextError guifg=red ctermfg=red
@ -141,8 +143,6 @@ hi LspDiagnosticsUnderlineWarning guifg=NONE ctermfg=NONE cterm=underline gui=un
hi LspDiagnosticsUnderlineInformation guifg=NONE ctermfg=NONE cterm=underline gui=underline
hi LspDiagnosticsUnderlineHint guifg=NONE ctermfg=NONE cterm=underline gui=underline
]]
--]]
vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
vim.lsp.diagnostic.on_publish_diagnostics, {
-- Enable underline, use default values
@ -153,7 +153,7 @@ vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
},
}
)
vim.cmd[[
autocmd ColorScheme * :lua require('vim.lsp.diagnostic')._define_default_signs_and_highlights()
autocmd CursorHold * lua vim.lsp.diagnostic.show_line_diagnostics()

@ -15,13 +15,13 @@ return require('packer').startup(function()
-- Completion
use 'neovim/nvim-lspconfig'
use 'nvim-lua/lsp-status.nvim'
--use 'nvim-lua/lsp-status.nvim'
use 'hrsh7th/nvim-cmp'
use 'hrsh7th/cmp-buffer'
use 'hrsh7th/cmp-nvim-lsp'
use 'saadparwaiz1/cmp_luasnip'
use 'L3MON4D3/LuaSnip'
use 'nvim-lua/lsp_extensions.nvim'
--use 'nvim-lua/lsp_extensions.nvim'
use 'kosayoda/nvim-lightbulb'
use {
"folke/trouble.nvim",
@ -44,16 +44,18 @@ return require('packer').startup(function()
}
-- Make
use 'neomake/neomake'
--use 'neomake/neomake'
use 'tpope/vim-dispatch'
-- Scrolling
--[[
use {
'karb94/neoscroll.nvim',
config = function()
require('neoscroll').setup()
end
}
--]]
-- Syntax highlighting
use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' }
@ -92,8 +94,12 @@ return require('packer').startup(function()
use 'navarasu/onedark.nvim'
use 'Th3Whit3Wolf/one-nvim'
-- Status lioe
use 'glepnir/galaxyline.nvim'
-- Status line
use {
'nvim-lualine/lualine.nvim',
requires = { 'kyazdani42/nvim-web-devicons', opt = true }
}
--use 'glepnir/galaxyline.nvim'
-- Icons
use 'ryanoasis/vim-devicons'

@ -1,3 +1,6 @@
require('lualine').setup()
--[[
local gl = require('galaxyline')
local colors = require('galaxyline.theme').default
local condition = require('galaxyline.condition')
@ -208,3 +211,4 @@ gls.short_line_right[1] = {
highlight = {colors.fg,colors.bg}
}
}
--]]

@ -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,7 +67,7 @@ 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 &
#exec_always --no-startup-id easyeffects --gapplication-service &
#bindsym $mod+w exec --no-startup-id guake-toggle &
@ -187,14 +187,14 @@ 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
}
}
#bar {
# status_command exec i3status
# position top
# colors {
# background #00000000
# statusline #ffffff
# }
#}
# resize window (you can also use the mouse for that)
mode "resize" {

@ -1,5 +1,5 @@
export QT_QPA_PLATFORMTHEME="qt5ct"
export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/radeon_icd.x86_64.json:/usr/share/vulkan/icd.d/radeon_icd.i686.json"
#export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/radeon_icd.x86_64.json:/usr/share/vulkan/icd.d/radeon_icd.i686.json"
export _JAVA_AWT_WM_NONREPARENTING=1
export XKB_DEFAULT_OPTIONS=caps:escape
export MOZ_USE_XINPUT2=1

@ -216,5 +216,7 @@ alias config='/usr/bin/git --git-dir=/home/daan/.cfg/ --work-tree=/home/daan'
alias chadgit="GIT_SSH_COMMAND='ssh -i ~/.ssh/id_rsa_tor -o IdentitiesOnly=yes' git"
alias hass="podman run homeassistant/home-assistant-cli"
source /usr/share/skim/key-bindings.zsh
source /usr/share/skim/completion.zsh

Loading…
Cancel
Save