Merge branch 'master' into mininux

.gitmodules

@@ -1,99 +1,6 @@
+[submodule "vim/.vim/bundle/Vundle.vim"]
+	path = vim/.vim/bundle/Vundle.vim
+	url = https://github.com/Vundlevim/Vundle.vim
 [submodule "polybar/.config/polybar/polybar-spotify"]
 	path = polybar/.config/polybar/polybar-spotify
 	url = https://github.com/Jvanrhijn/polybar-spotify
-[submodule "vim/.vim/pack/autoload/start/lightline.vim"]
-	path = vim/.vim/pack/autoload/start/lightline.vim
-	url = https://github.com/itchyny/lightline.vim
-[submodule "vim/.vim/pack/autoload/start/rainbow_parentheses.vim"]
-	path = vim/.vim/pack/autoload/start/rainbow_parentheses.vim
-	url = https://github.com/kien/rainbow_parentheses.vim
-[submodule "vim/.vim/pack/autoload/start/vim-startify"]
-	path = vim/.vim/pack/autoload/start/vim-startify
-	url = https://github.com/mhinz/vim-startify
-[submodule "vim/.vim/pack/autoload/start/colorizer"]
-	path = vim/.vim/pack/autoload/start/colorizer
-	url = https://github.com/lilydjwg/colorizer
-[submodule "vim/.vim/pack/autoload/start/auto-pairs"]
-	path = vim/.vim/pack/autoload/start/auto-pairs
-	url = https://github.com/jiangmiao/auto-pairs
-[submodule "vim/.vim/pack/autoload/start/vim-maximizer"]
-	path = vim/.vim/pack/autoload/start/vim-maximizer
-	url = https://github.com/szw/vim-maximizer
-[submodule "vim/.vim/pack/autoload/start/fzf"]
-	path = vim/.vim/pack/autoload/start/fzf
-	url = https://github.com/junegunn/fzf
-[submodule "vim/.vim/pack/autoload/start/fzf.vim"]
-	path = vim/.vim/pack/autoload/start/fzf.vim
-	url = https://github.com/junegunn/fzf.vim
-[submodule "vim/.vim/pack/autoload/start/vim-peekaboo"]
-	path = vim/.vim/pack/autoload/start/vim-peekaboo
-	url = https://github.com/junegunn/vim-peekaboo
-[submodule "vim/.vim/pack/autoload/start/unicode.vim"]
-	path = vim/.vim/pack/autoload/start/unicode.vim
-	url = https://github.com/chrisbra/unicode.vim
-[submodule "vim/.vim/pack/autoload/start/ultisnips"]
-	path = vim/.vim/pack/autoload/start/ultisnips
-	url = https://github.com/SirVer/ultisnips
-[submodule "vim/.vim/pack/autoload/start/vim-snippets"]
-	path = vim/.vim/pack/autoload/start/vim-snippets
-	url = https://github.com/honza/vim-snippets
-[submodule "vim/.vim/pack/autoload/start/tagbar"]
-	path = vim/.vim/pack/autoload/start/tagbar
-	url = https://github.com/majutsushi/tagbar
-[submodule "vim/.vim/pack/autoload/start/vim-commentary"]
-	path = vim/.vim/pack/autoload/start/vim-commentary
-	url = https://github.com/tpope/vim-commentary
-[submodule "vim/.vim/pack/autoload/start/vimspector"]
-	path = vim/.vim/pack/autoload/start/vimspector
-	url = https://github.com/puremourning/vimspector
-[submodule "vim/.vim/pack/autoload/start/YouCompleteMe"]
-	path = vim/.vim/pack/autoload/start/YouCompleteMe
-	url = https://github.com/ycm-core/YouCompleteMe
-[submodule "vim/.vim/pack/autoload/start/vim-signify"]
-	path = vim/.vim/pack/autoload/start/vim-signify
-	url = https://github.com/mhinz/vim-signify
-[submodule "vim/.vim/pack/autoload/start/vim-fugitive"]
-	path = vim/.vim/pack/autoload/start/vim-fugitive
-	url = https://github.com/tpope/vim-fugitive
-[submodule "vim/.vim/pack/autoload/start/vim-jinja"]
-	path = vim/.vim/pack/autoload/start/vim-jinja
-	url = https://github.com/mitsuhiko/vim-jinja
-[submodule "vim/.vim/pack/autoload/start/emmet-vim"]
-	path = vim/.vim/pack/autoload/start/emmet-vim
-	url = https://github.com/mattn/emmet-vim
-[submodule "vim/.vim/pack/autoload/start/loremipsum"]
-	path = vim/.vim/pack/autoload/start/loremipsum
-	url = https://github.com/vim-scripts/loremipsum
-[submodule "vim/.vim/pack/autoload/start/vim-surround"]
-	path = vim/.vim/pack/autoload/start/vim-surround
-	url = https://github.com/tpope/vim-surround
-[submodule "vim/.vim/pack/autoload/start/xmledit"]
-	path = vim/.vim/pack/autoload/start/xmledit
-	url = https://github.com/sukima/xmledit
-[submodule "vim/.vim/pack/autoload/start/markdown-preview.nvim"]
-	path = vim/.vim/pack/autoload/start/markdown-preview.nvim
-	url = https://github.com/iamcco/markdown-preview.nvim
-[submodule "vim/.vim/pack/autoload/start/vim-cpp-modern"]
-	path = vim/.vim/pack/autoload/start/vim-cpp-modern
-	url = https://github.com/bfrg/vim-cpp-modern
-[submodule "vim/.vim/pack/autoload/start/a.vim"]
-	path = vim/.vim/pack/autoload/start/a.vim
-	url = https://github.com/vim-scripts/a.vim
-[submodule "vim/.vim/pack/autoload/start/vim-glsl"]
-	path = vim/.vim/pack/autoload/start/vim-glsl
-	url = https://github.com/tikhomirov/vim-glsl
-[submodule "vim/.vim/pack/autoload/start/vimtex"]
-	path = vim/.vim/pack/autoload/start/vimtex
-	url = https://github.com/lervag/vimtex
-[submodule "vim/.vim/pack/autoload/start/latex-snippets"]
-	path = vim/.vim/pack/autoload/start/latex-snippets
-	url = https://github.com/gillescastel/latex-snippets
-[submodule "vim/.vim/pack/autoload/start/plantuml-previewer.vim"]
-	path = vim/.vim/pack/autoload/start/plantuml-previewer.vim
-	url = https://github.com/weirongxu/plantuml-previewer.vim
-[submodule "vim/.vim/pack/autoload/start/open-browser.vim"]
-	path = vim/.vim/pack/autoload/start/open-browser.vim
-	url = https://github.com/tyru/open-browser.vim
-[submodule "vim/.vim/pack/autoload/start/plantuml-syntax"]
-	path = vim/.vim/pack/autoload/start/plantuml-syntax
-	url = https://github.com/aklt/plantuml-syntax

