Merge remote-tracking branch 'origin/master' into marynux
This commit is contained in:
commit
75e6358b38
99
.gitmodules
vendored
99
.gitmodules
vendored
@ -1,6 +1,99 @@
|
||||
[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
|
||||
|
@ -6,5 +6,6 @@ git
|
||||
picom
|
||||
polybar
|
||||
sxhkd
|
||||
tmux
|
||||
vim
|
||||
zathura
|
||||
|
@ -249,8 +249,10 @@ mod5 + @button1
|
||||
super + space
|
||||
dmenu_recent -i -l 14 -w 600 -y $PANEL_HEIGHT
|
||||
|
||||
# Enable notifications
|
||||
super + p
|
||||
st spt
|
||||
{pkill dunst --signal=USR1 ,\
|
||||
pkill dunst --signal=USR2 }
|
||||
|
||||
super + shift + Return
|
||||
st
|
||||
|
@ -1 +0,0 @@
|
||||
Subproject commit 0765c5c4f485fa111f190e2d7dd89ec9f5b3f554
|
1
vim/.vim/pack/autoload/start/YouCompleteMe
Submodule
1
vim/.vim/pack/autoload/start/YouCompleteMe
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 4556062839aa2e86f2f4f1c0b4532697d607af23
|
1
vim/.vim/pack/autoload/start/a.vim
Submodule
1
vim/.vim/pack/autoload/start/a.vim
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 2cbe946206ec622d9d8cf2c99317f204c4d41885
|
1
vim/.vim/pack/autoload/start/auto-pairs
Submodule
1
vim/.vim/pack/autoload/start/auto-pairs
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 39f06b873a8449af8ff6a3eee716d3da14d63a76
|
1
vim/.vim/pack/autoload/start/colorizer
Submodule
1
vim/.vim/pack/autoload/start/colorizer
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 72790a003d5a706c287486a1a81e3a6b32158b54
|
1
vim/.vim/pack/autoload/start/emmet-vim
Submodule
1
vim/.vim/pack/autoload/start/emmet-vim
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 3fb2f63799e1922f7647ed9ff3b32154031a76ee
|
1
vim/.vim/pack/autoload/start/fzf
Submodule
1
vim/.vim/pack/autoload/start/fzf
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 6de0a7ddc11dd9d4a2261e9642a99f3901e0ae27
|
1
vim/.vim/pack/autoload/start/fzf.vim
Submodule
1
vim/.vim/pack/autoload/start/fzf.vim
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 279e1ec068f526e985ee7e3f62a71f083bbe0196
|
1
vim/.vim/pack/autoload/start/latex-snippets
Submodule
1
vim/.vim/pack/autoload/start/latex-snippets
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 1e29f44c6fc0596dad1791fdf2c07d6da33fe27e
|
1
vim/.vim/pack/autoload/start/lightline.vim
Submodule
1
vim/.vim/pack/autoload/start/lightline.vim
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 58c97bc21c6f657d3babdd4eefce7593e30e75ce
|
1
vim/.vim/pack/autoload/start/loremipsum
Submodule
1
vim/.vim/pack/autoload/start/loremipsum
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 39354ae1c86c89bf36a4af7c6d4b9ca0c0a9eedf
|
@ -0,0 +1 @@
|
||||
Subproject commit a923f5fc5ba36a3b17e289dc35dc17f66d0548ee
|
1
vim/.vim/pack/autoload/start/open-browser.vim
Submodule
1
vim/.vim/pack/autoload/start/open-browser.vim
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 7d4c1d8198e889d513a030b5a83faa07606bac27
|
@ -0,0 +1 @@
|
||||
Subproject commit 1dd4d0f2b09cd80a217f76d82f93830dbbe689b3
|
1
vim/.vim/pack/autoload/start/plantuml-syntax
Submodule
1
vim/.vim/pack/autoload/start/plantuml-syntax
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 44054d6d2cbcf01a064858faa3364cd30d38057d
|
@ -0,0 +1 @@
|
||||
Subproject commit eb8baa5428bde10ecc1cb14eed1d6e16f5f24695
|
1
vim/.vim/pack/autoload/start/tagbar
Submodule
1
vim/.vim/pack/autoload/start/tagbar
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 0815b5455c792a610d28ff3e7981642c9cf05d62
|
1
vim/.vim/pack/autoload/start/ultisnips
Submodule
1
vim/.vim/pack/autoload/start/ultisnips
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 49dc8cb2086db19d385791c8e1635723b0fd95c7
|
1
vim/.vim/pack/autoload/start/unicode.vim
Submodule
1
vim/.vim/pack/autoload/start/unicode.vim
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit bc20d0fb3331a7b41708388c56bb8221c2104da7
|
1
vim/.vim/pack/autoload/start/vim-commentary
Submodule
1
vim/.vim/pack/autoload/start/vim-commentary
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit c4b8f52cbb7142ec239494e5a2c4a512f92c4d07
|
1
vim/.vim/pack/autoload/start/vim-cpp-modern
Submodule
1
vim/.vim/pack/autoload/start/vim-cpp-modern
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 1e6d2b52e34f222f79ecf523643a794f9079d7bd
|
1
vim/.vim/pack/autoload/start/vim-fugitive
Submodule
1
vim/.vim/pack/autoload/start/vim-fugitive
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 64d6cafb9dcbacce18c26d7daf617ebb96b273f3
|
1
vim/.vim/pack/autoload/start/vim-glsl
Submodule
1
vim/.vim/pack/autoload/start/vim-glsl
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 40dd0b143ef93f3930a8a409f60c1bb85e28b727
|
1
vim/.vim/pack/autoload/start/vim-jinja
Submodule
1
vim/.vim/pack/autoload/start/vim-jinja
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 8a8f0ed97c1751d304cf5b7241f2fe27b0e61f81
|
1
vim/.vim/pack/autoload/start/vim-maximizer
Submodule
1
vim/.vim/pack/autoload/start/vim-maximizer
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 2e54952fe91e140a2e69f35f22131219fcd9c5f1
|
1
vim/.vim/pack/autoload/start/vim-peekaboo
Submodule
1
vim/.vim/pack/autoload/start/vim-peekaboo
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit cc4469c204099c73dd7534531fa8ba271f704831
|
1
vim/.vim/pack/autoload/start/vim-signify
Submodule
1
vim/.vim/pack/autoload/start/vim-signify
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 8670143f9e12ed1cd3c9b2c54f345cdd9a4baac3
|
1
vim/.vim/pack/autoload/start/vim-snippets
Submodule
1
vim/.vim/pack/autoload/start/vim-snippets
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 96d79529edc3dee1ccf2ce7b75a88cb546ec2501
|
1
vim/.vim/pack/autoload/start/vim-startify
Submodule
1
vim/.vim/pack/autoload/start/vim-startify
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 4e089dffdad46f3f5593f34362d530e8fe823dcf
|
1
vim/.vim/pack/autoload/start/vim-surround
Submodule
1
vim/.vim/pack/autoload/start/vim-surround
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 3d188ed2113431cf8dac77be61b842acb64433d9
|
1
vim/.vim/pack/autoload/start/vimspector
Submodule
1
vim/.vim/pack/autoload/start/vimspector
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit ee3bd0120525978521168eda1c3a64ef24e3cb86
|
1
vim/.vim/pack/autoload/start/vimtex
Submodule
1
vim/.vim/pack/autoload/start/vimtex
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 8ed94566e6fe3f5b163131dc374d224d2d320db7
|
1
vim/.vim/pack/autoload/start/xmledit
Submodule
1
vim/.vim/pack/autoload/start/xmledit
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 6db863497f956ece4b0795fe19cb16d6c57f6543
|
104
vim/.vimrc
104
vim/.vimrc
@ -1,5 +1,3 @@
|
||||
autocmd FileType asm noremap <F12> <ESC>:execute 'silent !qtspim' expand('%::p')<CR>
|
||||
|
||||
nnoremap <C-p> :Buffers<CR>
|
||||
nnoremap <C-g> :Ag<CR>
|
||||
|
||||
@ -36,7 +34,7 @@ let g:vimtex_view_method = 'zathura'
|
||||
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>
|
||||
@ -82,6 +80,21 @@ let g:ycm_language_server = [
|
||||
\ '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"
|
||||
@ -109,6 +122,7 @@ set nu
|
||||
set rnu
|
||||
set scrolloff=10
|
||||
set shiftwidth=4
|
||||
set shortmess-=S
|
||||
set showcmd
|
||||
set spelllang+=fr
|
||||
set splitbelow splitright
|
||||
@ -121,87 +135,3 @@ hi NonText ctermfg=None ctermbg=None
|
||||
|
||||
packadd termdebug
|
||||
let g: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 \"
|
||||
Plugin 'chrisbra/unicode.vim'
|
||||
|
||||
"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 '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
|
||||
|
@ -70,6 +70,7 @@ 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
|
||||
@ -176,6 +177,9 @@ zmodload zsh/terminfo
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user