Merge remote-tracking branch 'origin/master' into marynux

.gitmodules

@@ -40,14 +40,14 @@
 [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/other/vim-commentary"]
+[submodule "vim/.vim/pack/autoload/start/vim-commentary"]
-	path = vim/.vim/pack/autoload/other/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/other/YouCompleteMe"]
+[submodule "vim/.vim/pack/autoload/start/YouCompleteMe"]
-	path = vim/.vim/pack/autoload/other/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
@@ -88,18 +88,12 @@
 [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/other/plantuml-previewer.vim"]
+[submodule "vim/.vim/pack/autoload/start/plantuml-previewer.vim"]
-	path = vim/.vim/pack/autoload/other/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/other/plantuml-syntax"]
+[submodule "vim/.vim/pack/autoload/start/plantuml-syntax"]
-	path = vim/.vim/pack/autoload/other/plantuml-syntax
+	path = vim/.vim/pack/autoload/start/plantuml-syntax
 	url = https://github.com/aklt/plantuml-syntax
-[submodule "vim/.vim/pack/autoload/start/vim-abolish"]
-	path = vim/.vim/pack/autoload/start/vim-abolish
-	url = https://github.com/tpope/vim-abolish
-[submodule "vim/.vim/pack/autoload/start/vim-textidote"]
-	path = vim/.vim/pack/autoload/start/vim-textidote
-	url = https://github.com/PatrBal/vim-textidote

bin/.bin/zoom_screen

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

bspwm/.config/bspwm/bspwmrc

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

dunst/.config/dunst/dunstrc

@@ -1,258 +0,0 @@
-[global]
-
-font =Fira Code 14
-
-# Allow a small subset of html markup:
-#   <b>bold</b>
-#   <i>italic</i>
-#   <s>strikethrough</s>
-#   <u>underline</u>
-#
-# For a complete reference see
-# <http://developer.gnome.org/pango/stable/PangoMarkupFormat.html>.
-# If markup is not allowed, those tags will be stripped out of the
-# message.
-markup = yes
-plain_text = no
-
-# The format of the message.  Possible variables are:
-#   %a  appname
-#   %s  summary
-#   %b  body
-#   %i  iconname (including its path)
-#   %I  iconname (without its path)
-#   %p  progress value if set ([  0%] to [100%]) or nothing
-# Markup is allowed
-format = "<b>%s</b>\n%b"
-
-# Sort messages by urgency.
-sort = no
-
-# Show how many messages are currently hidden (because of geometry).
-indicate_hidden = yes
-
-# Alignment of message text.
-# Possible values are "left", "center" and "right".
-alignment = center
-
-# The frequency with wich text that is longer than the notification
-# window allows bounces back and forth.
-# This option conflicts with "word_wrap".
-# Set to 0 to disable.
-bounce_freq = 0
-
-# Show age of message if message is older than show_age_threshold
-# seconds.
-# Set to -1 to disable.
-show_age_threshold = -1
-
-# Split notifications into multiple lines if they don't fit into
-# geometry.
-word_wrap = yes
-
-# Ignore newlines '\n' in notifications.
-ignore_newline = no
-
-# Hide duplicate's count and stack them
-stack_duplicates = yes
-hide_duplicates_count = yes
-
-
-# The geometry of the window:
-#   [{width}]x{height}[+/-{x}+/-{y}]
-# The geometry of the message window.
-# The height is measured in number of notifications everything else
-# in pixels.  If the width is omitted but the height is given
-# ("-geometry x2"), the message window expands over the whole screen
-# (dmenu-like).  If width is 0, the window expands to the longest
-# message displayed.  A positive x is measured from the left, a
-# negative from the right side of the screen.  Y is measured from
-# the top and down respectevly.
-# The width can be negative.  In this case the actual width is the
-# screen width minus the width defined in within the geometry option.
-#geometry = "250x50-40+40"
-geometry = "300x50-15+49"
-
-# Shrink window if it's smaller than the width.  Will be ignored if
-# width is 0.
-shrink = no
-
-# The transparency of the window.  Range: [0; 100].
-# This option will only work if a compositing windowmanager is
-# present (e.g. xcompmgr, compiz, etc.).
-transparency = 5 
-
-# Don't remove messages, if the user is idle (no mouse or keyboard input)
-# for longer than idle_threshold seconds.
-# Set to 0 to disable.
-idle_threshold = 0
-
-# Which monitor should the notifications be displayed on.
-monitor = 1
-
-# Display notification on focused monitor.  Possible modes are:
-#   mouse: follow mouse pointer
-#   keyboard: follow window with keyboard focus
-#   none: don't follow anything
-#
-# "keyboard" needs a windowmanager that exports the
-# _NET_ACTIVE_WINDOW property.
-# This should be the case for almost all modern windowmanagers.
-#
-# If this option is set to mouse or keyboard, the monitor option
-# will be ignored.
-follow = none
-
-# Should a notification popped up from history be sticky or timeout
-# as if it would normally do.
-sticky_history = yes
-
-# Maximum amount of notifications kept in history
-history_length = 15
-
-# Display indicators for URLs (U) and actions (A).
-show_indicators = no
-
-# The height of a single line.  If the height is smaller than the
-# font height, it will get raised to the font height.
-# This adds empty space above and under the text.
-line_height = 3
-
-# Draw a line of "separatpr_height" pixel height between two
-# notifications.
-# Set to 0 to disable.
-separator_height = 2
-
-# Padding between text and separator.
-padding = 6
-
-# Horizontal padding.
-horizontal_padding = 6
-
-# Define a color for the separator.
-# possible values are:
-#  * auto: dunst tries to find a color fitting to the background;
-#  * foreground: use the same color as the foreground;
-#  * frame: use the same color as the frame;
-#  * anything else will be interpreted as a X color.
-separator_color = auto
-
-# Print a notification on startup.
-# This is mainly for error detection, since dbus (re-)starts dunst
-# automatically after a crash.
-startup_notification = false
-
-# dmenu path.
-dmenu = /usr/bin/dmenu -p dunst:
-
-# Browser for opening urls in context menu.
-browser = /usr/bin/qutebrowser -t 
-
-# Align icons left/right/off
-icon_position = off
-max_icon_size = 80
-
-# Paths to default icons.
-icon_path = /usr/share/icons/Paper/16x16/mimetypes/:/usr/share/icons/Paper/48x48/status/:/usr/share/icons/Paper/16x16/devices/:/usr/share/icons/Paper/48x48/notifications/:/usr/share/icons/Paper/48x48/emblems/
-
-frame_width = 1
-frame_color = "#8EC07C"
-
-[shortcuts]
-
-# Shortcuts are specified as [modifier+][modifier+]...key
-# Available modifiers are "ctrl", "mod1" (the alt-key), "mod2",
-# "mod3" and "mod4" (windows-key).
-# Xev might be helpful to find names for keys.
-
-# Close notification.
-close = ctrl+space
-
-# Close all notifications.
-close_all = ctrl+shift+space
-
-# Redisplay last message(s).
-# On the US keyboard layout "grave" is normally above TAB and left
-# of "1".
-history = ctrl+grave
-
-# Context menu.
-context = ctrl+shift+period
-
-[urgency_low]
-# IMPORTANT: colors have to be defined in quotation marks.
-# Otherwise the "#" and following would be interpreted as a comment.
-frame_color = "#3B7C87"
-foreground = "#3B7C87"
-background = "#191311"
-#background = "#2B313C"
-timeout = 4
-
-[urgency_normal]
-frame_color = "#5B8234"
-foreground = "#5B8234"
-background = "#191311"
-#background = "#2B313C"
-timeout = 6
-
-[urgency_critical]
-frame_color = "#B7472A"
-foreground = "#B7472A"
-background = "#191311"
-#background = "#2B313C"
-timeout = 8
-
-
-# Every section that isn't one of the above is interpreted as a rules to
-# override settings for certain messages.
-# Messages can be matched by "appname", "summary", "body", "icon", "category",
-# "msg_urgency" and you can override the "timeout", "urgency", "foreground",
-# "background", "new_icon" and "format".
-# Shell-like globbing will get expanded.
-#
-# SCRIPTING
-# You can specify a script that gets run when the rule matches by
-# setting the "script" option.
-# The script will be called as follows:
-#   script appname summary body icon urgency
-# where urgency can be "LOW", "NORMAL" or "CRITICAL".
-#
-# NOTE: if you don't want a notification to be displayed, set the format
-# to "".
-# NOTE: It might be helpful to run dunst -print in a terminal in order
-# to find fitting options for rules.
-
-#[espeak]
-#    summary = "*"
-#    script = dunst_espeak.sh
-
-#[script-test]
-#    summary = "*script*"
-#    script = dunst_test.sh
-
-#[ignore]
-#    # This notification will not be displayed
-#    summary = "foobar"
-#    format = ""
-
-#[signed_on]
-#    appname = Pidgin
-#    summary = "*signed on*"
-#    urgency = low
-#
-#[signed_off]
-#    appname = Pidgin
-#    summary = *signed off*
-#    urgency = low
-#
-#[says]
-#    appname = Pidgin
-#    summary = *says*
-#    urgency = critical
-#
-#[twitter]
-#    appname = Pidgin
-#    summary = *twitter.com*
-#    urgency = normal
-#
-# vim: ft=cfg

nvim/.config/nvim/after/ftplugin/c.lua

@@ -1,5 +0,0 @@
-vim.lsp.start({
-	name = 'clangd',
-	cmd = {'clangd'},
-	-- root_dir = vim.fs.root(args.buf, {'Makefile'})
-})

nvim/.config/nvim/after/ftplugin/cmake.lua

@@ -1,4 +0,0 @@
-vim.lsp.start({
-	name = 'cmake-language-server',
-	cmd = {'cmake-language-server'},
-})

nvim/.config/nvim/after/ftplugin/lua.lua

@@ -1,4 +0,0 @@
-vim.lsp.start({
-	name = 'lua-language-server',
-	cmd = {'lua-language-server'},
-})

nvim/.config/nvim/after/ftplugin/python.lua

@@ -1,4 +0,0 @@
-vim.lsp.start({
-	name = 'jedi',
-	cmd = {'jedi-language-server'},
-})

nvim/.config/nvim/after/ftplugin/sh.lua

@@ -1,4 +0,0 @@
-vim.lsp.start({
-	name = 'bash-language-server',
-	cmd = {'bash-language-server'},
-})

nvim/.config/nvim/after/ftplugin/tex.lua

@@ -1,4 +0,0 @@
-vim.lsp.start({
-	name = 'texlab',
-	cmd = {'texlab'},
-})

nvim/.config/nvim/compiler/esp.lua

@@ -1,5 +0,0 @@
-vim.lsp.stop_client(vim.lsp.get_clients())
-vim.lsp.start({
-	name = 'clangd',
-	cmd = {'/home/tonitch/Documents/aur/llvm-espressif/src/esp-clang/bin/clangd', "--query-driver=/home/tonitch/.espressif/tools/xtensa-esp32s3-elf/esp-12.2.0_20230208/**/bin/xtensa-esp32-elf-*"},
-})

nvim/.config/nvim/init.vim

@@ -1,4 +0,0 @@
-set runtimepath^=~/.vim runtimepath+=~/.vim/after
-let &packpath = &runtimepath
-let g:python3_host_prog="/usr/bin/python"
-source ~/.vimrc

nvim/.config/nvim/plugin/configs.lua

@@ -1,3 +0,0 @@
-vim.g.vimtex_view_method="zathura"
-vim.opt.completeopt="menu,popup,noinsert,noselect"
-vim.g.python3_host_prog="/bin/python"

nvim/.config/nvim/plugin/lsp.lua

@@ -1,24 +0,0 @@
---- Default maps for LSP functions.
----
---- These are mapped unconditionally to avoid different behavior depending on whether an LSP
---- client is attached. If no client is attached, or if a server does not support a capability, an
---- error message is displayed rather than exhibiting different behavior.
----
---- See |grr|, |grn|, |gra|, |i_CTRL-S|.
-do
-  vim.keymap.set('n', 'grn', function()
-    vim.lsp.buf.rename()
-  end, { desc = 'vim.lsp.buf.rename()' })
-
-  vim.keymap.set({ 'n', 'x' }, 'gra', function()
-    vim.lsp.buf.code_action()
-  end, { desc = 'vim.lsp.buf.code_action()' })
-
-  vim.keymap.set('n', 'grr', function()
-    vim.lsp.buf.references()
-  end, { desc = 'vim.lsp.buf.references()' })
-
-  vim.keymap.set('i', '<C-S>', function()
-    vim.lsp.buf.signature_help()
-  end, { desc = 'vim.lsp.buf.signature_help()' })
-end

nvim/.config/nvim/plugin/lsp.vim

@@ -1,7 +0,0 @@
-function! OpenCompletion()
-    if !pumvisible() && ((v:char >= 'a' && v:char <= 'z') || (v:char >= 'A' && v:char <= 'Z')) 
-        call feedkeys("\<C-x>\<C-o>", "n")
-    endif
-endfunction
-
-autocmd InsertCharPre * if &omnifunc != "" | call OpenCompletion() | endif

polybar/.config/polybar/config

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

stowed.list

@@ -1,10 +1,8 @@
 bin
 bspwm
 dmenu
-dunst
 feh
 git
-nvim
 picom
 polybar
 sxhkd

sxhkd/.config/sxhkd/sxhkdrc

@@ -1,8 +1,8 @@
 # bspwm hotkeys
 #
 # Cleanly quit bspwm
-super + shift + q
+super + shift + a
-	bspc quit 1 
+	bspc quit 1 && pkill lemonpanel && pkill lemonbar
 
 # 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 + }{1,2,3,4,5,6,7,8,9,0}
+super + {_,shift + }{ampersand,eacute,quotedbl,apostrophe,parenleft,section,egrave,exclam,ccedilla,agrave}
     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 + {a,s,w,d}
+super + {q,s,z,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,w,d}
+super + shift + {q,s,z,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 + {a,s,w,d}
+super + ctrl + {q,s,z,d}
 	bspwm_resize.sh {west,south,north,east}
 
 super + ctrl + {h,j,k,l}
@@ -334,9 +334,6 @@ 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

vim/.vim/UltiSnips/cmake.snippets

@@ -1,18 +0,0 @@
-snippet base "Cmake Init" b
-cmake_minimum_required(VERSION ${1:3.12})
-project(${2:${VISUAL:project}})
-
-# Generate compile_commands.json
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-
-# Dependencies
-# find_package(package 0.0.1 REQUIRED)
-
-# Project configurations
-add_executable(${PROJECT_NAME})
-add_subdirectory(src)
-
-# target_link_libraries(${PROJECT_NAME} package)
-
-endsnippet
-

vim/.vim/UltiSnips/glsl.snippets

@@ -1,20 +0,0 @@
-snippet basev "base for vertex shader"
-#version ${1:${VISUAL:420}} core
-
-layout (location = 0) in vec3 aPos;
-
-void main(){
-	gl_Position = vec4(aPos, 1.0);
-	$0
-}
-endsnippet
-
-snippet basef "base for fragment shader"
-#version ${1:${VISUAL:420}} core
-
-out vec4 FragColor;
-
-void main(){
-	FragColor = vec4(1.0, 0.0, 0.0, 1.0);
-}
-endsnippet

vim/.vim/UltiSnips/java.snippets

@@ -1,10 +0,0 @@
-snippet sign "Header of vue file" b
-/******************************************************
- * @file `!p snip.rv = fn`
- * @author `git config --global --get user.name`
- * @scope ${1:Extension messagerie}
- *
- * $2
- ******************************************************/
-$0
-endsnippet

vim/.vim/UltiSnips/javascript.snippets

@@ -1,10 +0,0 @@
-snippet sign "sign your work" b
-/*******************************************************
- * File: `!p snip.rv = fn`
- * Author: `git config --global --get user.name`
- * Scope: ${1:Extension messagerie}
- * Description: $2
- *******************************************************/
-
-$0
-endsnippet

vim/.vim/UltiSnips/tex.snippets

@@ -4,9 +4,7 @@ snippet base "Description" b
 \usepackage[utf8]{inputenc}
 \usepackage[T1]{fontenc}
 \usepackage[french]{babel}
-\usepackage[pdftex]{graphicx}
 \usepackage{amsmath, amsfonts, amssymb, amsthm}
-\usepackage{fullpage}
 
 \title{${2:${VISUAL:Titre}}}
 \author{${3:${VISUAL:Debucquoy Anthony}}}
@@ -19,12 +17,3 @@ $0
 
 \end{document}
 endsnippet
-
-snippet bb "mathbb" i
-\mathbb{${1:${VISUAL:R}}} $0
-endsnippet
-
-priority -9999999
-snippet "(\w+)" "latex default" r
-\\`!p snip.rv = match.group(1)` $1
-endsnippet

vim/.vim/UltiSnips/vue.snippets

@@ -1,25 +0,0 @@
-snippet sign "Header of vue file"
-
-<!----------------------------------------------------
-	File: `!p snip.rv = fn` 
-	Author: `git config --global --get user.name` 
-	Scope: ${1:Extension messagerie}
-	Description: $2
------------------------------------------------------>
-
-$0
-endsnippet
-
-snippet basev "vue base"
-	<script setup>
-		$0
-	</script>
-
-	<template>
-
-	</template>
-
-	<style scoped>
-
-	</style>
-endsnippet

vim/.vim/compiler/bff.vim

@@ -1 +0,0 @@
-let &makeprg="bff %"

vim/.vim/compiler/gradle.vim

@@ -1,24 +0,0 @@
-" Vim Compiler File
-" Compiler: gradlew
-
-if exists("current_compiler")
-    finish
-endif
-let current_compiler = "gradlew"
-
-if exists(":CompilerSet") != 2 " older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
-CompilerSet makeprg=$PWD/gradlew
-
-CompilerSet errorformat=
-    \%E[ant:scalac]\ %f:%l:\ error:\ %m,
-    \%W[ant:scalac]\ %f:%l:\ warning:\ %m,
-    \%E%.%#:compile%\\w%#Java%f:%l:\ error:\ %m,%-Z%p^,%-C%.%#,
-    \%W%.%#:compile%\\w%#Java%f:%l:\ warning:\ %m,%-Z%p^,%-C%.%#,
-    \%E%f:%l:\ error:\ %m,%-Z%p^,%-C%.%#,
-    \%W%f:%l:\ warning:\ %m,%-Z%p^,%-C%.%#,
-    \%E%f:\ %\\d%\\+:\ %m\ @\ line\ %l\\,\ column\ %c.,%-C%.%#,%Z%p^,
-    \%E%>%f:\ %\\d%\\+:\ %m,%C\ @\ line\ %l\\,\ column\ %c.,%-C%.%#,%Z%p^,
-    \%-G%.%#"

vim/.vim/ftplugin/java.vim

@@ -1,2 +0,0 @@
-nnoremap K :YcmCompleter GetDoc<CR> 
-" let $JAVA_TOOL_OPTIONS = '-javaagent:/usr/share/lombok-common/lombok-api.jar -Xbootclasspath/p:/usr/share/lombok-common/lombok-api.jar'

vim/.vim/ftplugin/markdown.vim

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

vim/.vim/ftplugin/tex.vim

@@ -1,5 +1,4 @@
 set concealcursor=""
-set textwidth=100
 
 highlight Conceal ctermfg=red
 

vim/.vim/syntax/nim.vim

@@ -1,205 +0,0 @@
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if v:version < 600
-  syntax clear
-elseif exists('b:current_syntax')
-  finish
-endif
-
-" Keep user-supplied options
-if !exists('nim_highlight_numbers')
-  let nim_highlight_numbers = 1
-endif
-if !exists('nim_highlight_builtins')
-  let nim_highlight_builtins = 1
-endif
-if !exists('nim_highlight_exceptions')
-  let nim_highlight_exceptions = 1
-endif
-if !exists('nim_highlight_space_errors')
-  let nim_highlight_space_errors = 1
-endif
-if !exists('nim_highlight_special_vars')
-  let nim_highlight_special_vars = 1
-endif
-
-if exists('nim_highlight_all')
-  let nim_highlight_numbers      = 1
-  let nim_highlight_builtins     = 1
-  let nim_highlight_exceptions   = 1
-  let nim_highlight_space_errors = 1
-  let nim_highlight_special_vars = 1
-endif
-
-syn region nimBrackets       contained extend keepend matchgroup=Bold start=+\(\\\)\@<!\[+ end=+]\|$+ skip=+\\\s*$\|\(\\\)\@<!\\]+ contains=@tclCommandCluster
-
-syn keyword nimKeyword       addr and as asm atomic
-syn keyword nimKeyword       bind block break
-syn keyword nimKeyword       case cast concept const continue converter
-syn keyword nimKeyword       defer discard distinct div do
-syn keyword nimKeyword       elif else end enum except export
-syn keyword nimKeyword       finally for from
-syn keyword nimKeyword       generic
-syn keyword nimKeyword       if import in include interface is isnot iterator
-syn keyword nimKeyword       let
-syn keyword nimKeyword       mixin using mod
-syn keyword nimKeyword       nil not notin
-syn keyword nimKeyword       object of or out
-syn keyword nimKeyword       proc func method macro template nextgroup=nimFunction skipwhite
-syn keyword nimKeyword       ptr
-syn keyword nimKeyword       raise ref return
-syn keyword nimKeyword       shared shl shr static
-syn keyword nimKeyword       try tuple type
-syn keyword nimKeyword       var vtref vtptr
-syn keyword nimKeyword       when while with without
-syn keyword nimKeyword       xor
-syn keyword nimKeyword       yield
-
-syn match   nimFunction      "[a-zA-Z_][a-zA-Z0-9_]*" contained
-syn match   nimClass         "[a-zA-Z_][a-zA-Z0-9_]*" contained
-syn keyword nimRepeat        for while
-syn keyword nimConditional   if elif else case of
-syn keyword nimOperator      and in is not or xor shl shr div
-syn match   nimComment       "#.*$" contains=nimTodo,@Spell
-syn region  nimComment       start="#\[" end="\]#" contains=nimTodo,@Spell
-syn keyword nimTodo          TODO FIXME XXX contained
-syn keyword nimBoolean       true false
-
-
-" Strings
-syn region nimString start=+'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=nimEscape,nimEscapeError,@Spell
-syn region nimString start=+"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=nimEscape,nimEscapeError,@Spell
-syn region nimString start=+"""+ end=+"""+ keepend contains=nimEscape,nimEscapeError,@Spell
-syn region nimRawString matchgroup=Normal start=+[rR]"+ end=+"+ skip=+\\\\\|\\"+ contains=@Spell
-
-syn match  nimEscape		+\\[abfnrtv'"\\]+ contained
-syn match  nimEscape		"\\\o\{1,3}" contained
-syn match  nimEscape		"\\x\x\{2}" contained
-syn match  nimEscape		"\(\\u\x\{4}\|\\U\x\{8}\)" contained
-syn match  nimEscape		"\\$"
-
-syn match nimEscapeError "\\x\x\=\X" display contained
-
-if nim_highlight_numbers == 1
-  " numbers (including longs and complex)
-  let s:dec_num = '\d%(_?\d)*'
-  let s:int_suf = '%(''%(%(i|I|u|U)%(8|16|32|64)|u|U))'
-  let s:float_suf = '%(''%(%(f|F)%(32|64|128)?|d|D))'
-  let s:exp = '%([eE][+-]?'.s:dec_num.')'
-  exe 'syn match nimNumber /\v<0[bB][01]%(_?[01])*%('.s:int_suf.'|'.s:float_suf.')?>/'
-  exe 'syn match nimNumber /\v<0[ocC]\o%(_?\o)*%('.s:int_suf.'|'.s:float_suf.')?>/'
-  exe 'syn match nimNumber /\v<0[xX]\x%(_?\x)*%('.s:int_suf.'|'.s:float_suf.')?>/'
-  exe 'syn match nimNumber /\v<'.s:dec_num.'%('.s:int_suf.'|'.s:exp.'?'.s:float_suf.'?)>/'
-  exe 'syn match nimNumber /\v<'.s:dec_num.'\.'.s:dec_num.s:exp.'?'.s:float_suf.'?>/'
-  unlet s:dec_num s:int_suf s:float_suf s:exp
-endif
-
-if nim_highlight_builtins == 1
-  " builtin functions, types and objects, not really part of the syntax
-  syn keyword nimBuiltin int int8 int16 int32 int64 uint uint8 uint16 uint32 uint64 float float32 float64
-  syn keyword nimBuiltin bool void chr char string cstring pointer range array openarray openArray seq varargs varArgs
-  syn keyword nimBuiltin set Byte Natural Positive Conversion
-  syn keyword nimBuiltin BiggestInt BiggestFloat cchar cschar cshort cint csize cuchar cushort
-  syn keyword nimBuiltin clong clonglong cfloat cdouble clongdouble cuint culong culonglong cchar
-  syn keyword nimBuiltin CompileDate CompileTime nimversion nimVersion nimmajor nimMajor
-  syn keyword nimBuiltin nimminor nimMinor nimpatch nimPatch cpuendian cpuEndian hostos hostOS hostcpu hostCPU inf
-  syn keyword nimBuiltin neginf nan QuitSuccess QuitFailure dbglinehook dbgLineHook stdin
-  syn keyword nimBuiltin stdout stderr defined new high low sizeof succ pred
-  syn keyword nimBuiltin inc dec newseq newSeq len incl excl card ord chr ze ze64
-  syn keyword nimBuiltin tou8 toU8 tou16 toU16 tou32 toU32 abs min max add repr
-  syn match   nimBuiltin "\<contains\>"
-  syn keyword nimBuiltin tofloat toFloat tobiggestfloat toBiggestFloat toint toInt tobiggestint toBiggestInt
-  syn keyword nimBuiltin addquitproc addQuitProc
-  syn keyword nimBuiltin copy setlen setLen newstring newString zeromem zeroMem copymem copyMem movemem moveMem
-  syn keyword nimBuiltin equalmem equalMem alloc alloc0 realloc dealloc assert
-  syn keyword nimBuiltin typedesc typed untyped stmt expr
-  syn keyword nimBuiltin echo swap getrefcount getRefcount getcurrentexception getCurrentException Msg
-  syn keyword nimBuiltin getoccupiedmem getOccupiedMem getfreemem getFreeMem gettotalmem getTotalMem isnil isNil seqtoptr seqToPtr
-  syn keyword nimBuiltin find pop GC_disable GC_enable GC_fullCollect
-  syn keyword nimBuiltin GC_setStrategy GC_enableMarkAndSweep GC_Strategy
-  syn keyword nimBuiltin GC_disableMarkAnd Sweep GC_getStatistics GC_ref
-  syn keyword nimBuiltin GC_ref GC_ref GC_unref GC_unref GC_unref quit
-  syn keyword nimBuiltin OpenFile OpenFile CloseFile EndOfFile readChar
-  syn keyword nimBuiltin FlushFile readfile readFile readline readLine write writeln writeLn writeline writeLine
-  syn keyword nimBuiltin getfilesize getFileSize ReadBytes ReadChars readbuffer readBuffer writebytes writeBytes
-  syn keyword nimBuiltin writechars writeChars writebuffer writeBuffer setfilepos setFilePos getfilepos getFilePos
-  syn keyword nimBuiltin filehandle fileHandle countdown countup items lines
-  syn keyword nimBuiltin FileMode File RootObj FileHandle ByteAddress Endianness
-endif
-
-if nim_highlight_exceptions == 1
-  " builtin exceptions and warnings
-  syn keyword nimException E_Base EAsynch ESynch ESystem EIO EOS
-  syn keyword nimException ERessourceExhausted EArithmetic EDivByZero
-  syn keyword nimException EOverflow EAccessViolation EAssertionFailed
-  syn keyword nimException EControlC EInvalidValue EOutOfMemory EInvalidIndex
-  syn keyword nimException EInvalidField EOutOfRange EStackOverflow
-  syn keyword nimException ENoExceptionToReraise EInvalidObjectAssignment
-  syn keyword nimException EInvalidObject EInvalidLibrary EInvalidKey
-  syn keyword nimException EInvalidObjectConversion EFloatingPoint
-  syn keyword nimException EFloatInvalidOp EFloatDivByZero EFloatOverflow
-  syn keyword nimException EFloatInexact EDeadThread EResourceExhausted
-  syn keyword nimException EFloatUnderflow
-endif
-
-if nim_highlight_space_errors == 1
-  " trailing whitespace
-  syn match   nimSpaceError   display excludenl "\S\s\+$"ms=s+1
-  " any tabs are illegal in nim
-  syn match   nimSpaceError   display "\t"
-endif
-
-if nim_highlight_special_vars
-  syn keyword nimSpecialVar result
-endif
-
-syn sync match nimSync grouphere NONE "):$"
-syn sync maxlines=200
-syn sync minlines=2000
-
-if v:version >= 508 || !exists('did_nim_syn_inits')
-  if v:version <= 508
-    let did_nim_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  " The default methods for highlighting.  Can be overridden later
-  HiLink nimBrackets       Operator
-  HiLink nimKeyword	      Keyword
-  HiLink nimFunction	    	Function
-  HiLink nimConditional	  Conditional
-  HiLink nimRepeat		      Repeat
-  HiLink nimString		      String
-  HiLink nimRawString	    String
-  HiLink nimBoolean        Boolean
-  HiLink nimEscape		      Special
-  HiLink nimOperator		    Operator
-  HiLink nimPreCondit	    PreCondit
-  HiLink nimComment		    Comment
-  HiLink nimTodo		        Todo
-  HiLink nimDecorator	    Define
-  HiLink nimSpecialVar	    Identifier
-  
-  if nim_highlight_numbers == 1
-    HiLink nimNumber	Number
-  endif
-  
-  if nim_highlight_builtins == 1
-    HiLink nimBuiltin	Number
-  endif
-  
-  if nim_highlight_exceptions == 1
-    HiLink nimException	Exception
-  endif
-  
-  if nim_highlight_space_errors == 1
-    HiLink nimSpaceError	Error
-  endif
-
-  delcommand HiLink
-endif
-
-let b:current_syntax = 'nim'
-

vim/.vim/ycm_extra_conf.py

@@ -1,19 +1,20 @@
 import os
 
 PATH_TO_LOMBOK = os.path.expanduser("/usr/lib/lombok-common/lombok.jar")
-jdtls_args = ['-Xmx1G',
+# jdtls_args = ['-noverify',
-              '-XX:+UseG1GC',
+#               '-Xmx1G',
-              '-XX:+UseStringDeduplication']
+#               '-XX:+UseG1GC',
+#               '-XX:+UseStringDeduplication']
 
-# def Settings( **kwargs ):
+def Settings( **kwargs ):
-#     if not os.path.exists(PATH_TO_LOMBOK):
+    if not os.path.exists(PATH_TO_LOMBOK):
-#         raise RuntimeError("Didn't find lombok jar")
+        raise RuntimeError("Didn't find lombok jar")
-#     if kwargs['language'] == 'java':
+    if kwargs['language'] == 'java':
-#         return {
+        return {
-#             'server': {
+            'server': {
-#                 'jvm_args': [
+                'jvm_args': [
-#                     '-javaagent:' + PATH_TO_LOMBOK,
+                    '-javaagent:' + PATH_TO_LOMBOK,
-#                     '-Xbootclasspath/a:' + PATH_TO_LOMBOK
+                    '-Xbootclasspath/a:' + PATH_TO_LOMBOK
-#                     ] + jdtls_args
+                    ]
-#             }
+            }
-#         }
+        }

vim/.vimrc

@@ -1,26 +1,5 @@
 nnoremap <C-p> :Buffers<CR>
 nnoremap <C-g> :Ag<CR>
-map gf :e <cfile><CR>
-
-"FZF Buffer Delete
-
-function! s:list_buffers()
-  redir => list
-  silent ls
-  redir END
-  return split(list, "\n")
-endfunction
-
-function! s:delete_buffers(lines)
-  execute 'bwipeout' join(map(a:lines, {_, line -> split(line)[0]}))
-endfunction
-
-
-command! BD call fzf#run(fzf#wrap({
-  \ 'source': s:list_buffers(),
-  \ 'sink*': { lines -> s:delete_buffers(lines) },
-  \ 'options': '--multi --reverse --bind ctrl-a:select-all+accept'
-\ }))
 
 "alt g to :Gfiles (if in git folder) else :Files
 function! GFilesFallback()
