Merge branch 'master' of git.venya.tech:mega_venik/dotfiles

tmux.conf

@@ -10,6 +10,8 @@ set allow-rename off
 unbind C-b
 set-option -g prefix C-x
 bind-key C-x send-prefix
+
+unbind C-z # https://superuser.com/questions/1291278/accidentally-stop-the-tmux-job-via-remote-shell
  
 # reload config file (change file location to your the tmux.conf you want to use)
 bind r source-file ~/.tmux.conf \; display "Reloaded!"

vim/coc-settings.json

@@ -0,0 +1,3 @@
+{
+	"pyright.inlayHints.enable": false
+}

vim/ftplugin/json.vim

@@ -0,0 +1,2 @@
+set conceallevel=0
+let g:indentLine_setConceal = 0

vim/vimrc

@@ -156,10 +156,10 @@ let g:ansible_yamlKeyName = 'yamlKey'
 "
 let g:coc_global_extensions = ['coc-pyright']
 function! s:enable_coc_for_type()
-  let l:filesuffix_whitelist = ['py']
-	if index(l:filesuffix_whitelist, expand('%:e')) == -1
-		let b:coc_enabled = 0
-	endif
+        let l:filesuffix_whitelist = ['py']
+        if index(l:filesuffix_whitelist, expand('%:e')) == -1
+          let b:coc_enabled = 0
+        endif
 endfunction
 autocmd BufRead,BufNewFile * call s:enable_coc_for_type()
 source ~/.vim/coc.vim