bin/.bin/javadocs

@@ -1,2 +0,0 @@
-#!/bin/bash
-setsid firefox "/usr/share/doc/java-openjdk/index.html" &

bin/.bin/zoom_screen

@@ -0,0 +1,9 @@
+current_resolution=$(xrandr | awk '/DSI1/ {print $4}')
+
+if [[ $current_resolution == 1920x1200* ]];
+then
+	xrandr --size 600x960
+else
+	xrandr --size 1200x1920
+fi
+chwp

bin/.config/emoji

@@ -1644,4 +1644,3 @@
 🏴󠁧󠁢󠁥󠁮󠁧󠁿 flag: England; U+1F3F4 U+E0067 U+E0062 U+E0065 U+E006E U+E0067 U+E007F
 🏴󠁧󠁢󠁳󠁣󠁴󠁿 flag: Scotland; U+1F3F4 U+E0067 U+E0062 U+E0073 U+E0063 U+E0074 U+E007F
 🏴󠁧󠁢󠁷󠁬󠁳󠁿 flag: Wales; U+1F3F4 U+E0067 U+E0062 U+E0077 U+E006C U+E0073 U+E007F
-Ⓥ	voids: 

bspwm/.config/bspwm/bspwmrc

@@ -123,5 +123,3 @@ sxhkd &
 #. $HOME/.config/bspwm/autostart
 #limepanel &
 $HOME/.config/polybar/launch.sh &
-
-$HOME/.fehbg

picom/.config/picom/picom.conf

@@ -4,6 +4,5 @@ inactive-opacity = 0.9;
 opacity-rule = [
 	"100:name ~?= 'YouTube — Mozilla Firefox'",
 	"100:name ~?= 'Twitch — Mozilla Firefox'",
-	"100:name ~?= 'Netflix — Mozilla Firefox'",
 	"100:class_g = 'Zathura'"
 ]

polybar/.config/polybar/config

@@ -48,7 +48,7 @@ secondary = #e60053
 alert = #FF5555
 
 [bar/bspbar1]
-monitor = ${env:MONITOR:DVI-I-1}
+monitor = ${env:MONITOR:DVI-D-0}
 width = 100%:-10
 height = 25
 offset-x = 5

