From 61dc1712af9a7425007567199cf35d8a1503b993 Mon Sep 17 00:00:00 2001
From: paul-loedige <paul@gve-loedige.de>
Date: Wed, 22 Feb 2023 17:54:22 +0100
Subject: [PATCH] merged laptop into master

---
 neovim/.config/nvim/coc.vim                   | 54 ++++++++++---------
 neovim/.config/nvim/ftplugin/tex.vim          |  2 -
 neovim/.config/nvim/init.vim                  | 17 +++++-
 qtile/.config/qtile/Groups.py                 | 13 ++++-
 qtile/.config/qtile/Screens.py                |  2 +-
 qtile/.config/qtile/Widgets.py                |  1 -
 qtile/.config/qtile/autostart.sh              |  3 +-
 .../custom/plugins/zsh-syntax-highlighting    |  2 +-
 8 files changed, 60 insertions(+), 34 deletions(-)

diff --git a/neovim/.config/nvim/coc.vim b/neovim/.config/nvim/coc.vim
index 74525bf..9bd540b 100644
--- a/neovim/.config/nvim/coc.vim
+++ b/neovim/.config/nvim/coc.vim
@@ -1,30 +1,36 @@
-" TextEdit might fail if hidden is not set.
-set hidden
 
+" May need for vim (not neovim) since coc.nvim calculate byte offset by count
+" utf-8 byte sequence.
+set encoding=utf-8
 " Some servers have issues with backup files, see #649.
 set nobackup
 set nowritebackup
 
-" Give more space for displaying messages.
-set cmdheight=2
-
 " Having longer updatetime (default is 4000 ms = 4 s) leads to noticeable
 " delays and poor user experience.
 set updatetime=300
 
-" Don't pass messages to |ins-completion-menu|.
-set shortmess+=c
+" Always show the signcolumn, otherwise it would shift the text each time
+" diagnostics appear/become resolved.
+set signcolumn=yes
 
 " Use tab for trigger completion with characters ahead and navigate.
+" NOTE: There's always complete item selected by default, you may want to enable
+" no select by `"suggest.noselect": true` in your configuration file.
 " NOTE: Use command ':verbose imap <tab>' to make sure tab is not mapped by
 " other plugin before putting this into your config.
 inoremap <silent><expr> <TAB>
-      \ pumvisible() ? "\<C-n>" :
-      \ <SID>check_back_space() ? "\<TAB>" :
+      \ coc#pum#visible() ? coc#pum#next(1) :
+      \ CheckBackspace() ? "\<Tab>" :
       \ coc#refresh()
-inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
+inoremap <expr><S-TAB> coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>"
 
-function! s:check_back_space() abort
+" Make <CR> to accept selected completion item or notify coc.nvim to format
+" <C-g>u breaks current undo, please make your own choice.
+inoremap <silent><expr> <CR> coc#pum#visible() ? coc#pum#confirm()
+                              \: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
+
+function! CheckBackspace() abort
   let col = col('.') - 1
   return !col || getline('.')[col - 1]  =~# '\s'
 endfunction
@@ -36,11 +42,6 @@ else
   inoremap <silent><expr> <c-@> coc#refresh()
 endif
 
