.config/fish/config.fish

@@ -372,480 +372,206 @@ alias emacs="emacsclient -c -a 'emacs'"
 # source ~/.asdf/asdf.fish
 # opam configuration ----------------------------------------------------------
 source /home/alexander/.opam/opam-init/init.fish >/dev/null 2>/dev/null; or true
-
-# # Icons for lf file manager ---------------------------------------------------
-# set LF_ICONS "\
-# fi=:\
-# di=:\
-# ln=:\
-# pi=|:\
-# so=ﯲ:\
-# db=:\
-# cd=c:\
-# or=:\
-# su=:\
-# sg=:\
-# tw=:\
-# ow=w:\
-# st=:\
-# ex=:\
-# *.7z=:\
-# *.a=:\
-# *.aac=:\
-# *.ace=:\
-# *.ai=:\
-# *.alz=:\
-# *.apk=:\
-# *.arc=:\
-# *.arj=:\
-# *.asf=:\
-# *.asm=:\
-# *.asp=:\
-# *.au=:\
-# *.aup=:\
-# *.avi=:\
-# *.avi=:\
-# *.awk=:\
-# *.bash=:\
-# *.bat=:\
-# *.bmp=:\
-# *.bz2=:\
-# *.bz=:\
-# *.c++=:\
-# *.c=:\
-# *.cab=:\
-# *.cbr=:\
-# *.cbz=:\
-# *.cc=:\
-# *.cgm=:\
-# *.class=:\
-# *.clj=:\
-# *.cljc=:\
-# *.cljs=:\
-# *.cmake=:\
-# *.cmd=:\
-# *.coffee=:\
-# *.conf=:\
-# *.cp=:\
-# *.cpio=:\
-# *.cpp=:\
-# *.cs=:\
-# *.css=:\
-# *.cue=:\
-# *.csh=:\
-# *.cvs=:\
-# *.cxx=:\
-# *.d=:\
-# *.dart=:\
-# *.db=:\
-# *.deb=:\
-# *.diff=:\
-# *.dl=:\
-# *.dll=:\
-# *.doc=:\
-# *.docx=:\
-# *.dump=:\
-# *.dwm=:\
-# *.dz=:\
-# *.ear=:\
-# *.edn=:\
-# *.eex=:\
-# *.efi=:\
-# *.ejs=:\
-# *.elf=:\
-# *.elm=:\
-# *.emf=:\
-# *.epub=:\
-# *.erl=:\
-# *.esd=:\
-# *.ex=:\
-# *.exe=:\
-# *.exs=:\
-# *.f#=:\
-# *.fifo=|:\
-# *.fish=:\
-# *.flac=:\
-# *.flc=:\
-# *.fli=:\
-# *.flv=:\
-# *.flv=:\
-# *.fs=:\
-# *.fsi=:\
-# *.fsscript=:\
-# *.fsx=:\
-# *.gem=:\
-# *.gif=:\
-# *.git=:\
-# *.gl=:\
-# *.go=:\
-# *.gz=:\
-# *.gzip=:\
-# *.h=:\
-# *.hbs=:\
-# *.hh=:\
-# *.hpp=:\
-# *.hrl=:\
-# *.hs=:\
-# *.htaccess=:\
-# *.htm=:\
-# *.html=:\
-# *.htpasswd=:\
-# *.ico=:\
-# *.img=:\
-# *.ini=:\
-# *.iso=:\
-# *.jar=:\
-# *.java=:\
-# *.jl=:\
-# *.jpeg=:\
-# *.jpg=:\
-# *.js=:\
-# *.json=:\
-# *.jsx=:\
-# *.key=:\
-# *.ksh=:\
-# *.less=:\
-# *.lha=:\
-# *.lhs=:\
-# *.log=:\
-# *.lrz=:\
-# *.lua=:\
-# *.lz4=:\
-# *.lz=:\
-# *.lzh=:\
-# *.lzma=:\
-# *.lzo=:\
-# *.m2v=:\
-# *.m4a=:\
-# *.m4v=:\
-# *.markdown=:\
-# *.md=:\
-# *.mid=:\
-# *.midi=:\
-# *.mjpeg=:\
-# *.mjpg=:\
-# *.mka=:\
-# *.mkv=:\
-# *.ml=λ:\
-# *.mli=λ:\
-# *.mng=:\
-# *.mov=:\
-# *.mp3=:\
-# *.mp4=:\
-# *.mp4v=:\
-# *.mpc=:\
-# *.mpeg=:\
-# *.mpg=:\
-# *.msi=:\
-# *.mustache=:\
-# *.nix=:\
-# *.nuv=:\
-# *.o=:\
-# *.oga=:\
-# *.ogg=:\
-# *.ogm=:\
-# *.ogv=:\
-# *.ogx=:\
-# *.opus=:\
-# *.pbm=:\
-# *.pcx=:\
-# *.pdf=:\
-# *.pgm=:\
-# *.php=:\
-# *.pl=:\
-# *.pm=:\
-# *.png=:\
-# *.ppk=:\
-# *.ppm=:\
-# *.ppt=:\
-# *.pptx=:\
-# *.pro=:\
-# *.ps1=:\
-# *.psb=:\
-# *.psd=:\
-# *.pub=:\
-# *.py=:\
-# *.pyc=:\
-# *.pyd=:\
-# *.pyo=:\
-# *.qt=:\
-# *.ra=:\
-# *.rar=:\
-# *.rb=:\
-# *.rc=:\
-# *.rlib=:\
-# *.rm=:\
-# *.rmvb=:\
-# *.rom=:\
-# *.rpm=:\
-# *.rs=:\
-# *.rss=:\
-# *.rtf=:\
-# *.rz=:\
-# *.s=:\
-# *.sar=:\
-# *.scala=:\
-# *.scss=:\
-# *.sh=:\
-# *.slim=:\
-# *.sln=:\
-# *.so=:\
-# *.spx=:\
-# *.sql=:\
-# *.styl=:\
-# *.suo=:\
-# *.svg=:\
-# *.svgz=:\
-# *.swm=:\
-# *.t7z=:\
-# *.t=:\
-# *.tar=:\
-# *.taz=:\
-# *.tbz2=:\
-# *.tbz=:\
-# *.tga=:\
-# *.tgz=:\
-# *.tif=:\
-# *.tiff=:\
-# *.tlz=:\
-# *.ts=:\
-# *.twig=:\
-# *.txz=:\
-# *.tz=:\
-# *.tzo=:\
-# *.tzst=:\
-# *.vim=:\
-# *.vimrc=:\
-# *.vob=:\
-# *.war=:\
-# *.wav=:\
-# *.wav=:\
-# *.webm=:\
-# *.wim=:\
-# *.wmv=:\
-# *.xbm=:\
-# *.xbps=:\
-# *.xcf=:\
-# *.xhtml=:\
-# *.xls=:\
-# *.xlsx=:\
-# *.xml=:\
-# *.xpm=:\
-# *.xspf=:\
-# *.xul=:\
-# *.xwd=:\
-# *.xz=:\
-# *.yaml=:\
-# *.yml=:\
-# *.yuv=:\
-# *.z=:\
-# *.zip=:\
-# *.zoo=:\
-# *.zsh=:\
-# *.zst=:\
-# *.src=:\
-# *.ebuild=:\
-# "
+# Fuzzy finder ----------------------------------------------------------------
+source /usr/share/fzf/key-bindings.fish
+
+# ### key-bindings.fish ###
+# #     ____      ____
+# #    / __/___  / __/
+# #   / /_/_  / / /_
+# #  / __/ / /_/ __/
+# # /_/   /___/_/ key-bindings.fish
+# #
+# # - $FZF_TMUX_OPTS
+# # - $FZF_CTRL_T_COMMAND
+# # - $FZF_CTRL_T_OPTS
+# # - $FZF_CTRL_R_OPTS
+# # - $FZF_ALT_C_COMMAND
+# # - $FZF_ALT_C_OPTS
+#
+# status is-interactive; or exit 0
+#
+#
+# # Key bindings
+# # ------------
+# function fzf_key_bindings
+#
+#   function __fzf_defaults
+#     # $1: Prepend to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS
+#     # $2: Append to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS
+#     test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
+#     echo "--height $FZF_TMUX_HEIGHT --bind=ctrl-z:ignore" $argv[1]
+#     command cat "$FZF_DEFAULT_OPTS_FILE" 2> /dev/null
+#     echo $FZF_DEFAULT_OPTS $argv[2]
+#   end
+#
+#   # Store current token in $dir as root for the 'find' command
+#   function fzf-file-widget -d "List files and folders"
+#     set -l commandline (__fzf_parse_commandline)
+#     set -lx dir $commandline[1]
+#     set -l fzf_query $commandline[2]
+#     set -l prefix $commandline[3]
+#
+#     test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
+#     begin
+#       set -lx FZF_DEFAULT_OPTS (__fzf_defaults "--reverse --walker=file,dir,follow,hidden --scheme=path --walker-root='$dir'" "$FZF_CTRL_T_OPTS")
+#       set -lx FZF_DEFAULT_COMMAND "$FZF_CTRL_T_COMMAND"
+#       set -lx FZF_DEFAULT_OPTS_FILE ''
+#       eval (__fzfcmd)' -m --query "'$fzf_query'"' | while read -l r; set result $result $r; end
+#     end
+#     if [ -z "$result" ]
+#       commandline -f repaint
+#       return
+#     else
+#       # Remove last token from commandline.
+#       commandline -t ""
+#     end
+#     for i in $result
+#       commandline -it -- $prefix
+#       commandline -it -- (string escape $i)
+#       commandline -it -- ' '
+#     end
+#     commandline -f repaint
+#   end
+#
+#   function fzf-history-widget -d "Show command history"
+#     test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
+#     begin
+#       set -l FISH_MAJOR (echo $version | cut -f1 -d.)
+#       set -l FISH_MINOR (echo $version | cut -f2 -d.)
+#
+#       # merge history from other sessions before searching
+#       if test -z "$fish_private_mode"
+#         builtin history merge
+#       end
+#
+#       # history's -z flag is needed for multi-line support.
+#       # history's -z flag was added in fish 2.4.0, so don't use it for versions
+#       # before 2.4.0.
+#       if [ "$FISH_MAJOR" -gt 2 -o \( "$FISH_MAJOR" -eq 2 -a "$FISH_MINOR" -ge 4 \) ];
+#         if type -P perl > /dev/null 2>&1
+#           set -lx FZF_DEFAULT_OPTS (__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort --wrap-sign '"\t"↳ ' --highlight-line $FZF_CTRL_R_OPTS +m")
+#           set -lx FZF_DEFAULT_OPTS_FILE ''
+#           builtin history -z --reverse | command perl -0 -pe 's/^/$.\t/g; s/\n/\n\t/gm' | eval (__fzfcmd) --tac --read0 --print0 -q '(commandline)' | command perl -pe 's/^\d*\t//' | read -lz result
+#           and commandline -- $result
+#         else
+#           set -lx FZF_DEFAULT_OPTS (__fzf_defaults "" "--scheme=history --bind=ctrl-r:toggle-sort --wrap-sign '"\t"↳ ' --highlight-line $FZF_CTRL_R_OPTS +m")
+#           set -lx FZF_DEFAULT_OPTS_FILE ''
+#           builtin history -z | eval (__fzfcmd) --read0 --print0 -q '(commandline)' | read -lz result
+#           and commandline -- $result
+#         end
+#       else
+#         builtin history | eval (__fzfcmd) -q '(commandline)' | read -l result
+#         and commandline -- $result
+#       end
+#     end
+#     commandline -f repaint
+#   end
+#
+#   function fzf-cd-widget -d "Change directory"
+#     set -l commandline (__fzf_parse_commandline)
+#     set -lx dir $commandline[1]
+#     set -l fzf_query $commandline[2]
+#     set -l prefix $commandline[3]
+#
+#     test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
+#     begin
+#       set -lx FZF_DEFAULT_OPTS (__fzf_defaults "--reverse --walker=dir,follow,hidden --scheme=path --walker-root='$dir'" "$FZF_ALT_C_OPTS")
+#       set -lx FZF_DEFAULT_OPTS_FILE ''
+#       set -lx FZF_DEFAULT_COMMAND "$FZF_ALT_C_COMMAND"
+#       eval (__fzfcmd)' +m --query "'$fzf_query'"' | read -l result
+#
+#       if [ -n "$result" ]
+#         cd -- $result
+#
+#         # Remove last token from commandline.
+#         commandline -t ""
+#         commandline -it -- $prefix
+#       end
+#     end
+#
+#     commandline -f repaint
+#   end
+#
+#   function __fzfcmd
+#     test -n "$FZF_TMUX"; or set FZF_TMUX 0
+#     test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
+#     if [ -n "$FZF_TMUX_OPTS" ]
+#       echo "fzf-tmux $FZF_TMUX_OPTS -- "
+#     else if [ $FZF_TMUX -eq 1 ]
+#       echo "fzf-tmux -d$FZF_TMUX_HEIGHT -- "
+#     else
+#       echo "fzf"
+#     end
+#   end
+#
+#   bind \cr fzf-history-widget
+#   if not set -q FZF_CTRL_T_COMMAND; or test -n "$FZF_CTRL_T_COMMAND"
+#     bind \ct fzf-file-widget
+#   end
+#   if not set -q FZF_ALT_C_COMMAND; or test -n "$FZF_ALT_C_COMMAND"
+#     bind \ec fzf-cd-widget
+#   end
+#
+#   if bind -M insert > /dev/null 2>&1
+#     bind -M insert \cr fzf-history-widget
+#     if not set -q FZF_CTRL_T_COMMAND; or test -n "$FZF_CTRL_T_COMMAND"
+#       bind -M insert \ct fzf-file-widget
+#     end
+#     if not set -q FZF_ALT_C_COMMAND; or test -n "$FZF_ALT_C_COMMAND"
+#       bind -M insert \ec fzf-cd-widget
+#     end
+#   end
+#
+#   function __fzf_parse_commandline -d 'Parse the current command line token and return split of existing filepath, fzf query, and optional -option= prefix'
+#     set -l commandline (commandline -t)
+#
+#     # strip -option= from token if present
+#     set -l prefix (string match -r -- '^-[^\s=]+=' $commandline)
+#     set commandline (string replace -- "$prefix" '' $commandline)
+#
+#     # eval is used to do shell expansion on paths
+#     eval set commandline $commandline
+#
+#     if [ -z $commandline ]
+#       # Default to current directory with no --query
+#       set dir '.'
+#       set fzf_query ''
+#     else
+#       set dir (__fzf_get_dir $commandline)
+#
+#       if [ "$dir" = "." -a (string sub -l 1 -- $commandline) != '.' ]
+#         # if $dir is "." but commandline is not a relative path, this means no file path found
+#         set fzf_query $commandline
+#       else
+#         # Also remove trailing slash after dir, to "split" input properly
+#         set fzf_query (string replace -r "^$dir/?" -- '' "$commandline")
+#       end
+#     end
+#
+#     echo $dir
+#     echo $fzf_query
+#     echo $prefix
+#   end
+#
+#   function __fzf_get_dir -d 'Find the longest existing filepath from input string'
+#     set dir $argv
+#
+#     # Strip all trailing slashes. Ignore if $dir is root dir (/)
+#     if [ (string length -- $dir) -gt 1 ]
+#       set dir (string replace -r '/*$' -- '' $dir)
+#     end
+#
+#     # Iteratively check if dir exists and strip tail end of path
+#     while [ ! -d "$dir" ]
+#       # If path is absolute, this can keep going until ends up at /
+#       # If path is relative, this can keep going until entire input is consumed, dirname returns "."
+#       set dir (dirname -- "$dir")
+#     end
+#
+#     echo $dir
+#   end
 #