stowed.list

@@ -6,6 +6,5 @@ git
 picom
 polybar
 sxhkd
-tmux
 vim
 zathura

sxhkd/.config/sxhkd/sxhkdrc

@@ -1,8 +1,8 @@
 # bspwm hotkeys
 #
 # Cleanly quit bspwm
-super + shift + a
+super + shift + q
-	bspc quit 1 && pkill lemonpanel && pkill lemonbar
+	bspc quit 1 
 
 # Show keybindings
 super + F1
@@ -96,7 +96,7 @@ super + Return
 # 	bspc node -n @/
 	
 # go (Shift=move) to desktop (and focus the monitor that the desktop is located on. Bspwm style)
-super + {_,shift + }{ampersand,eacute,quotedbl,apostrophe,parenleft,section,egrave,exclam,ccedilla,agrave}
+super + {_,shift + }{1,2,3,4,5,6,7,8,9,0}
     bspc {desktop -f,node -d} ^{1-9,10}
 
 ## Alternative: i3 style behavior (focus nth, desktop of the focused monitor)
@@ -125,7 +125,7 @@ super + Tab
 	WindowSelector
 	
 #Focus windows by direction, works with multihead
-super + {q,s,z,d}
+super + {a,s,w,d}
     focusmover {west,south,north,east}
 
 super + {h,j,k,l}
@@ -137,7 +137,7 @@ super + {Left,Down,Up,Right}
 # Move tiled windows. Moving a tiled window to 
 # preselected one moves into preselection instead. 
 # Moving out of the screen should move the window to next monitor if possible
-super + shift + {q,s,z,d}
+super + shift + {q,s,w,d}
 	windowgrabber {west,south,north,east}
 
 super + shift + {h,j,k,l}
@@ -148,7 +148,7 @@ super + shift + {Left,Down,Up,Right}
 	euclid_mover {west,south,north,east}
 
 #resize windows
-super + ctrl + {q,s,z,d}
+super + ctrl + {a,s,w,d}
 	bspwm_resize.sh {west,south,north,east}
 
 super + ctrl + {h,j,k,l}
@@ -334,6 +334,9 @@ super + ctrl + space
 	{pkill picom ,\
 	picom -b }
 
+ctrl + alt +t 
+	pkill rotateScreen_au || rotateScreen_auto
+
 # Remove receptacles
 super + BackSpace
   for i in $(bspc query -N -n .leaf.!window.local); do bspc node $i -k; done

tmux/.config/tmux/tmux.conf

@@ -1,5 +1,4 @@
 set -g mouse
-set -g set-clipboard on
 
 bind h selectp -L 
 bind j selectp -D 

vim/.vim/ftplugin/markdown.vim

@@ -0,0 +1 @@
+set tw=120

vim/.vim/ycm_extra_conf.py

@@ -1,10 +1,10 @@
 import os
 
 PATH_TO_LOMBOK = os.path.expanduser("/usr/lib/lombok-common/lombok.jar")
-# jdtls_args = ['-noverify',
+jdtls_args = ['-noverify',
-#               '-Xmx1G',
+              '-Xmx1G',
-#               '-XX:+UseG1GC',
+              '-XX:+UseG1GC',
-#               '-XX:+UseStringDeduplication']
+              '-XX:+UseStringDeduplication']
 
 def Settings( **kwargs ):
     if not os.path.exists(PATH_TO_LOMBOK):
@@ -15,6 +15,6 @@ def Settings( **kwargs ):
                 'jvm_args': [
                     '-javaagent:' + PATH_TO_LOMBOK,
                     '-Xbootclasspath/a:' + PATH_TO_LOMBOK
-                    ]
+                    ] + jdtls_args
             }
         }

vim/.vimrc

@@ -1,19 +1,7 @@
-nnoremap <C-p> :Buffers<CR>
+autocmd FileType asm noremap <F12> <ESC>:execute 'silent !qtspim' expand('%::p')<CR>
-nnoremap <C-g> :Ag<CR>
 
-"alt g to :Gfiles (if in git folder) else :Files
+nnoremap <C-p> :GFiles<CR>
-function! GFilesFallback()
+nnoremap <C-g> :Ag<CR>
-  let output = system('git rev-parse --show-toplevel') " Is there a faster way?
-  let prefix = get(g:, 'fzf_command_prefix', '')
-  if v:shell_error == 0
-    exec "normal :" . prefix . "GFiles\<CR>"
-  else
-    exec "normal :" . prefix . "Files\<CR>"
-  endif
-  return 0
-endfunction
-execute "set <M-g>=\eg"
-nnoremap <M-g> :call GFilesFallback()<CR>
 
 nnoremap <leader><CR> :vert term<CR>
 