@@ -37,7 +16,6 @@ execute "set <M-g>=\eg"
 nnoremap <M-g> :call GFilesFallback()<CR>
 
 nnoremap <leader><CR> :vert term<CR>
-nnoremap <leader>z :MaximizerToggle<CR>
 
 let g:netrw_keepdir=0
 let g:netrw_banner=0
@@ -53,17 +31,19 @@ let g:vimtex_grammar_textidote = {'jar': '/usr/share/java/textidote.jar'}
 
 let g:vimtex_view_method = 'zathura'
 
-" nnoremap gd :YcmCompleter GoToDefinition<CR>
+nnoremap gd :YcmCompleter GoToDefinition<CR>
-" nnoremap gr :YcmCompleter GoToReferences<CR>
+nnoremap gr :YcmCompleter GoToReferences<CR>
-" nnoremap K :YcmCompleter GetDoc<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>
 
 "Documentation
-" nnoremap K :execute 'vert term' &keywordprg '<cexpr>'<cr>
+nnoremap K :execute 'vert term' &keywordprg '<cexpr>'<cr>
 command Curl :execute 'vert term lynx -dump' escape(@+, '#')
 command OpenLink :silent w !urlscan
 
@@ -101,11 +81,6 @@ let g:ycm_language_server = [
 			\ 	'filetypes': ['tex'],
 			\ 	},
 			\	{
-			\ 	'name': 'vue',
-			\ 	'cmdline': [ 'vue-language-server', '--stdio' ],
-			\ 	'filetypes': ['vue'],
-			\ 	},
-			\	{
 			\	'name': 'godot',
 			\	'filetypes': ['gdscript'],
 			\	'port': 6008,
@@ -147,20 +122,16 @@ set nu
 set rnu
 set scrolloff=10
 set shiftwidth=4
-set shortmess=atToOs
+set shortmess-=S
 set showcmd
 set spelllang+=fr
 set splitbelow splitright
 set tabstop=4
-
+set ttymouse=xterm2
-if !has('nvim')
-	set ttymouse=xterm2
-endif
 
 color desert 
 hi Normal ctermfg=None ctermbg=None
 hi NonText ctermfg=None ctermbg=None
 
-" packadd termdebug
+packadd termdebug
 let g:termdebug_wide=1
-filetype plugin indent on

zsh/.zshrc

@@ -71,7 +71,6 @@ alias get_idf='source /opt/esp-idf/export.sh'
 alias open="xdg-open"
 alias sxiv=nsxiv
 alias :q=exit
-alias vim=nvim
 
 # Theming section  
 autoload -U compinit colors zcalc
@@ -177,8 +176,10 @@ 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
@@ -188,8 +189,7 @@ bindkey '^[[B' history-substring-search-down
 # Apply different settigns for different terminals
 case $(basename "$(cat "/proc/$PPID/comm")") in
   login)
-		RPROMPT="%(?.%{$fg[green]%}✓ %{$reset_color%}.%{$fg[red]%}✗ %{$reset_color%})"
+    	RPROMPT="%{$fg[red]%} %(?..[%?])" 
-    	# RPROMPT="%{$fg[red]%} %(?..[%?])" 
     	alias x='startx ~/.xinitrc'      # Type name of desired desktop after x, xinitrc is configured for it
     ;;
 #  'tmux: server')