Add changes to nvim config

.gitconfig

@@ -15,11 +15,16 @@
     ktokurwa = blame
 
 [push]
-    default = simple
+	default = current
 
 [merge "ours"]
     driver = true
 
 [core]
 	excludesfile = ~/.gitignore
-	autocrlf = input
+    autocrlf = input
+
+[mergetool "nvimdiff"]
+  cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
+[difftool]
+	tool = nvimdiff

.gitignore

@@ -0,0 +1 @@
+/nvim/venv

.ideavimrc

@@ -52,3 +52,4 @@ nnoremap m[ :action MethodUp<cr>
 nnoremap m] :action MethodDown<cr>
 nnoremap c[ :action VcsShowPrevChangeMarker<cr>
 nnoremap c] :action VcsShowNextChangeMarker<cr>
+set ideajoin

.zshrc

@@ -66,7 +66,7 @@ unsetopt share_history
 
 # Preferred editor for local and remote sessions
 export EDITOR='vim'
-export PATH=$PATH:$HOME/bin/
+export PATH=$PATH:$HOME/bin/:$HOME/.local/bin:$HOME/.dotnet/tools
 
 # Compilation flags
 # export ARCHFLAGS="-arch x86_64"

awesome/rc.lua

@@ -60,7 +60,7 @@ end
 
 -- Autostart programs
 run_once({ 
-    "xcompmgr", 
+    "picom -b", 
 --    "sleep 0.25 && xrandr --output  DP-1 --primary --auto --pos 0x0 --output HDMI-0 --auto --pos 2560x180",
     "keepassxc"
 })
@@ -484,9 +484,10 @@ root.keys(globalkeys)
 
 local client_colors = {
     { rule = { class = "Firefox" }, color = "#0c0c0d" },
+    { rule = { class = "kitty" }, color = "#0d0f18e6" },
     { rule = { class = "jetbrains-toolbox" }, color = "#111314" },
     { rule = { class = "TelegramDesktop" }, color = "#17212B" },
-    { rule_any = { class = { "jetbrains-phpstorm", "jetbrains-idea", "jetbrains-pycharm" } }, color = "#3c3f41" },
+    { rule_any = { class = { "jetbrains-phpstorm", "jetbrains-idea", "jetbrains-pycharm" } }, color = "#2F3032" },
 }
 
 -- Rules to apply to new clients (through the "manage" signal).