-# # set LF_ICONS "\
-# # tw=:\
-# # st=:\
-# # ow=:\
-# # dt=:\
-# # di=:\
-# # fi=:\
-# # ln=:\
-# # or=:\
-# # *.7z=:\
-# # *.a=:\
-# # *.ai=:\
-# # *.apk=:\
-# # *.asm=:\
-# # *.asp=:\
-# # *.aup=:\
-# # *.avi=:\
-# # *.awk=:\
-# # *.bash=:\
-# # *.bat=:\
-# # *.bmp=:\
-# # *.bz2=:\
-# # *.c=:\
-# # *.c++=:\
-# # *.cab=:\
-# # *.cbr=:\
-# # *.cbz=:\
-# # *.cc=:\
-# # *.class=:\
-# # *.clj=:\
-# # *.cljc=:\
-# # *.cljs=:\
-# # *.cmake=:\
-# # *.coffee=:\
-# # *.conf=:\
-# # *.cp=:\
-# # *.cpio=:\
-# # *.cpp=:\
-# # *.cs=:\
-# # *.csh=:\
-# # *.css=:\
-# # *.cue=:\
-# # *.cvs=:\
-# # *.cxx=:\
-# # *.d=:\
-# # *.dart=:\
-# # *.db=:\
-# # *.deb=:\
-# # *.diff=:\
-# # *.dll=:\
-# # *.doc=:\
-# # *.docx=:\
-# # *.dump=:\
-# # *.edn=:\
-# # *.eex=:\
-# # *.efi=:\
-# # *.ejs=:\
-# # *.elf=:\
-# # *.elm=:\
-# # *.epub=:\
-# # *.erl=:\
-# # *.ex=:\
-# # *.exe=:\
-# # *.exs=:\
-# # *.f#=:\
-# # *.fifo=|
-# # *.fish=:\
-# # *.flac=:\
-# # *.flv=:\
-# # *.fs=:\
-# # *.fsi=:\
-# # *.fsscript=:\
-# # *.fsx=:\
-# # *.gem=:\
-# # *.gemspec=:\
-# # *.gif=:\
-# # .git=:\
-# # *.go=:\
-# # *.gz=:\
-# # *.gzip=:\
-# # *.h=:\
-# # *.haml=:\
-# # *.hbs=:\
-# # *.hh=:\
-# # *.hpp=:\
-# # *.hrl=:\
-# # *.hs=:\
-# # *.htaccess=:\
-# # *.htm=:\
-# # *.html=:\
-# # *.htpasswd=:\
-# # *.hxx=:\
-# # *.ico=:\
-# # *.img=:\
-# # *.ini=:\
-# # *.iso=:\
-# # *.jar=:\
-# # *.java=:\
-# # *.jl=:\
-# # *.jpeg=:\
-# # *.jpg=:\
-# # *.js=:\
-# # *.json=:\
-# # *.jsx=:\
-# # *.key=:\
-# # *.ksh=:\
-# # *.leex=:\
-# # *.less=:\
-# # *.lha=:\
-# # *.lhs=:\
-# # *.log=:\
-# # *.lua=:\
-# # *.lzh=:\
-# # *.lzma=:\
-# # *.m4a=:\
-# # *.m4v=:\
-# # *.markdown=:\
-# # *.md=:\
-# # *.mdx=:\
-# # *.mjs=:\
-# # *.mkv=:\
-# # *.ml=λ:\
-# # *.mli=λ:\
-# # *.mov=:\
-# # *.mp3=:\
-# # *.mp4=:\
-# # *.mpeg=:\
-# # *.mpg=:\
-# # *.msi=:\
-# # *.mustache=:\
-# # *.nix=:\
-# # *.o=:\
-# # *.ogg=:\
-# # *.pdf=:\
-# # *.php=:\
-# # *.pl=:\
-# # *.pm=:\
-# # *.png=:\
-# # *.pp=:\
-# # *.ppt=:\
-# # *.pptx=:\
-# # *.ps1=:\
-# # *.psb=:\
-# # *.psd=:\
-# # *.pub=:\
-# # *.py=:\
-# # *.pyc=:\
-# # *.pyd=:\
-# # *.pyo=:\
-# # *.r=ﳒ:\
-# # *.rake=:\
-# # *.rar=:\
-# # *.rb=:\
-# # *.rc=:\
-# # *.rlib=:\
-# # *.rmd=:\
-# # *.rom=:\
-# # *.rpm=:\
-# # *.rproj=鉶:\
-# # *.rs=:\
-# # *.rss=:\
-# # *.rtf=:\
-# # *.s=:\
-# # *.sass=:\
-# # *.scala=:\
-# # *.scss=:\
-# # *.sh=:\
-# # *.slim=:\
-# # *.sln=:\
-# # *.so=:\
-# # *.sql=:\
-# # *.styl=:\
-# # *.suo=:\
-# # *.swift=:\
-# # *.t=:\
-# # *.tar=:\
-# # *.tex=ﭨ:\
-# # *.tgz=:\
-# # *.toml=:\
-# # *.ts=:\
-# # *.tsx=:\
-# # *.twig=:\
-# # *.vim=:\
-# # *.vimrc=:\
-# # *.vue=﵂:\
-# # *.wav=:\
-# # *.webm=:\
-# # *.webmanifest=:\
-# # *.webp=:\
-# # *.xbps=:\
-# # *.xcplayground=:\
-# # *.xhtml=:\
-# # *.xls=:\
-# # *.xlsx=:\
-# # *.xml=:\
-# # *.xul=:\
-# # *.xz=:\
-# # *.yaml=:\
-# # *.yml=:\
-# # *.zip=:\
-# # *.zsh=:\
-# # "
+# end
+# ### end: key-bindings.fish ###
+# fzf_key_bindings