@@ -23,6 +11,7 @@ let g:netrw_liststyle=3
 let python_highlight_all=1
 let g:pymode_python = 'python3'
 let g:pymode_options_max_line_length = 120
+" let g:ctrlp_cmd = 'CtrlPTag'
 let g:htmljinja_disable_detection = 1
 
 let g:vimtex_view_method = 'zathura'
@@ -31,14 +20,15 @@ let g:vimtex_grammar_textidote = {'jar': '/usr/share/java/textidote.jar'}
 
 let g:vimtex_view_method = 'zathura'
 
+" nnoremap <c-p> <plug>(YCMFindSymbolInDirectory)
+" nnoremap <c-P> <plug>(YCMFindSymbolInWorkspace)
+
 nnoremap gd :YcmCompleter GoToDefinition<CR>
 nnoremap gr :YcmCompleter GoToReferences<CR>
 nnoremap K :YcmCompleter GetDoc<CR>
-nnoremap \<CR> :YcmCompleter FixIt<CR>
+nnoremap <CR> :YcmCompleter FixIt<CR>
 noremap gN :Lex<CR>
 
-nnoremap yp :let @+=expand('%') .. '#' .. line('.')<CR>
-
 nnoremap <F12> :Make<CR>
 nnoremap <leader><F12> :Make run<CR>
 
@@ -73,28 +63,12 @@ let g:cpp_attributes_highlight = 1
 let g:ycm_always_populate_location_list = 1
 let g:ycm_goto_buffer_command = "'split-or-existing-window'"
 let g:ycm_global_ycm_extra_conf = '~/.vim/ycm_extra_conf.py'