@@ -526,10 +527,6 @@ awful.rules.rules = {
     -- flameshot
     { rule = { class = "flameshot" },
       properties = { titlebars_enabled = true, floating = true, focus = true } },
-      
-    -- keepassxc
-    { rule = { class = "keepassxc" },
-      properties = { titlebars_enabled = true, floating = true, sticky = true } },
 
     { rule = { class = "Gcolor2" },
       properties = { titlebars_enabled = true, floating = true, focus = true } },
@@ -555,6 +552,10 @@ awful.rules.rules = {
     -- quake
     { rule = { class = "QuakeDD" },
       properties = { allow_titlebars = false } },
+      
+    -- keepassxc
+    { rule = { class = "KeePassXC" },
+      properties = { titlebars_enabled = true, floating = true } },
 }
 
 -- Signals

awesome/themes/kadet/theme.lua

@@ -62,12 +62,12 @@ theme.tasklist_bg_urgent                        = "#C92132"
 theme.tasklist_fg_urgent                        = "#32302f"
 
 theme.border_width                              = 0
-theme.border_normal                             = "#32302f"
-theme.border_focus                              = "#3f3f3f"
+theme.border_normal                             = "#111111"
+theme.border_focus                              = "#000000"
 theme.border_marked                             = "#CC9393"
 
-theme.titlebar_bg_normal                        = "#313742"
-theme.titlebar_bg_focus                         = "#2f343f"
+theme.titlebar_bg_normal                        = "#111111"
+theme.titlebar_bg_focus                         = "#000000"
 theme.titlebar_fg_normal                        = colors.white
 theme.titlebar_fg_focus                         = colors.white
 

nvim/init.vim

@@ -7,9 +7,8 @@ else
     let $VIMHOME = $HOME."/.vim"
 endif
 
-let g:vimtex_latexmk_progname = 'nvr'
-let g:vimtex_view_method = 'general'
-let g:vimtex_view_general_viewer = 'llpp'
+let g:vimtex_compiler_progname = "nvr"
+let g:vimtex_view_method = 'zathura'
 let g:vimtex_latexmk_options = '-pdf -bibtex -pdflatex="xelatex -synctex=1 \%S \%O" -verbose -file-line-error -interaction=nonstopmode'
 let g:deoplete#enable_at_startup = 1
 
@@ -28,10 +27,15 @@ call plug#begin($VIMHOME.'/plugged')
     Plug 'tpope/vim-surround'
     Plug 'airblade/vim-gitgutter'
     Plug 'tpope/vim-commentary'
+    Plug 'tpope/vim-repeat'
     Plug 'tibabit/vim-templates'
-    Plug 'Shougo/deoplete.nvim'
+    Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
     Plug 'gootorov/q-sharp.vim'
     Plug 'tpope/vim-fugitive'
+    Plug 'autozimu/LanguageClient-neovim', {
+        \ 'branch': 'next',
+        \ 'do': 'bash install.sh',
+        \ }
 
     " load local plugins
     if filereadable("~/.local-plugins.vimrc")
@@ -42,6 +46,10 @@ call plug#end()
 let g:deoplete#enable_at_startup = 1
 let g:deoplete#disable_auto_complete = 1
 
+let g:LanguageClient_serverCommands = {
+    \ 'python': ['/home/kadet/.config/nvim/venv/env/bin/pyls'],
+\ }
+
 call deoplete#custom#var('omni', 'input_patterns', {
           \ 'tex': g:vimtex#re#deoplete
 \})
@@ -129,7 +137,7 @@ let &t_EI = "\<Esc>[2 q"
 " filetypes
 " autocmd FileType c,cpp :compiler cl
 au FileType asm :set ft=masm
-au FileType tex :set tw=120 spell spelllang=pl
+au FileType tex :set tw=120 spell spelllang=pl ft=tex
 
 " airline
 let g:airline_powerline_fonts = 0
@@ -142,6 +150,9 @@ let g:ctrlp_switch_buffer = 'Et'
 " ycm config
 let g:ycm_confirm_extra_conf = 0
 
+" vim surround
+let g:surround_{char2nr('c')} = "\\\1command\1{\r}"
+
 " no arrows
 nnoremap <Left> <Nop>
 nnoremap <Right> <Nop>
@@ -173,6 +184,7 @@ nnoremap gd< :diffget //2 | diffupdate
 nnoremap gd> :diffget //3 | diffupdate 
 
 command! SetCwd :cd %:p:h
+nnoremap <F4> :call LanguageClient_contextMenu()<CR>
 
 nnoremap <F6> :SetCwd<CR>
 
@@ -185,7 +197,7 @@ vnoremap gT "py<Esc>:tabe <C-R>p<CR>
 inoremap <silent><expr> <C-Space>
     \ pumvisible() ? "\<C-n>" :
     \ <SID>check_back_space() ? "\<TAB>" :
-    \ deoplete#mappings#manual_complete()
+    \ deoplete#manual_complete()
     function! s:check_back_space() abort "{{{
     let col = col('.') - 1
     return !col || getline('.')[col - 1]  =~ '\s'

nvim/spell/pl.utf-8.add

@@ -10,3 +10,16 @@ Bourke
 Kena
 predefiniowanych
 turowych
+Fortune
+Woronoja
+Delone
+Delaunay
+teselacją
+implementacyjne
+samoprzecinania
+parkietaż
+wypozycjonowaniu
+parametryzowalność
+parametryzowalnych
+parametryzacji
+Parametryzacja