.config/mimeapps.list

@@ -117,6 +117,7 @@ x-scheme-handler/mailto=thunderbird.desktop;userapp-Thunderbird-AGWQN1.desktop;
 x-scheme-handler/mid=userapp-Thunderbird-AGWQN1.desktop;
 x-scheme-handler/tg=org.telegram.desktop._7cb4463cbfb6d37fa083bc06971fbe43.desktop;
 x-scheme-handler/trash=xfce4-file-manager.desktop;
+x-scheme-handler/tonsite=org.telegram.desktop._7cb4463cbfb6d37fa083bc06971fbe43.desktop;
 
 [Default Applications]
 application/csv=wps-office-prometheus.desktop
@@ -327,6 +328,7 @@ x-scheme-handler/trash=xfce4-file-manager.desktop
 x-scheme-handler/unknown=brave-browser.desktop
 x-scheme-handler/viber=viber.desktop
 zz-application/zz-winassoc-xls=wps-office-prometheus.desktop
+x-scheme-handler/tonsite=org.telegram.desktop._7cb4463cbfb6d37fa083bc06971fbe43.desktop
 
 [Removed Associations]
 application/epub+zip=atril.desktop;
@@ -336,4 +338,3 @@ application/x-trash=org.kde.dolphin.desktop;dolphin4.desktop;
 image/gif=google-chrome.desktop;org.qutebrowser.qutebrowser.desktop;
 image/jpeg=org.qutebrowser.qutebrowser.desktop;google-chrome.desktop;
 image/png=org.qutebrowser.qutebrowser.desktop;google-chrome.desktop;