-" let g:ycm_java_binary_path = "/usr/lib/jvm/java-17-openjdk/bin/java"
 let g:ycm_language_server = [
-			\	{
+			\ {
 			\ 	'name': 'tex',
 			\ 	'cmdline': ['texlab'],
 			\ 	'filetypes': ['tex'],
 			\ 	},
-			\	{
-			\	'name': 'godot',
-			\	'filetypes': ['gdscript'],
-			\	'port': 6008,
-			\	'project_root_files': ['project.godot']
-			\	},
-			\	{
-			\	'name': 'arduino',
-			\	'filetypes': ['arduino'],
-			\	'cmdline': ['arduino-language-server',
-			\				'-clangd',  '/usr/bin/clangd',
-			\				'-cli', '/usr/bin/arduino-cli',
-			\				'-cli-config', '$HOME/.arduino15/arduino-cli.yaml',
-			\				'-fqbn', 'arduino:avr:uno'],
-			\	},
 			\ ]
 
 " let g:completor_clang_binary = "/usr/bin/clang"
@@ -102,15 +76,14 @@ let g:ycm_language_server = [
 nnoremap <space> za
 syntax on
 
-" set foldcolumn=1
 set autochdir
 set clipboard^=unnamed,unnamedplus
 set concealcursor=
 set conceallevel=2
 set encoding=utf-8
+" set foldcolumn=1
 set foldlevel=99
 set foldmethod=syntax
-set hidden
 set hls
 set ignorecase
 set incsearch
@@ -120,18 +93,100 @@ set nocompatible
 set nowrap
 set nu
 set rnu
-set scrolloff=10
 set shiftwidth=4
-set shortmess-=S
+set scrolloff=10
 set showcmd
 set spelllang+=fr
 set splitbelow splitright
 set tabstop=4
-set ttymouse=xterm2
 
 color desert 
 hi Normal ctermfg=None ctermbg=None
 hi NonText ctermfg=None ctermbg=None
 
 packadd termdebug
-let g:termdebug_wide=1
+let termdebug_wide=1
+
+filetype off
+set rtp+=$HOME/.vim/bundle/Vundle.vim/
+call vundle#begin()
+
+"Mandatory
+Plugin 'vundleVim/Vundle.vim'		"plugin Manager
+
+"Quality of life (any) 
+Plugin 'itchyny/lightline.vim'		"status bar
+Plugin 'kien/rainbow_parentheses.vim'	"Better Raimbow Parentheses
+Plugin 'mhinz/vim-startify'		"start screen 
+Plugin 'lilydjwg/colorizer'		"color hexcode
+Plugin 'jiangmiao/auto-pairs'		"auto Pair Brackets
+" Plugin 'Yggdroot/indentLine'		"show indent - bugging conceal
+Plugin 'szw/vim-maximizer'
+" Plugin 'preservim/nerdtree'		"Directory Visulaliser :Nerdtree
+Plugin 'junegunn/fzf', {'do': { -> fzf#install() }}
+Plugin 'junegunn/fzf.vim'
+Plugin 'junegunn/vim-peekaboo'		"see content of register before past for @ C-R and \"
+
+"useful in multiple languages
+Plugin 'SirVer/ultisnips'		"fast write
+Plugin 'honza/vim-snippets'		"lib of snips
+Plugin 'majutsushi/tagbar'		"display tagBar with :TagbarToggle
+" Plugin 'maralla/completor.vim'		"completion menu
+" Plugin 'tokorom/completor-shell'	"Add on of completor.vim for shell scripting
+Plugin 'tpope/vim-commentary'		"comment with <gcc>
+" Plugin 'dense-analysis/ale'		"Async error checker (test usefulness)
+Plugin 'puremourning/vimspector'	"Debugger
+
+Plugin 'ycm-core/YouCompleteMe'		"completion tool
+
+"git
+Plugin 'mhinz/vim-signify'		"git diff show
+Plugin 'tpope/vim-fugitive'		"for the :Git <command>
+
+"php
+" Plugin 'StanAngeloff/php.vim'		"php syntax
+" Plugin 'phpactor/phpactor'		"php auto-completion
+
+"python
+" Plugin 'python-mode/python-mode'	"A python IDE
+Plugin 'mitsuhiko/vim-jinja'
+
+"html/css
+Plugin 'mattn/emmet-vim'		"Fast http
+Plugin 'vim-scripts/loremipsum'		"ipsum generator :Loremipsum <word>
+Plugin 'tpope/vim-surround'		"Surround html tags
+Plugin 'sukima/xmledit'		"Edit XML and HTML
+
+"lua
+" Plugin 'wsdjeg/vim-lua'			"lua syntax
+
+"markdown
+Plugin 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }, 'for': ['markdown', 'vundle'] }
+
+"c & cpp
+Plugin 'bfrg/vim-cpp-modern'		"Extended vim syntax highlight c++
+Plugin 'a.vim'				"go from hpp to cpp with :A
+" Plugin 'xavierd/clang_complete'		"CLang Complete (don't work with ycm)
+" Plugin 'ctrlpvim/ctrlp.vim'		"ctrl p support
+Plugin 'cdelledonne/vim-cmake'
+
+"glsl (shader)
+Plugin 'tikhomirov/vim-glsl'
+
+"c sharp
+" Plugin 'OmniSharp/omnisharp-vim'
+
+"latex
+
+Plugin 'lervag/vimtex'
+Plugin 'gillescastel/latex-snippets'
+
+"uml
+Plugin 'weirongxu/plantuml-previewer.vim'
+Plugin 'tyru/open-browser.vim'
+Plugin 'aklt/plantuml-syntax'
+
+call vundle#end()
+
+filetype plugin indent on
+set omnifunc=syntaxcomplete#Complete

zsh/.zshrc

@@ -70,7 +70,6 @@ alias rofi="rofi -show combi"
 alias get_idf='source /opt/esp-idf/export.sh'
 alias open="xdg-open"
 alias sxiv=nsxiv
-alias :q=exit
 
 # Theming section  
 autoload -U compinit colors zcalc
@@ -175,12 +174,6 @@ source /usr/share/zsh/plugins/zsh-vi-mode/zsh-vi-mode.plugin.zsh
 zmodload zsh/terminfo
 # Enabling fzf capabilities
 source /usr/share/fzf/*.zsh
-
-source /opt/enhancd/init.sh
-source /usr/share/enhancd/init.sh
-export ENHANCD_ENABLE_DOUBLE_DOT=false
->>>>>>> origin/master
-
 bindkey "$terminfo[kcuu1]" history-substring-search-up
 bindkey "$terminfo[kcud1]" history-substring-search-down
 bindkey '^[[A' history-substring-search-up			
@@ -189,7 +182,8 @@ bindkey '^[[B' history-substring-search-down
 # Apply different settigns for different terminals
 case $(basename "$(cat "/proc/$PPID/comm")") in
   login)
-    	RPROMPT="%{$fg[red]%} %(?..[%?])" 
+		RPROMPT="%(?.%{$fg[green]%}✓ %{$reset_color%}.%{$fg[red]%}✗ %{$reset_color%})"
+    	# RPROMPT="%{$fg[red]%} %(?..[%?])" 
     	alias x='startx ~/.xinitrc'      # Type name of desired desktop after x, xinitrc is configured for it
     ;;
 #  'tmux: server')