-" Make <CR> auto-select the first completion item and notify coc.nvim to
-" format on enter, <cr> could be remapped by other vim plugin
-inoremap <silent><expr> <cr> pumvisible() ? coc#_select_confirm()
-                              \: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
-
 " Use `[g` and `]g` to navigate diagnostics
 " Use `:CocDiagnostics` to get all diagnostics of current buffer in location list.
 nmap <silent> [g <Plug>(coc-diagnostic-prev)
@@ -53,15 +54,13 @@ nmap <silent> gi <Plug>(coc-implementation)
 nmap <silent> gr <Plug>(coc-references)
 
 " Use K to show documentation in preview window.
-nnoremap <silent> K :call <SID>show_documentation()<CR>
+nnoremap <silent> K :call ShowDocumentation()<CR>
 
-function! s:show_documentation()
-  if (index(['vim','help'], &filetype) >= 0)
-    execute 'h '.expand('<cword>')
-  elseif (coc#rpc#ready())
+function! ShowDocumentation()
+  if CocAction('hasProvider', 'hover')
     call CocActionAsync('doHover')
   else
-    execute '!' . &keywordprg . " " . expand('<cword>')
+    call feedkeys('K', 'in')
   endif
 endfunction
 
@@ -93,6 +92,9 @@ nmap <leader>ac  <Plug>(coc-codeaction)
 " Apply AutoFix to problem on the current line.
 nmap <leader>qf  <Plug>(coc-fix-current)
 
+" Run the Code Lens action on the current line.
+nmap <leader>cl  <Plug>(coc-codelens-action)
+
 " Map function and class text objects
 " NOTE: Requires 'textDocument.documentSymbol' support from the language server.
 xmap if <Plug>(coc-funcobj-i)
@@ -107,7 +109,7 @@ omap ac <Plug>(coc-classobj-a)
 " Remap <C-f> and <C-b> for scroll float windows/popups.
 if has('nvim-0.4.0') || has('patch-8.2.0750')
   nnoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>"
- nnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
+  nnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
   inoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? "\<c-r>=coc#float#scroll(1)\<cr>" : "\<Right>"
   inoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? "\<c-r>=coc#float#scroll(0)\<cr>" : "\<Left>"
   vnoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>"
@@ -120,13 +122,13 @@ nmap <silent> <C-s> <Plug>(coc-range-select)
 xmap <silent> <C-s> <Plug>(coc-range-select)
 
 " Add `:Format` command to format current buffer.
-command! -nargs=0 Format :call CocAction('format')
+command! -nargs=0 Format :call CocActionAsync('format')
 
 " Add `:Fold` command to fold current buffer.
 command! -nargs=? Fold :call     CocAction('fold', <f-args>)
 
 " Add `:OR` command for organize imports of the current buffer.
-command! -nargs=0 OR   :call     CocAction('runCommand', 'editor.action.organizeImport')
+command! -nargs=0 OR   :call     CocActionAsync('runCommand', 'editor.action.organizeImport')
 
 " Add (Neo)Vim's native statusline support.
 " NOTE: Please see `:h coc-status` for integrations with external plugins that
@@ -149,4 +151,4 @@ nnoremap <silent><nowait> <space>j  :<C-u>CocNext<CR>
 " Do default action for previous item.
 nnoremap <silent><nowait> <space>k  :<C-u>CocPrev<CR>
 " Resume latest coc list.
-nnoremap <silent><nowait> <space>p  :<C-u>CocListResume<CR> 
+nnoremap <silent><nowait> <space>p  :<C-u>CocListResume<CR>
diff --git a/neovim/.config/nvim/ftplugin/tex.vim b/neovim/.config/nvim/ftplugin/tex.vim
index 8ca12dd..1b4f901 100644
--- a/neovim/.config/nvim/ftplugin/tex.vim
+++ b/neovim/.config/nvim/ftplugin/tex.vim
@@ -1,5 +1,3 @@
-" set german as default
-setlocal spelllang=de
 " folding
 setlocal foldmethod=expr
 setlocal foldexpr=vimtex#fold#level(v:lnum)
diff --git a/neovim/.config/nvim/init.vim b/neovim/.config/nvim/init.vim
index 0344240..c2ee86c 100644
--- a/neovim/.config/nvim/init.vim
+++ b/neovim/.config/nvim/init.vim
@@ -54,6 +54,7 @@ let mapleader=" "           " set mapleader to space
 let maplocalleader=" "      " set localleader to space
 set timeoutlen=1000         " set timeout length
 set spell                   " activate spell-checking
+setlocal spelllang=de,en_us " enable German and English spell checking
 set nocompatible            " disable compatibility to old-time vi
 let g:indentLine_setConceal = 0 " disable the conceal 'feature' of indentLine plugin
 set showmatch               " show matching brackets.
@@ -193,7 +194,21 @@ highlight CursorLineNr ctermfg=7
 lua <<EOF
 require'nvim-treesitter.configs'.setup {
   -- One of "all", "maintained" (parsers with maintainers), or a list of languages
-  ensure_installed = "maintained",
+  ensure_installed = {
+      "bash", "bibtex", 
+      "c", "cmake", "comment", "cpp", "css", 
+      "diff", "dockerfile", "dot", 
+      "gitattributes", "gitignore", 
+      "html", "http", 
+      "javascript", "json", "json5",
+      "latex", "lua", 
+      "make", "markdown", "markdown_inline", 
+      "python", 
+      "regex", 
+      "sql", 
+      "toml", "typescript", 
+      "vim", 
+      "yaml"},
 
   -- Install languages synchronously (only applied to `ensure_installed`)
   sync_install = false,
diff --git a/qtile/.config/qtile/Groups.py b/qtile/.config/qtile/Groups.py
index 540931e..a7c05ea 100644
--- a/qtile/.config/qtile/Groups.py
+++ b/qtile/.config/qtile/Groups.py
@@ -12,7 +12,7 @@ group_names = [("","Home", 'h',{'layout': 'monadtall'}),
                ("","Documents", 'l',{'layout': 'monadtall'}),
                ("ﱘ","Music", 'u',{'layout': 'monadtall', 'matches' : [Match(wm_class="spotify")]}),
                ("","Video", 'v',{'layout': 'monadtall', 'matches' : [Match(wm_class="vlc")]}),
-               ("ﭮ","Discord", 'd',{'layout': 'monadtall', 'matches':[Match(wm_class="discord")]}),
+               ("ﭮ","VideoChat", 'z',{'layout': 'monadtall', 'matches':[Match(wm_class="discord")]}),
                ("","ClickUp", 'k',{'layout': 'monadtall', 'matches' : [Match(wm_class="clickup")]}),
                ("一","etc1", '1', {'layout': 'monadtall'}),
                ("二","etc2", '2', {'layout': 'monadtall'}),
@@ -93,6 +93,15 @@ groups.append(
             on_focus_lost_hide=False,
             opacity=1
         ),
+        DropDown(
+            'Deepl',
+            'surf deepl.com',
+            height = 0.5,
+            width = 0.8,
+            x = 0.1,
+            on_focus_lost_hide=False,
+            opacity=1
+        ),
         DropDown(
             'Telegram',
             'telegram-desktop',
@@ -138,4 +147,6 @@ keys.extend([
         desc="open the dropdown for Telegram"),
     Key(['mod1','control'],'q',lazy.group['scratchpad'].dropdown_toggle('Qalculate!'),
         desc="open the dropdown for Qalculate!"),
+    Key(['mod1','control'],'d',lazy.group['scratchpad'].dropdown_toggle('Deepl'),
+        desc="open the dropdown for Deepl")
 ])
diff --git a/qtile/.config/qtile/Screens.py b/qtile/.config/qtile/Screens.py
index 5fd0107..c422869 100644
--- a/qtile/.config/qtile/Screens.py
+++ b/qtile/.config/qtile/Screens.py
@@ -19,7 +19,7 @@ cmd = ['xrandr']
 p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
 resolution_string, junk = p.communicate()
 p.stdout.close()
-screen_resolutions = [np.array(screen_res.split('x')).astype(np.int) for screen_res in re.findall('[0-9]+x[0-9]+(?=[^\\\\n]*\*)',str(resolution_string))]
+screen_resolutions = [np.array(screen_res.split('x')).astype(int) for screen_res in re.findall('[0-9]+x[0-9]+(?=[^\\\\n]*\*)',str(resolution_string))]
 number_of_screens = len(screen_resolutions)
 max_width = max(screen_resolutions, key=lambda res: res[0])[0]
 defined_main_window = False
diff --git a/qtile/.config/qtile/Widgets.py b/qtile/.config/qtile/Widgets.py
index 9782a75..187b4bc 100644
--- a/qtile/.config/qtile/Widgets.py
+++ b/qtile/.config/qtile/Widgets.py
@@ -41,7 +41,6 @@ def Left_widgets(size,fontsize,prompt=False):
             text='',
             foreground=light_foreground_color,
             fontsize=fontsize,
-            # margin=5,
             background=blue_color
         ),
         *powerline_arrow('r',blue_color,base_color,size),
diff --git a/qtile/.config/qtile/autostart.sh b/qtile/.config/qtile/autostart.sh
index e911fd3..ca598e1 100755
--- a/qtile/.config/qtile/autostart.sh
+++ b/qtile/.config/qtile/autostart.sh
@@ -16,4 +16,5 @@ nm-applet &
 blueman-applet &
 thunderbird &
 clickup &
-fcitx -d&
\ No newline at end of file
+fcitx5 -d&
+emacs --daemon &
\ No newline at end of file
diff --git a/zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting b/zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting
index caa749d..754cefe 160000
--- a/zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting
+++ b/zsh/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting
@@ -1 +1 @@
-Subproject commit caa749d030d22168445c4cb97befd406d2828db0
+Subproject commit 754cefe0181a7acd42fdcb357a67d0217291ac47