-

.config/nvim/init.lua

@@ -1,32 +1,2 @@
-require("alex.core.keymaps")
-require("alex.core.plugins")
-require("alex.core.settings")
-
-require("alex.plugins.colorscheme")
-require("alex.plugins.nvim-tree")
-require("alex.plugins.telescope")
-require("alex.plugins.trouble")
-require("alex.plugins.comments")
-require("alex.plugins.bufferline")
-require("alex.plugins.lualine")
-require("alex.plugins.which-key")
-require("alex.plugins.treesitter")
-require("alex.plugins.alpha")
-require("alex.plugins.auto-session")
-require("alex.plugins.autopairs")
-require("alex.plugins.colorizer")
-require("alex.plugins.vim-maximizer")
-require("alex.plugins.surround")
-require("alex.plugins.substitute")
-require("alex.plugins.todo-comments")
-require("alex.plugins.lazygit")
-require("alex.plugins.gitsigns")
-require("alex.plugins.lsp.mason")
-require("alex.plugins.lsp.lspconfig")
-require("alex.plugins.formatting")
-require("alex.plugins.linting")
-require("alex.plugins.nvim-cmp")
-require("alex.plugins.toggleterm")
+require("alex.core")
+require("alex.lazy")

.config/nvim/lazy-lock.json

