From 3618467899902fd1b97e6e2c6d2c1c909706ab9c Mon Sep 17 00:00:00 2001 From: ediw8311xht Date: Thu, 22 Aug 2024 12:11:04 -0400 Subject: [PATCH] nvim --- bashrc_files/aliases.sh | 4 +- bashrc_files/exports.sh | 4 +- ctpv/config | 10 +- i3wm/regular_bindings.conf | 8 +- kitty/kitty.conf | 14 +- mimeapps.list | 267 ++++++++++++++-------------- nvim/autocmd.vim | 34 ++-- nvim/functions.vim | 41 +++-- nvim/init.vim | 32 ++-- nvim/language_specific/markdown.vim | 1 + nvim/leader_bindings.vim | 102 ++++++----- nvim/lua/base.lua | 27 +-- nvim/lua/functions.lua | 18 ++ nvim/lua/mappings.lua | 78 ++++++++ nvim/lua/mytreesitter.lua | 5 +- nvim/plugins.vim | 78 ++++---- xorg/Xresources | 2 +- zathura/zathurarc | 2 +- 18 files changed, 430 insertions(+), 297 deletions(-) create mode 100644 nvim/lua/functions.lua create mode 100755 nvim/lua/mappings.lua diff --git a/bashrc_files/aliases.sh b/bashrc_files/aliases.sh index 693f5b0..3e9f9ef 100644 --- a/bashrc_files/aliases.sh +++ b/bashrc_files/aliases.sh @@ -122,8 +122,8 @@ alias ednv=' nvim -c "Buffers" "${XDG_CONFIG_HOME}/nvim/lua/"*.lua "${XDG_C alias nva=' fd . --exact-depth 1 -tf -0 -X nvim -c "Buffers"' #--------------------------------------------------zathura-------------------------------# alias z=' zathura --fork' -alias eread=' fd "[.](pdf|epub|mobi|azw2|djvu)$" | fzf --preview="ctpv {}" --print0 | xargs -0 -r -o zathura --fork; exit' -alias fread=' fd "[.](pdf|epub|mobi|azw2|djvu)$" | fzf --preview="ctpv {}" --print0 | xargs -0 -r -o zathura --fork' +alias eread=' fd "[.](pdf|epub|mobi|azw2|djvu)$" | fzf --print0 | xargs -0 -r -o zathura --fork; exit' +alias fread=' fd "[.](pdf|epub|mobi|azw2|djvu)$" | fzf --print0 | xargs -0 -r -o zathura --fork' #--------------------------------------------------df------------------------------------# alias d=' \df -h | ccze -m ansi' alias D=' \df -h | grep -Po "^[ ]*[/]dev[/].*" | ccze -m ansi' diff --git a/bashrc_files/exports.sh b/bashrc_files/exports.sh index 45b1383..c630add 100644 --- a/bashrc_files/exports.sh +++ b/bashrc_files/exports.sh @@ -40,10 +40,10 @@ export BEMENU_OPTS='' #------------------SYSTEM--------------# export EMACS_SOCKET_NAME="${USER}_emacs_daemon" export DOOMDIR="${HOME}/.config/doom" -export SUDO_EDITOR='vim' +export SUDO_EDITOR='nvim' export TERM='st-256color' export TERMINAL='/usr/local/bin/st' -export EDITOR="nvim" +export EDITOR='nvim' export ERL_AFLAGS="-kernel shell_history enabled" #------------------MINE----------------# export STANDARD_IFS=$' \t\n' diff --git a/ctpv/config b/ctpv/config index 39cde9c..8dff8e0 100755 --- a/ctpv/config +++ b/ctpv/config @@ -6,7 +6,7 @@ #set chafasixel set shell "/usr/bin/bash" -preview my_epub .epub {{ +preview epub .epub {{ a="$((w*h))" [[ "${a}" -gt 500 ]] && a="500" gnome-epub-thumbnailer -s "${a}" "${f}" "${cache_f}.png" @@ -14,19 +14,19 @@ preview my_epub .epub {{ send_image "${cache_f}.png" }} -preview mygzip .gz {{ +preview gzip application/gzip {{ zcat "${f}" }} -preview pygm .log {{ +preview log text/x-log {{ pygmentize "${f}" }} -preview myjs .js .json .html {{ +preview jshtml .js .json .html {{ highlight "${f}" --stdout --out-format="ansi" }} -preview mylua .lua {{ +preview lua .lua {{ highlight "${f}" --stdout --out-format="ansi" }} diff --git a/i3wm/regular_bindings.conf b/i3wm/regular_bindings.conf index b70512f..0104628 100644 --- a/i3wm/regular_bindings.conf +++ b/i3wm/regular_bindings.conf @@ -74,7 +74,7 @@ $Br v $_ split v $Br w $_ layout tabbed $Br x $_ exec $monitor_script 'rotate' '$MON_1' 'right' $Br y $_ exec $xmsg_script "Freekey"; mode freekey -$Br z $_ exec /usr/local/bin/st -c 'special_float' -n 'i3s_note' nvim -p "$HOME/.config/BraveSoftware/new_tab_page/new_tab_page.html" "$HOME/.config/BraveSoftware/new_tab_page/new_tab_page.css" +$Br z $_ exec /usr/local/bin/st -c 'special_float' -n 'i3s_note' /usr/bin/env nvim -O "file:///$HOME/Desktop/Coding/WEB_BROWSER/Firefox/"* #bindsym button9 $_ exec screengrab $Mb button9 $_ exec screengrab @@ -89,12 +89,13 @@ $SF m $_ floating enable, $scratchpad_default, move position c $SF n $_ exec /usr/local/bin/st -c 'special_note' -n 'i3s_note' nvim "$HOME/Documents/Notepad/note.txt" $SF p $_ exec /usr/bin/brave --incognito $SF q $_ kill -$SF t $_ exec /usr/bin/torbrowser-launcher; exec sleep 1 && i3-msg '[class="Tor Browser"] scratchpad show' +$SF t $_ exec /usr/bin/torbrowser-launcher $SF u $_ exec /usr/bin/kitty --title='i3s_kitty_term' $SF v $_ split h $SF x $_ exec $clipboard_script "DATE" "TIME" $SF_CTRL e $_ exec $zathura_script -o +$SF_CTRL d $_ exec $border_script $SF_CTRL h $B1 move left 20px $SF_CTRL j $B1 move down 20px $SF_CTRL k $B1 move up 20px @@ -108,7 +109,8 @@ $Br Up $_ exec "pulseaudio-ctl 'up' || pamixer --increase 1" $Br Down $_ exec "pulseaudio-ctl 'down' || pamixer --decrease 1" $Br minus $_ exec $refresh_script --hard "$BROWSER" $Br period $_ gaps inner all toggle $IN_GAPS, gaps bottom all toggle $BOT_GAPS, gaps left all toggle $L_GAPS, gaps top all toggle $TOP_GAPS, gaps right all toggle $R_GAPS -$Br Return $_ exec /usr/local/bin/st +#$Br Return $_ exec /usr/local/bin/st +$Br Return $_ exec /usr/bin/kitty $Br slash $_ exec $xmsg_script "Polymove"; mode polymove $Br space $B1 focus mode_toggle $SF Up $_ exec $wallpaper_script "UP" diff --git a/kitty/kitty.conf b/kitty/kitty.conf index 6b176a7..7be497a 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -22,20 +22,23 @@ # url_style: none, straight, double, curly, dotted, dashed. # Appearance # foreground #bbbbbb - background_opacity 1 - background_image $HOME/.config/kitty/KITTY_BACKGROUND/11.png - background_image_layout cscaled + background_opacity 0.94 + #background_image $HOME/.config/kitty/KITTY_BACKGROUND/7.png + #background_image_layout cscaled # tiled, mirror-tiled, scaled, clamped, centered background_tint 0.97 background_blur 0 background_tint_gaps 1.0 background #000000 #dim_opacity 0.9 - window_border_width 0.5pt window_margin_width 10.0 + #window_border_width 5px + #draw_minimal_borders no + #inactive_border_color #cccccc + # active_border_color #00ff00 # Tabs tab_title_max_length 20 - tab_bar_style slant + tab_bar_style powerline #: fade #: Each tab's edges fade into the background color. (See also tab_fade) #: slant @@ -79,6 +82,7 @@ # Mappings # kitty_mod super map kitty_mod+f1 load_config_file + map kitty_mod+n launch --cwd=current map ctrl+equal change_font_size all +2.0 map ctrl+plus change_font_size all +2.0 map ctrl+minus change_font_size all -2.0 diff --git a/mimeapps.list b/mimeapps.list index 417783b..ac91f50 100644 --- a/mimeapps.list +++ b/mimeapps.list @@ -5,138 +5,139 @@ x-scheme-handler/http=brave-browser.desktop; x-scheme-handler/https=brave-browser.desktop; [Default Applications] -application/x-mimearchive=nvim.desktop; -application/pdf=zathura.desktop -application/epub=zathura.desktop +#application/vnd.chess-pgn; +application/epub=zathura.desktop; application/epub+zip=org.pwmt.zathura-pdf-mupdf.desktop; -application/json=nvim.desktop -application/mobi=zathura.desktop -application/schema+json=nvim.desktop -application/vnd.chess-pgn -application/x-bittorrent=deluge.desktop -application/x-desktop=nvim.desktop -application/x-extension-htm=nvim.desktop -application/x-extension-html=nvim.desktop -application/x-extension-shtml=nvim.desktop -application/x-extension-xhtml=nvim.desktop -application/x-extension-xht=nvim.desktop -application/xhtml+xml=nvim.desktop +application/gzip=engrampa.desktop; +application/json=nvim.desktop; +application/mobi=zathura.desktop; +application/pdf=zathura.desktop; +application/schema+json=nvim.desktop; +application/x-ankiaddon=anki.desktop; +application/x-apkg=anki.desktop; +application/x-bittorrent=deluge.desktop; +application/x-colpkg=anki.desktop; +application/x-desktop=nvim.desktop; +application/x-extension-html=nvim.desktop; +application/x-extension-htm=nvim.desktop; +application/x-extension-shtml=nvim.desktop; +application/x-extension-xhtml=nvim.desktop; +application/x-extension-xht=nvim.desktop; +application/xhtml+xml=nvim.desktop; +application/x-mimearchive=nvim.desktop; application/xml=nvim.desktop; -application/x-mobipocket-ebook=zathura.desktop -application/x-openzim=zim.desktop -application/x-shellscript=nvim.desktop -application/x-wine-extension-ini=nvim.desktop -audio/aac=mpv.desktop -audio/ac3=mpv.desktop -audio/AMR=mpv.desktop -audio/flac=mpv.desktop -audio/mp2=mpv.desktop -audio/mp4=mpv.desktop -audio/mpeg=mpv.desktop -audio/ogg=mpv.desktop -audio/vnd.dts.hd=mpv.desktop -audio/vnd.dts=mpv.desktop -audio/vnd.rn-realaudio=mpv.desktop -audio/webm=mpv.desktop -audio/x-adpcm=mpv.desktop -audio/x-aiff=mpv.desktop -audio/x-ape=mpv.desktop -audio/x-m4b=mpv.desktop -audio/x-matroska=mpv.desktop -audio/x-mpegurl=mpv.desktop -audio/x-ms-asx=mpv.desktop -audio/x-ms-wma=mpv.desktop -audio/x-musepack=mpv.desktop -audio/x-opus+ogg=mpv.desktop -audio/x-scpls=mpv.desktop -audio/x-tta=mpv.desktop -audio/x-vorbis+ogg=mpv.desktop -audio/x-wav=mpv.desktop -audio/x-wavpack=mpv.desktop -image/avif=nsxiv.desktop -image/bmp=nsxiv.desktop -image/gif=imv.desktop -image/heif=nsxiv.desktop -image/jp2=nsxiv.desktop -image/jpeg=nsxiv.desktop -image/jxl=nsxiv.desktop -image/png=nsxiv.desktop -image/svg+xml=nsxiv.desktop -image/tiff=nsxiv.desktop -image/webp=nsxiv.desktop -image/x-portable-anymap=nsxiv.desktop -image/x-portable-bitmap=nsxiv.desktop -image/x-portable-graymap=nsxiv.desktop -image/x-portable-pixmap=nsxiv.desktop -image/x-tga=nsxiv.desktop -image/x-xpixmap=nsxiv.desktop -inode/directory=thunar.desktop -text/x-log=nvim.desktop -text/cpp=nvim.desktop -text/css=nvim.desktop -text/csv=nvim.desktop -text/html=nvim.desktop -text/javascript=nvim.desktop -text/markdown=nvim.desktop -text/plain=nvim.desktop -text/plain=nvim.desktop -text/python=nvim.desktop -text/spreadsheet=nvim.desktop -text/tab-separated-values=nvim.desktop -text/tcl=nvim.desktop -text/vbscript=nvim.desktop -text/vnd.trolltech.linguist=nvim.desktop -text/x-c++hdr=nvim.desktop -text/x-chdr=nvim.desktop -text/x-copying=nvim.desktop -text/x-c++src=nvim.desktop -text/x-csrc=nvim.desktop -text/x-dsrc=nvim.desktop -text/x-elixir=nvim.desktop -text/x-go=nvim.desktop -text/x-google-video-pointer=nvim.desktop -text/x-java=nvim.desktop -text/x-javascript=nvim.desktop -text/x-lua=nvim.desktop -text/x-makefile=nvim.desktop -text/x-markdown=nvim.desktop -text/x-matlab=nvim.desktop -text/x-moc=nvim.desktop -text/x-pascal=nvim.desktop -text/x-python=nvim.desktop -text/x-readme=nvim.desktop -text/x-rst=nvim.desktop -text/x-scala=sc-im.desktop -text/x-shellscript=nvim.desktop -text/x-tex=nvim.desktop -text/x-emacs-lisp=nvim.desktop -video/3gpp2=mpv.desktop -video/3gpp=mpv.desktop -video/avi=mpv.desktop -video/dv=mpv.desktop -video/mp2t=mpv.desktop -video/mp4=mpv.desktop -video/mpeg=mpv.desktop -video/ogg=mpv.desktop -video/quicktime=mpv.desktop -video/vnd.avi=mpv.desktop -video/vnd.mpegurl=mpv.desktop -video/vnd.rn-realvideo=mpv.desktop -video/webm=mpv.desktop -video/x-flic=mpv.desktop -video/x-flv=mpv.desktop -video/x-matroska=mpv.desktop -video/x-msvideo=mpv.desktop -video/x-ms-wmv=mpv.desktop -video/x-ogm+ogg=mpv.desktop -video/x-theora+ogg=mpv.desktop -x-scheme-handler/about=brave-browser.desktop -x-scheme-handler/chrome=brave-browser.desktop -x-scheme-handler/ftp=brave-browser.desktop -x-scheme-handler/gitkraken=GitKraken.desktop -x-scheme-handler/http=brave-browser.desktop -x-scheme-handler/https=brave-browser.desktop -x-scheme-handler/unknown=brave-browser.desktop -application/x-colpkg=anki.desktop -application/x-apkg=anki.desktop -application/x-ankiaddon=anki.desktop +application/x-mobipocket-ebook=zathura.desktop; +application/x-openzim=zim.desktop; +application/x-shellscript=nvim.desktop; +application/x-wine-extension-ini=nvim.desktop; +audio/aac=mpv.desktop; +audio/ac3=mpv.desktop; +audio/AMR=mpv.desktop; +audio/flac=mpv.desktop; +audio/mp2=mpv.desktop; +audio/mp4=mpv.desktop; +audio/mpeg=mpv.desktop; +audio/ogg=mpv.desktop; +audio/vnd.dts.hd=mpv.desktop; +audio/vnd.dts=mpv.desktop; +audio/vnd.rn-realaudio=mpv.desktop; +audio/webm=mpv.desktop; +audio/x-adpcm=mpv.desktop; +audio/x-aiff=mpv.desktop; +audio/x-ape=mpv.desktop; +audio/x-m4b=mpv.desktop; +audio/x-matroska=mpv.desktop; +audio/x-mpegurl=mpv.desktop; +audio/x-ms-asx=mpv.desktop; +audio/x-ms-wma=mpv.desktop; +audio/x-musepack=mpv.desktop; +audio/x-opus+ogg=mpv.desktop; +audio/x-scpls=mpv.desktop; +audio/x-tta=mpv.desktop; +audio/x-vorbis+ogg=mpv.desktop; +audio/x-wav=mpv.desktop; +audio/x-wavpack=mpv.desktop; +image/avif=nsxiv.desktop; +image/bmp=nsxiv.desktop; +image/gif=imv.desktop; +image/heif=nsxiv.desktop; +image/jp2=nsxiv.desktop; +image/jpeg=nsxiv.desktop; +image/jxl=nsxiv.desktop; +image/png=nsxiv.desktop; +image/svg+xml=nsxiv.desktop; +image/tiff=nsxiv.desktop; +image/webp=nsxiv.desktop; +image/x-portable-anymap=nsxiv.desktop; +image/x-portable-bitmap=nsxiv.desktop; +image/x-portable-graymap=nsxiv.desktop; +image/x-portable-pixmap=nsxiv.desktop; +image/x-tga=nsxiv.desktop; +image/x-xpixmap=nsxiv.desktop; +inode/directory=thunar.desktop; +text/cpp=nvim.desktop; +text/css=nvim.desktop; +text/csv=nvim.desktop; +text/html=nvim.desktop; +text/javascript=nvim.desktop; +text/markdown=nvim.desktop; +text/plain=nvim.desktop; +text/plain=nvim.desktop; +text/python=nvim.desktop; +text/spreadsheet=nvim.desktop; +text/tab-separated-values=nvim.desktop; +text/tcl=nvim.desktop; +text/vbscript=nvim.desktop; +text/vnd.trolltech.linguist=nvim.desktop; +text/x-c++hdr=nvim.desktop; +text/x-chdr=nvim.desktop; +text/x-copying=nvim.desktop; +text/x-c++src=nvim.desktop; +text/x-csrc=nvim.desktop; +text/x-dsrc=nvim.desktop; +text/x-elixir=nvim.desktop; +text/x-emacs-lisp=nvim.desktop; +text/x-go=nvim.desktop; +text/x-google-video-pointer=nvim.desktop; +text/x-java=nvim.desktop; +text/x-javascript=nvim.desktop; +text/x-log=nvim.desktop; +text/x-lua=nvim.desktop; +text/x-makefile=nvim.desktop; +text/x-markdown=nvim.desktop; +text/x-matlab=nvim.desktop; +text/x-moc=nvim.desktop; +text/x-pascal=nvim.desktop; +text/x-python=nvim.desktop; +text/x-readme=nvim.desktop; +text/x-rst=nvim.desktop; +text/x-scala=sc-im.desktop; +text/x-shellscript=nvim.desktop; +text/x-tex=nvim.desktop; +video/3gpp2=mpv.desktop; +video/3gpp=mpv.desktop; +video/avi=mpv.desktop; +video/dv=mpv.desktop; +video/mp2t=mpv.desktop; +video/mp4=mpv.desktop; +video/mpeg=mpv.desktop; +video/ogg=mpv.desktop; +video/quicktime=mpv.desktop; +video/vnd.avi=mpv.desktop; +video/vnd.mpegurl=mpv.desktop; +video/vnd.rn-realvideo=mpv.desktop; +video/webm=mpv.desktop; +video/x-flic=mpv.desktop; +video/x-flv=mpv.desktop; +video/x-matroska=mpv.desktop; +video/x-msvideo=mpv.desktop; +video/x-ms-wmv=mpv.desktop; +video/x-ogm+ogg=mpv.desktop; +video/x-theora+ogg=mpv.desktop; +x-scheme-handler/about=brave-browser.desktop; +x-scheme-handler/chrome=brave-browser.desktop; +x-scheme-handler/ftp=brave-browser.desktop; +x-scheme-handler/gitkraken=GitKraken.desktop; +x-scheme-handler/http=brave-browser.desktop; +x-scheme-handler/https=brave-browser.desktop; +x-scheme-handler/unknown=brave-browser.desktop; diff --git a/nvim/autocmd.vim b/nvim/autocmd.vim index 25bc6df..026048e 100644 --- a/nvim/autocmd.vim +++ b/nvim/autocmd.vim @@ -6,31 +6,31 @@ autocmd FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o "autocmd Filetype vim setlocal omnifunc=v:lua.vim.lsp.omnifunc autocmd BufNewFile,BufRead ~/.config/zathura/* set syntax=zathurarc -autocmd BufNewFile *.sh 0read ${XDG_CONFIG_HOME}/nvim/language_specific/templates/template.sh | :silent w | :silent !chmod 700 % -autocmd BufNewFile *.py 0read ${XDG_CONFIG_HOME}/nvim/language_specific/templates/template.py | :silent w | :silent !chmod 700 % -autocmd BufNewFile *.kalker 0read ${XDG_CONFIG_HOME}/nvim/language_specific/templates/template.kalker | :silent w | :silent !chmod 700 % -autocmd BufNewFile *.exs 0read ${XDG_CONFIG_HOME}/nvim/language_specific/templates/template.exs | :silent w | :silent !chmod 700 % -autocmd BufNewFile *.ex 0read ${XDG_CONFIG_HOME}/nvim/language_specific/templates/template.ex | :silent w | :silent !chmod 600 % -autocmd BufNewFile *.html 0read ${XDG_CONFIG_HOME}/nvim/language_specific/templates/template.html | :silent w | :silent !chmod 600 % +autocmd BufNewFile *.sh 0read ${HOME}/.config/nvim/language_specific/templates/template.sh | :silent w | :silent !chmod 700 % +autocmd BufNewFile *.py 0read ${HOME}/.config/nvim/language_specific/templates/template.py | :silent w | :silent !chmod 700 % +autocmd BufNewFile *.kalker 0read ${HOME}/.config/nvim/language_specific/templates/template.kalker | :silent w | :silent !chmod 700 % +autocmd BufNewFile *.exs 0read ${HOME}/.config/nvim/language_specific/templates/template.exs | :silent w | :silent !chmod 700 % +autocmd BufNewFile *.ex 0read ${HOME}/.config/nvim/language_specific/templates/template.ex | :silent w | :silent !chmod 600 % +autocmd BufNewFile *.html 0read ${HOME}/.config/nvim/language_specific/templates/template.html | :silent w | :silent !chmod 600 % autocmd BufNewFile,BufRead ~/.bashrc setfiletype bash autocmd BufNewFile,BufRead ~/bashrc_files/* setfiletype bash autocmd BufNewFile,BufRead *.sh setfiletype bash -autocmd BufNewFile,BufRead ${XDG_CONFIG_HOME}/polybar/*.ini setfiletype dosini -autocmd BufNewFile,BufRead ${XDG_CONFIG_HOME}/polybar/*/*.ini setfiletype dosini +autocmd BufNewFile,BufRead ${HOME}/.config/polybar/*.ini setfiletype dosini +autocmd BufNewFile,BufRead ${HOME}/.config/polybar/*/*.ini setfiletype dosini autocmd BufNewFile,BufRead *.kalker setfiletype kalker -autocmd BufNewFile,BufRead ${XDG_CONFIG_HOME}/i3/* setfiletype i3 +autocmd BufNewFile,BufRead ${HOME}/.config/i3/* setfiletype i3 autocmd BufNewFile,BufRead *.ex,*.exs setfiletype elixir autocmd Filetype elixir setlocal tabstop=2 shiftwidth=2 softtabstop=2 expandtab -autocmd Filetype lua source ${XDG_CONFIG_HOME}/nvim/language_specific/lua.vim -autocmd Filetype kalker source ${XDG_CONFIG_HOME}/nvim/language_specific/kalker.vim -autocmd Filetype css source ${XDG_CONFIG_HOME}/nvim/language_specific/css.vim -autocmd Filetype html source ${XDG_CONFIG_HOME}/nvim/language_specific/html.vim -autocmd Filetype elixir source ${XDG_CONFIG_HOME}/nvim/language_specific/elixir.vim -autocmd Filetype sh,bash source ${XDG_CONFIG_HOME}/nvim/language_specific/bash.vim -autocmd Filetype markdown source ${XDG_CONFIG_HOME}/nvim/language_specific/markdown.vim -autocmd BufNewFile,BufRead ~/.bashrc source ${XDG_CONFIG_HOME}/nvim/language_specific/bashrc.vim +autocmd Filetype lua source ${HOME}/.config/nvim/language_specific/lua.vim +autocmd Filetype kalker source ${HOME}/.config/nvim/language_specific/kalker.vim +autocmd Filetype css source ${HOME}/.config/nvim/language_specific/css.vim +autocmd Filetype html source ${HOME}/.config/nvim/language_specific/html.vim +autocmd Filetype elixir source ${HOME}/.config/nvim/language_specific/elixir.vim +autocmd Filetype sh,bash source ${HOME}/.config/nvim/language_specific/bash.vim +autocmd Filetype markdown source ${HOME}/.config/nvim/language_specific/markdown.vim +autocmd BufNewFile,BufRead ~/.bashrc source ${HOME}/.config/nvim/language_specific/bashrc.vim autocmd VimLeave * call ClipBoardExit() diff --git a/nvim/functions.vim b/nvim/functions.vim index eead25d..5a9c4ea 100644 --- a/nvim/functions.vim +++ b/nvim/functions.vim @@ -64,12 +64,6 @@ fu! CorrectColors() "hi @keyword.repeat guifg=#FF0000 endfu -fu! LoadLuaFiles(reload=0) - for file in g:my_lua_files - exe "lua require('" . file . "')" - endfor -endfu - fu! M_Map(maptype, keys, leader=0) for i in a:keys if a:leader == 1 @@ -80,7 +74,7 @@ fu! M_Map(maptype, keys, leader=0) endfor endfu -fu! CycleBackground(nextprevious) +fu! CyBack(nextprevious) let lenny = len(g:myBg) let i = 0 let current_background = synIDattr(hlID("Normal"), "bg") @@ -108,7 +102,7 @@ fu! SetScheme(scheme) endif endfu -fu! CycleColor(nextprevious) +fu! SetColScheme(nextprevious) " current color scheme let g:colors_name let l:i = 0 let l:length = len(g:MySchemes) @@ -125,6 +119,16 @@ fu! CycleColor(nextprevious) call SetScheme(g:MySchemes[j]) endfu +fu! TogVE() + call Toggle(&ve, "none", "set ve=all \| echo &ve", "set ve=none \| echo &ve") +endfu +fu! TogSL() + call Toggle(&ls, 0, "set ru \| set ls=2", "set noru \| set ls=0") +endfu +fu! TogCC() + call Toggle(&cc, 0, "set cc=80", "set cc=0") +endfu + fu! Toggle(c1, c2, r1, r2) if a:c1 == a:c2 execute a:r1 @@ -134,15 +138,15 @@ fu! Toggle(c1, c2, r1, r2) endfu fu! Cycle(checkarr, cvar, doarr, nextprevious) - let lenny = len(a:checkarr) - let i = 0 - while i < lenny + let l:lenny = len(a:checkarr) + let l:i = 0 + while l:i < lenny if a:checkarr[i] ==? a:cvar - let j = (i + (a:nextprevious)) % lenny - execute a:doarr[j] + let l:j = (l:i + (a:nextprevious)) % l:lenny + execute a:doarr[l:j] return endif - let i += 1 + let l:i += 1 endwhile endfu @@ -159,7 +163,7 @@ fu! IndentHalfOrDouble(half_or_double) endif endfunction -fu! GetMappings() +fu! GMaps() :redir! > /tmp/nvim_mappings.txt :silent imap :silent nmap @@ -181,6 +185,13 @@ fu! LspStatus() abort return "" endfu +fu! FilePathFull() + " gonna add this later to make file argument get from current path + "fu! FilePathFull(file_arg=v:false) + "let l:file = a:file_arg == v:false ? expand("%:p:h") : a:file_arg + return substitute(expand("%:p:h"), '\V' . $HOME, "~", "") +endfu + "fu! M_LspState() " if luaeval('vim.inspect(vim.lsp.buf_get_clients()) == "{}"') " return 0 diff --git a/nvim/init.vim b/nvim/init.vim index 980abdd..4265e31 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -16,28 +16,28 @@ let g:MyDefaultScheme = [ 'pop-punk', 'call CorrectColors()' ] let g:MySchemes=[ - \g:MyDefaultScheme, - \[ 'cyberpunk-neon', 'call CorrectColors()' ], - \[ 'eldar', "." ], - \[ 'elflord', "." ], - \[ 'delek', "." ], - \[ 'morning', "." ], - \[ 'blue', "." ], - \[ 'peachpuff', "." ], - \[ 'industry', "." ], - \[ 'murphy', "." ], + \g:MyDefaultScheme , + \[ 'cyberpunk-neon' , 'call CorrectColors()' ], + \[ 'eldar' , "." ], + \[ 'elflord' , "." ], + \[ 'delek' , "." ], + \[ 'morning' , "." ], + \[ 'blue' , "." ], + \[ 'peachpuff' , "." ], + \[ 'industry' , "." ], + \[ 'murphy' , "." ], \] let g:myBg = [ "#010101", "#333333", "#111111", "#220000", "#002200", "#000022", "#002244" ] + [ "NONE" ] let g:myFg = [ ".", ".", ".", ".", ".", ".", "#aaawaa" ] + [ "." ] let g:python3_host_prog="/usr/bin/python" -let g:my_lua_files = [ 'mytreesitter', 'base' ] source ${HOME}/.config/nvim/autocmd.vim source ${HOME}/.config/nvim/plugins.vim source ${HOME}/.config/nvim/functions.vim -call LoadLuaFiles() +lua require('mytreesitter') +lua require('base') filetype on filetype plugin on @@ -99,12 +99,14 @@ set statusline+=%r set statusline+=%m "set statusline+=%= "set statusline+=[%v]\ (%L\ lines)\ -set statusline+=(%{wordcount().words}\ words\) +"set statusline+=(%{wordcount().words}\ words\) set statusline+=%= "set statusline+=%#HLspStatus#%{LspStatus()} set statusline+=%* set statusline+=[%{LspStatus()}]\ set statusline+=[%F] + +let g:neoterm_automap_keys=',Tt' let g:floaterm_opener='edit' let g:lf_width=0.9 let g:lf_height=0.9 @@ -122,6 +124,10 @@ colorscheme pop-punk source ${HOME}/.config/nvim/leader_bindings.vim source ${HOME}/.config/nvim/etc_bindings.vim + +lua require("mappings") +lua require('functions') + :call CorrectColors() "let g:bracey_refresh_on_save = 1 diff --git a/nvim/language_specific/markdown.vim b/nvim/language_specific/markdown.vim index 45d608f..901c651 100644 --- a/nvim/language_specific/markdown.vim +++ b/nvim/language_specific/markdown.vim @@ -29,6 +29,7 @@ fu! PreviewMarkdown(flag = "") endfu set wrap +colorscheme cyberpunk-neon vnoremap x :!pandoc -t commonmark_x nnoremap x :%!pandoc -t commonmark_x nnoremap oo :silent call PreviewMarkdown() diff --git a/nvim/leader_bindings.vim b/nvim/leader_bindings.vim index 44db026..8f40840 100644 --- a/nvim/leader_bindings.vim +++ b/nvim/leader_bindings.vim @@ -14,57 +14,55 @@ let g:bindings_l_noremap = [ "\[ 'tm' , ':tabmove' ], "\[ 'WC' , ':BraceyStop' ], "\[ 'WW' , ':Bracey' ], -let g:bindings_l_nnoremap = [ - \[ '' , '' ], - \[ ',' , '' ], - \[ ']' , ':bnext:noh' ], - \[ '[' , ':bprevious:noh' ], - \[ '/' , ':Explore' ], - \[ '-' , '20<' ], - \[ '=' , '20>' ], - \[ 'A' , ':LspStart()' ], - \[ 'a' , ':LspStop()' ], - \[ 'B' , ':ls:b' ], - \[ 'b' , ':Buffers' ], - \[ 'cC' , ':call Toggle(&colorcolumn, 0, "set colorcolumn=80", "set colorcolumn=0")', "toggles color column (Line length indicator)" ], - \[ 'cc' , ':set nocursorline!' ], - \[ 'CH' , ':checkhealth' ], - \[ 'D' , ':bdelete' ], - \[ 'df' , ':%s/\s\+\ze$//gc' , "finds and optionally deletes extra space at end of line" ], - \[ 'e' , ':set cursorcolumn!' ], - \[ 'f' , ':set wrap!' ], - \[ 'g' , ':enew' ], - \[ 'Gm' , ':call GetMappings()' ], - \[ 'h' , ':call Toggle(&ls, 0, "set ru \| set ls=2", "set noru \| set ls=0")' ], - \[ 'H' , ':vert helpgrep ' ], - \[ 'i' , ':lua vim.diagnostic.open_float(nil, {focus=true, scope="cursor"})' ], - \[ 'I' , ':lua require("lsp_lines").toggle()' ], - \[ 'j' , ':call CycleColor(+1)' , "cycles color scheme (next)" ], - \[ 'J' , ':call CycleColor(-1)' , "cycles color scheme (prev)" ], - \[ 'k' , ':call CorrectColors()' ], - \[ 'l' , ':call CycleBackground(+1)' ], - \[ 'L' , ':call CycleBackground(-1)' ], - \[ 'M' , ':messages' ], - \[ 'N' , ':cnext' ], - \[ 'n' , ':next' ], - \[ 'ob' , ':silent !${BROWSER} %' ], - \[ 'oq' , ':silent !qutebrowser %' ], - \[ 'q' , ':bd' ], - \[ 's' , ':source ~/.config/nvim/init.vim' ], - \[ 'tb' , ':tabmove -1' ], - \[ 'tn' , ':tabmove +1' ], - \[ 'T' , ':term' ], - \[ 'tt' , ':tabnew' ], - \[ 'u' , ':Lf' ], - \[ 'vv' , ':call Cycle(["none", "all", "block"], &ve, ["set ve=all \| echo &ve", "set ve=block \| echo &ve", "set ve=none \| echo &ve"], 0)' ], - \[ 'W' , ':call Web("f")i' ], - \[ 'w' , ':w' ], - \[ 'X' , ':!%:p ' ], - \[ 'x' , ':!%:p' ], - \[ 'y' , ':hi Normal guibg=Transparent' ], - \[ 'ZC' , ':bd' ], - \[ 'z' , 'z' ], -\] +"let g:bindings_l_nnoremap = [ +" \[ '' , '' ], +" \[ ',' , '' ], +" \[ ']' , ':bnext:noh' ], +" \[ '[' , ':bprevious:noh' ], +" \[ '/' , ':Explore' ], +" \[ '-' , '20<' ], +" \[ '=' , '20>' ], +" \[ 'A' , ':LspStart()' ], +" \[ 'a' , ':LspStop()' ], +" \[ 'B' , ':ls:b' ], +" \[ 'b' , ':Buffers' ], +" \[ 'cC' , ':call Toggle(&colorcolumn, 0, "set colorcolumn=80", "set colorcolumn=0")', "toggles color column (Line length indicator)" ], +" \[ 'cc' , ':set nocursorline!' ], +" \[ 'CH' , ':checkhealth' ], +" \[ 'D' , ':bdelete' ], +" \[ 'df' , ':%s/\s\+\ze$//gc' , "finds and optionally deletes extra space at end of line" ], +" \[ 'e' , ':set cursorcolumn!' ], +" \[ 'E' , ':call feedkeys(":e " . FilePathFull() . "/")' ], +" \[ 'f' , ':set wrap!' ], +" \[ 'g' , ':enew' ], +" \[ 'Gm' , ':call GetMappings()' ], +" \[ 'h' , ':call Toggle(&ls, 0, "set ru \| set ls=2", "set noru \| set ls=0")' ], +" \[ 'H' , ':vert helpgrep ' ], +" \[ 'i' , ':lua vim.diagnostic.open_float(nil, {focus=true, scope="cursor"})' ], +" \[ 'I' , ':lua require("lsp_lines").toggle()' ], +" \[ 'j' , ':call CycleColor(+1)' , "cycles color scheme (next)" ], +" \[ 'J' , ':call CycleColor(-1)' , "cycles color scheme (prev)" ], +" \[ 'k' , ':call CorrectColors()' ], +" \[ 'l' , ':call CycleBackground(+1)' ], +" \[ 'L' , ':call CycleBackground(-1)' ], +" \[ 'M' , ':messages' ], +" \[ 'N' , ':cnext' ], +" \[ 'n' , ':next' ], +" \[ 'ob' , ':silent !${BROWSER} %' ], +" \[ 'oq' , ':silent !qutebrowser %' ], +" \[ 'q' , ':bd' ], +" \[ 's' , ':source ~/.config/nvim/init.vim' ], +" \[ 'T' , ':term' ], +" \[ 'u' , ':Lf' ], +" \[ 'vv' , ':call Cycle(["none", "all", "block"], &ve, ["set ve=all \| echo &ve", "set ve=block \| echo &ve", "set ve=none \| echo &ve"], 0)' ], +" \[ 'W' , ':call Web("f")i' ], +" \[ 'w' , ':w' ], +" \[ 'X' , ':!%:p ' ], +" \[ 'x' , ':!%:p' ], +" \[ 'y' , ':hi Normal guibg=Transparent' ], +" \[ 'ZC' , ':bd' ], +" \[ 'z' , 'z' ], +"\] "\[ 'II' , ':lua require("lsp_lines").toggle()' ], "\[ ';' , ':ls:b' ], "\[ 'X' , ':w:!%:p ' ], @@ -77,7 +75,7 @@ let g:bindings_l_vnoremap = [ \[ 'vs' , ':!sort -n' ], \] -call M_Map( "nnoremap" , g:bindings_l_nnoremap, 1) +"call M_Map( "nnoremap" , g:bindings_l_nnoremap, 1) call M_Map( "noremap" , g:bindings_l_noremap, 1) call M_Map( "vnoremap" , g:bindings_l_vnoremap, 1) diff --git a/nvim/lua/base.lua b/nvim/lua/base.lua index b212eef..702c936 100644 --- a/nvim/lua/base.lua +++ b/nvim/lua/base.lua @@ -12,9 +12,9 @@ local elixirls = require('elixir.elixirls') local lspsaga = require('lspsaga') local gitsigns = require('gitsigns') local marks = require('marks') -local treesitter = require('nvim-treesitter.configs') local lspstatus = require('lsp-status') local HOME = os.getenv("HOME") +local cmp_capabilities = require('cmp_nvim_lsp').default_capabilities() lspstatus.config({ indicator_ok = 'Ok', @@ -22,8 +22,6 @@ lspstatus.config({ lsp_status.register_progress() - - -- local hologram = require('hologram') -- local lsp_lines = require("lsp_lines") @@ -38,14 +36,6 @@ lsp_status.register_progress() -- auto_display = true -- WIP automatic markdown image display, may be prone to breaking -- } -treesitter.setup({ - highlight = { - enable = true, - disable = function(lang, bufnr) -- Disable in large C++ buffers - return vim.api.nvim_buf_line_count(bufnr) > 1000 - end, - }, -}) which_key.setup({ -- notify = false, @@ -110,6 +100,10 @@ which_key.setup({ luasnip.setup({}) cmp.setup({ + performance = { + throttle = 0.3, + async_budget = 20, + }, snippet = { expand = function(args) luasnip.lsp_expand(args.body) @@ -137,6 +131,7 @@ cmp.setup({ { name = 'dotenv'}, }) }) + -- cmp.setup.cmdline({ '/', '?' }, { -- mapping = cmp.mapping.preset.cmdline(), -- sources = { @@ -153,7 +148,6 @@ cmp.setup({ -- matching = { disallow_symbol_nonprefix_matching = false } -- }) -local cmp_capabilities = require('cmp_nvim_lsp').default_capabilities() marks.setup({ default_mappings = true, @@ -291,6 +285,13 @@ lspconfig.vimls.setup({ lspconfig.lua_ls.setup({ capabilities = cmp_capabilities, + settings = { + Lua = { + diagnostics = { + globals = { 'vim' } + } + } + }, }) lspconfig.bashls.setup({ @@ -309,6 +310,8 @@ lspconfig.pyright.setup({ capabilities = cmp_capabilities, }) +lspconfig.ccls.setup({}) + -- lspconfig.elixirls.setup{ -- credo = { enable = false }, -- cmd = { "/usr/lib/elixir-ls/language_server.sh" }, diff --git a/nvim/lua/functions.lua b/nvim/lua/functions.lua new file mode 100644 index 0000000..cdd832a --- /dev/null +++ b/nvim/lua/functions.lua @@ -0,0 +1,18 @@ +-- local nvim_rocks = require('nvim_rocks') +-- nvim_rocks.install('fun') + +function DisableSlow() + require('cmp').setup.buffer( { enabled = false } ) +end + +function CheckSize(args) + if vim.api.nvim_buf_line_count(args.buf) > 5000 then + DisableSlow() + end +end + + +vim.api.nvim_create_autocmd({"BufEnter", "BufWinEnter"}, { + pattern = {"*"}, + callback = CheckSize +}) diff --git a/nvim/lua/mappings.lua b/nvim/lua/mappings.lua new file mode 100755 index 0000000..8ec5468 --- /dev/null +++ b/nvim/lua/mappings.lua @@ -0,0 +1,78 @@ +#!/usr/bin/lua + +-- local function makemap (key, mode, map, desc, remap) +-- return { key = key, mode = mode, map = map, desc = desc, remap = remap } +-- end + +if not table.unpack then + table.unpack = unpack +end + +-- local f(s, , , +local l = '' + +-- { '', {l , '' }}, +-- { '', '/' , ':Explore' }, +local leader_nnoremap = { + { 'Prev Tab', 'tb' , ':tabmove -1' }, + { 'Next Tab', 'tn' , ':tabmove +1' }, + { 'New Tab', 'tt' , ':tabnew' }, + { '', ',' , '' }, + { 'Next Buffer', ']' , ':bnext' }, + { 'Prev Buffer', '[' , ':bprevious' }, + { '', '-' , '20<' }, + { '', '=' , '20>' }, + { '', 'A' , ':LspStart()' }, + { '', 'a' , ':LspStop()' }, + { '', 'B' , ':ls:b' }, + { '', 'b' , ':Buffers' }, + { '+ Line Len Indicator', 'cC' , ':call TogCC' }, + { '+ CursorLine', 'cc' , ':set nocul!' }, + { 'Checkhealth', 'CH' , ':checkhealth' }, + { 'Delete Buffer', 'D' , ':bd' }, + { 'Find Space EOL', 'df' , ':%s/\\s\\+\\ze$//gc' }, + { '+ CursorColumn', 'e' , ':set cuc!' }, + { 'Edit File CWD', 'E' , ':call feedkeys(":e " . FilePathFull() . "/")' }, + { 'Wrap!', 'f' , ':set wrap!' }, + { 'New File', 'g' , ':enew' }, + { 'Print Mappings', 'Gm' , ':call GMaps()' }, + { '+ Statusline', 'h' , ':call TogSL()' }, + { 'Helpgrep', 'H' , ':vert helpgrep ' }, + { 'Open diagnostics', 'i' , ':lua vim.diagnostic.open_float(nil, {focus=true, scope="cursor")'}, + { '+ lsp_lines', 'I' , ':lua require("lsp_lines").toggle()' }, + { 'Next Scheme', 'j' , ':call SetColScheme(+1)' }, + { 'Prev Scheme', 'J' , ':call SetColScheme(-1)' }, + { '', 'k' , ':call CorrectColors()' }, + { '', 'l' , ':call CyBack(+1)'}, + { '', 'L' , ':call CyBack(-1)'}, + { '', 'M' , ':messages' }, + { '', 'N' , ':cnext' }, + { '', 'n' , ':next' }, + { '', 'ob' , ':silent !"${BROWSER:-"brave"}" %' }, + { '', 'oq' , ':silent !"qutebrowser" %' }, + { '', 'q' , ':bd' }, + { '', 's' , ':source ~/.config/nvim/init.vim'}, + { '', 'T' , ':term' }, + { '', 'u' , ':Lf' }, + { '', 'vv' , ':TogVE()' }, + -- { '', 'W' , ':call Web("f")i'}, + { '', 'W' , 'VimwikiIndex' }, + { '', 'w' , ':w' }, + { '', 'X' , ':!%:p ' }, + { '', 'x' , ':!%:p' }, + { '', 'y' , ':hi Normal guibg=Transparent'}, + { '', 'ZC' , ':bd' }, + { '', 'z' , 'z' }, +} + + + +for _, map in ipairs(leader_nnoremap) do + vim.keymap.set('n', l .. map[2], map[3]) +end + + + + + + diff --git a/nvim/lua/mytreesitter.lua b/nvim/lua/mytreesitter.lua index 7a9acf0..945ff83 100644 --- a/nvim/lua/mytreesitter.lua +++ b/nvim/lua/mytreesitter.lua @@ -26,7 +26,10 @@ treesitter.setup { -- the name of the parser) -- list of language that will be disabled - disable = { "txt", "help", "vimdoc", "vim", "doc", "man" }, + disable = function(_, bufnr) -- Disable in large buffers + return vim.api.nvim_buf_line_count(bufnr) > 2000 + end, + -- disable = { "txt", "help", "vimdoc", "vim", "doc", "man" }, -- disable = {}, -- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files diff --git a/nvim/plugins.vim b/nvim/plugins.vim index afcd0a3..ff4db3d 100644 --- a/nvim/plugins.vim +++ b/nvim/plugins.vim @@ -1,47 +1,55 @@ let g:my_plugins = { -\ "luasnip": [ 'L3MON4D3', 'LuaSnip' ], -\ "cmp": [ 'hrsh7th', 'cmp-nvim-lsp' ], -\ "cmp buffer": [ 'hrsh7th', 'cmp-buffer' ], -\ "cmp cmdline": [ 'hrsh7th', 'cmp-cmdline' ], -\ "cmp env": [ 'SergioRibera', 'cmp-dotenv' ], -\ "cmp luasnip": [ 'saadparwaiz1', 'cmp_luasnip' ], -\ "cmp path": [ 'hrsh7th', 'cmp-path' ], + \ "luasnip": [ 'L3MON4D3', 'LuaSnip' ], + \ "cmp": [ 'hrsh7th', 'cmp-nvim-lsp' ], + \ "cmp buffer": [ 'hrsh7th', 'cmp-buffer' ], + \ "cmp cmdline": [ 'hrsh7th', 'cmp-cmdline' ], + \ "cmp env": [ 'SergioRibera', 'cmp-dotenv' ], + \ "cmp luasnip": [ 'saadparwaiz1', 'cmp_luasnip' ], + \ "cmp path": [ 'hrsh7th', 'cmp-path' ], \ -\ "devicons": [ 'nvim-tree', 'nvim-web-devicons' ], -\ "elixir": [ 'elixir-tools', 'elixir-tools.nvim' ], -\ "elixirfiledetect": [ 'elixir-editors', 'vim-elixir' ], -\ "floatterm": [ 'voldikss', 'vim-floaterm' ], -\ "fzf": [ 'junegunn', 'fzf.vim' ], -\ "git": [ 'lewis6991', 'gitsigns.nvim' ], -\ "lf": [ 'ptzz', 'lf.vim' ], + \ "devicons": [ 'nvim-tree', 'nvim-web-devicons' ], + \ "elixir": [ 'elixir-tools', 'elixir-tools.nvim' ], + \ "elixirfiledetect": [ 'elixir-editors', 'vim-elixir' ], + \ "floatterm": [ 'voldikss', 'vim-floaterm' ], + \ "fzf": [ 'junegunn', 'fzf.vim' ], + \ "git": [ 'lewis6991', 'gitsigns.nvim' ], + \ "lf": [ 'ptzz', 'lf.vim' ], \ -\ "lisp paredit": [ 'vim-scripts', 'paredit.vim' ], -\ "lisp vlime": [ 'vlime', 'vlime', {'rtp': 'vim/'} ], + \ "lisp paredit": [ 'vim-scripts', 'paredit.vim' ], + \ "lisp vlime": [ 'vlime', 'vlime', + \{'rtp': 'vim/'} ], \ -\ "live preview html": [ 'turbio', 'bracey.vim', {'do': 'npm install --prefix server'} ], + \ "live preview html": [ 'turbio', 'bracey.vim', + \{'do': 'npm install --prefix server'} ], \ -\ "lspconfig": [ 'neovim', 'nvim-lspconfig' ], -\ "lsp lines": [ 'maan2003', 'lsp_lines.nvim' ], -\ "lsp saga": [ 'nvimdev', 'lspsaga.nvim' ], -\ "lsp statusline": [ 'nvim-lua', 'lsp-status.nvim' ], + \ "lspconfig": [ 'neovim', 'nvim-lspconfig' ], + \ "lsp lines": [ 'maan2003', 'lsp_lines.nvim' ], + \ "lsp saga": [ 'nvimdev', 'lspsaga.nvim' ], + \ "lsp statusline": [ 'nvim-lua', 'lsp-status.nvim' ], \ -\ "markdown preview": [ 'iamcco', 'markdown-preview.nvim', { 'do': 'cd app && yarn install' } ], -\ "marks": [ 'chentoast', 'marks.nvim' ], -\ "neoterm": [ 'kassio', 'neoterm' ], -\ "nui": [ 'MunifTanjim', 'nui.nvim' ], -\ "nvim cmp": [ 'hrsh7th', 'nvim-cmp' ], -\ "orgmode": [ 'nvim-orgmode', 'orgmode' ], -\ "plenary": [ 'nvim-lua', 'plenary.nvim' ], -\ "restore view": [ 'vim-scripts', 'restore_view.vim' ], -\ "show key hints": [ 'folke', 'which-key.nvim' ], -\ "tokyonight": [ 'folke', 'tokyonight.nvim' ], + \ "markdown preview": [ 'iamcco', 'markdown-preview.nvim', + \{ 'do': 'cd app && yarn install' } ], + \ "marks": [ 'chentoast', 'marks.nvim' ], + \ "neoterm": [ 'kassio', 'neoterm' ], + \ "nui": [ 'MunifTanjim', 'nui.nvim' ], + \ "nvim cmp": [ 'hrsh7th', 'nvim-cmp' ], + \ "orgmode": [ 'nvim-orgmode', 'orgmode' ], + \ "plenary": [ 'nvim-lua', 'plenary.nvim' ], + \ "restore view": [ 'vim-scripts', 'restore_view.vim' ], + \ "show key hints": [ 'folke', 'which-key.nvim' ], + \ "tokyonight": [ 'folke', 'tokyonight.nvim' ], \ -\ "treesitter": [ 'nvim-treesitter', 'nvim-treesitter', {'do': ':TSUpdate'} ], -\ "treesitter-extra": [ 'nvim-treesitter', 'nvim-treesitter-textobjects' ], + \ "treesitter": [ 'nvim-treesitter', 'nvim-treesitter', + \{'do': ':TSUpdate'} ], + \ "treesitter-extra": [ 'nvim-treesitter', 'nvim-treesitter-textobjects' ], \ -\ "i3 syntax": [ 'PotatoesMaster', 'i3-vim-syntax' ], -\ "lf syntax": [ 'VebbNix', 'lf-vim' ], + \ "i3 syntax": [ 'PotatoesMaster', 'i3-vim-syntax' ], + \ "lf syntax": [ 'VebbNix', 'lf-vim' ], +\ + \ "vimwiki": [ 'vimwiki', 'vimwiki' ], + \ 'luarocks for nvim': [ 'theHamsta', 'nvim_rocks', + \{'do': 'pipx install hererocks && python3 -mhererocks . -j2.1.0-beta3 -r3.0.0 && cp nvim_rocks.lua lua'}], \} "vim closetag": [ 'alneotermvan', 'vim-closetag' ], diff --git a/xorg/Xresources b/xorg/Xresources index e95cadf..3924d8a 100644 --- a/xorg/Xresources +++ b/xorg/Xresources @@ -280,7 +280,7 @@ Zutty.border: 5px !!!!ON!!!!!!!!! !*.shading: 20 !*.alphaOffset: 0.1 -i3wm.browser: firefox +i3wm.browser: brave i3wm.BORDER_FILE: borders/border_flash.conf i3wm.IN_GAPS: 10 diff --git a/zathura/zathurarc b/zathura/zathurarc index bfc6e13..0381d22 100644 --- a/zathura/zathurarc +++ b/zathura/zathurarc @@ -9,7 +9,7 @@ set n-completion-items 20 set page-padding 0 set pages-per-row 1 - set sandbox none + #set sandbox none #set sandbox strict set scroll-step 100 set selection-clipboard clipboard