@@ -1,4 +1,5 @@
 {
+  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
   "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
   "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
   "auto-session": { "branch": "main", "commit": "fe705eed9da20ac81780134432b2e12ab28af8f9" },
@@ -7,11 +8,11 @@
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "conform.nvim": { "branch": "master", "commit": "25d48271e3d4404ba017cb92a37d3a681c1ad149" },
+  "conform.nvim": { "branch": "master", "commit": "2122fe2ff01e9a542fc358ee9398ce2cbddf345d" },
   "dressing.nvim": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" },
   "everforest": { "branch": "master", "commit": "b49ba81e79b20d2b47bb71e98fa984bae90731be" },
   "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
-  "gitsigns.nvim": { "branch": "main", "commit": "58bd9e98d8e3c5a1c98af312e85247ee1afd3ed2" },
+  "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" },
   "indent-blankline.nvim": { "branch": "master", "commit": "3fe94b8034dd5241cb882bb73847303b58857ecf" },
   "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
   "lazygit.nvim": { "branch": "main", "commit": "dc56df433bfbf107fee0139e187eb9750878fa84" },
@@ -21,17 +22,17 @@
   "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
-  "nvim-autopairs": { "branch": "master", "commit": "e38c5d837e755ce186ae51d2c48e1b387c4425c6" },
+  "nvim-autopairs": { "branch": "master", "commit": "4a39f2dcbe1967ddc3a0f76f863540dd3aa7871a" },
   "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
-  "nvim-comment": { "branch": "main", "commit": "e9ac16ab056695cad6461173693069ec070d2b23" },
   "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" },
   "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" },
-  "nvim-lspconfig": { "branch": "master", "commit": "6c505d4220b521f3b0e7b645f6ce45fa914d0eed" },
+  "nvim-lspconfig": { "branch": "master", "commit": "652386deae739e38fa1bcf2f06e3e7de9b3436ba" },
   "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
   "nvim-tree.lua": { "branch": "master", "commit": "48d0e82f9434691cc50d970898142a8c084a49d6" },
-  "nvim-treesitter": { "branch": "master", "commit": "c79b068f395817c39ed147d4ee76855c36b846e6" },
+  "nvim-treesitter": { "branch": "master", "commit": "3e0feeb062b29bb7d6d6df1e32ba28111c2bb734" },
   "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" },
   "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
   "substitute.nvim": { "branch": "main", "commit": "97f49d16f8eea7967d41db4f657dd63af53eeba1" },

.config/nvim/lua/alex/core/init.lua

@@ -0,0 +1,2 @@
+require("alex.core.settings")
+require("alex.core.keymaps")

.config/nvim/lua/alex/core/plugins.lua

@@ -1,198 +0,0 @@
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-  vim.fn.system({
-    "git",
-    "clone",
-    "--filter=blob:none",
-    "https://github.com/folke/lazy.nvim.git",
-    "--branch=stable", -- latest stable release
-    lazypath
-  })
-end
-vim.opt.rtp:prepend(lazypath)
-
-require("lazy").setup({
-  checker = {
-    enabled = true,
-    notify = false,
-  },
-  change_detection = {
-    notify = false,
-  },
-  { "sainnhe/everforest" },
-  {
-    "nvim-tree/nvim-tree.lua",
-    dependencies = "nvim-tree/nvim-web-devicons",
-  },
-  {
-    "nvim-telescope/telescope.nvim",
-    branch = "0.1.x",
-    dependencies = {
-      "nvim-lua/plenary.nvim",
-      { "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
-      "nvim-tree/nvim-web-devicons",
-      "folke/todo-comments.nvim",
-    }
-  },
-  {
-    "folke/trouble.nvim",
-    dependencies = { "nvim-tree/nvim-web-devicons", "folke/todo-comments.nvim" },
-    opts = {
-      focus = true,
-    },
-    cmd = "Trouble",
-  },
-  {
-    "terrortylor/nvim-comment",
-  },
-  {
-    "akinsho/bufferline.nvim",
-    dependencies = { "nvim-tree/nvim-web-devicons" },
-    version = "*",
-  },
-  {
-    "nvim-lualine/lualine.nvim",
-    dependencies = { "nvim-tree/nvim-web-devicons" },
-  },
-  {
-    "stevearc/dressing.nvim",
-    event = "VeryLazy",
-  },
-  {
-    "folke/which-key.nvim",
-    event = "VeryLazy",
-    -- dependences = {
-    --   { 'echasnovski/mini.icons', version = false },
-    -- },
-    opts = {
-      icons = {
-        mappings = false,
-      },
-      -- your configuration comes here
-      -- or leave it empty to use the default settings
-      -- refer to the configuration section below
-    }
-  },
-  {
-    "nvim-treesitter/nvim-treesitter",
-    event = { "BufReadPre", "BufNewFile" },
-    build = ":TSUpdate",
-    dependencies = {
-      "windwp/nvim-ts-autotag",
-    },
-  },
-  {
-    "goolord/alpha-nvim",
-    event = "VimEnter",
-  },
-  {
-    "rmagatti/auto-session",
-  },
-  {
-    "windwp/nvim-autopairs",
-    event = { "InsertEnter" },
-    dependencies = {
-      "hrsh7th/nvim-cmp",
-    },
-  },
-  {
-    "norcalli/nvim-colorizer.lua",
-  },
-  {
-    "lukas-reineke/indent-blankline.nvim",
-    event = { "BufReadPre", "BufNewFile" },
-    main = "ibl",
-    opts = {
-      indent = { char = "┊" },
-    }
-  },
-  {
-    "szw/vim-maximizer",
-  },
-  {
-    "kylechui/nvim-surround",
-    version = "*", -- Use for stability; omit to use `main` branch for the latest features
-    event = "VeryLazy",
-  },
-  {
-    "gbprod/substitute.nvim",
-    event = { "BufReadPre", "BufNewFile" },
-  },
-  {
-    "folke/todo-comments.nvim",
-    event = { "BufReadPre", "BufNewFile" },
-    dependencies = { "nvim-lua/plenary.nvim" },
-  },
-  {
-    "kdheepak/lazygit.nvim",
-    cmd = {
-      "LazyGit",
-      "LazyGitConfig",
-      "LazyGitCurrentFile",
-      "LazyGitFilter",
-      "LazyGitFilterCurrentFile",
-    },
-    -- optional for floating window border decoration
-    dependencies = {
-      "nvim-lua/plenary.nvim",
-    },
-  },
-  {
-    "lewis6991/gitsigns.nvim",
-    event = { "BufReadPre", "BufNewFile" },
-  },
-  {
-    "williamboman/mason.nvim",
-    dependencies = {
-      "williamboman/mason-lspconfig.nvim",
-      "WhoIsSethDaniel/mason-tool-installer.nvim",
-    },
-  },
-  {
-    "neovim/nvim-lspconfig",
-    event = { "BufReadPre", "BufNewFile" },
-    dependencies = {
-      "hrsh7th/cmp-nvim-lsp",
-      { "antosha417/nvim-lsp-file-operations", config = true },
-      { "folke/neodev.nvim",                   opts = {} },
-    },
-  },
-  {
-    "mfussenegger/nvim-lint",
-    event = { "BufReadPre", "BufNewFile" },
-  },
-  {
-    "hrsh7th/nvim-cmp",
-    event = "InsertEnter",
-    dependencies = {
-      "hrsh7th/cmp-buffer", -- source for text in buffer
-      "hrsh7th/cmp-path",   -- source for file system paths
-      {
-        "L3MON4D3/LuaSnip",
-        -- follow latest release.
-        version = "v2.*", -- Replace <CurrentMajor> by the latest released major (first number of latest release)
-        -- install jsregexp (optional!).
-        build = "make install_jsregexp",
-      },
-      "saadparwaiz1/cmp_luasnip",     -- for autocompletion
-      "rafamadriz/friendly-snippets", -- useful snippets
-      "onsails/lspkind.nvim",         -- vs-code like pictograms
-    },
-  },
-  {
-    "stevearc/conform.nvim",
-    event = { "BufReadPre", "BufNewFile" },
-  },
-  {
-    "DreamMaoMao/yazi.nvim",
-    dependencies = {
-      "nvim-telescope/telescope.nvim",
-      "nvim-lua/plenary.nvim",
-    },
-  },
-  {
-    "akinsho/toggleterm.nvim",
-    version = "*",
-    config = true,
-  },
-});

.config/nvim/lua/alex/core/settings.lua

@@ -37,11 +37,16 @@ vim.cmd([[
 -- 6 - просто вертикальная черта
 
 -- tabs & indentation
-opt.autoindent = false -- copy indent from current line when starting new one
-opt.shiftwidth = 2     -- 2 spaces for indent width
-opt.tabstop = 2        -- 2 spaces for tabs (prettier default)
-opt.expandtab = true   -- expand tab to spaces
+opt.autoindent = true -- copy indent from current line when starting new one
 opt.smartindent = true
+-- disable auto-comments on new line (2 lines below)
+vim.cmd("autocmd BufEnter * set formatoptions-=cro")
+vim.cmd("autocmd BufEnter * setlocal formatoptions-=cro")
+-- opt.formatoptions:remove({ "c", "r", "o" }) -- doesn't work
+
+opt.shiftwidth = 2   -- 2 spaces for indent width
+opt.tabstop = 2      -- 2 spaces for tabs (prettier default)
+opt.expandtab = true -- expand tab to spaces
 opt.softtabstop = 2
 
 opt.syntax = "ON"
@@ -58,7 +63,7 @@ opt.history = 50
 opt.undolevels = 50
 g.noerrorbells = true -- instead of beeping
 opt.wildmenu = true   -- красивое автодополнение
-opt.cmdheight = 2     -- Give more space for displaying messages.
+-- opt.cmdheight = 2     -- Give more space for displaying messages.
 opt.scrolloff = 3     -- when scrolling, keep cursor 3 lines away from screen border
 opt.showmatch = true  -- for brackets
 

.config/nvim/lua/alex/lazy.lua

@@ -0,0 +1,22 @@
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not vim.loop.fs_stat(lazypath) then
+  vim.fn.system({
+    "git",
+    "clone",
+    "--filter=blob:none",
+    "https://github.com/folke/lazy.nvim.git",
+    "--branch=stable", -- latest stable release
+    lazypath,
+  })
+end
+vim.opt.rtp:prepend(lazypath)
+
+require("lazy").setup({ { import = "alex.plugins" }, { import = "alex.plugins.lsp" } }, {
+  checker = {
+    enabled = true,
+    notify = false,
+  },
+  change_detection = {
+    notify = false,
+  },
+})