diff --git a/.config/latexindent/latexindent.yaml b/.config/latexindent/latexindent.yaml new file mode 100644 index 0000000..355458e --- /dev/null +++ b/.config/latexindent/latexindent.yaml @@ -0,0 +1,24 @@ +defaultIndent: ' ' +indentAfterItems: + itemize: 1 + itemize*: 1 + enumerate: 1 + enumerate*: 1 +indentRules: + item: 1 +noAdditionalIndentGlobal: + item: 1 +indentAfterHeadings: + textit: + indentAfterThisHeading: 1 + level: 1 + footnote: + indentAfterThisHeading: 1 + level: 1 +noAdditionalIndent: + textit: 1 + footnote: 1 +removeTrailingWhitespace: + beforeProcessing: 0 + afterProcessing: 1 +indentPreamble: 1 diff --git a/.config/nvim/lua/dictionaries/dictionary_de-de.txt b/.config/nvim/lua/dictionaries/dictionary_de-de.txt index 2c81305..fb10657 100644 --- a/.config/nvim/lua/dictionaries/dictionary_de-de.txt +++ b/.config/nvim/lua/dictionaries/dictionary_de-de.txt @@ -5,6 +5,7 @@ Crowd-Interaction Destruction Dictation Entlebucher Sennenhund +Formatter Französischvokabeln Genervtheit Gestresstheit diff --git a/.config/nvim/lua/dictionaries/dictionary_names.txt b/.config/nvim/lua/dictionaries/dictionary_names.txt index 813a00f..5df0614 100644 --- a/.config/nvim/lua/dictionaries/dictionary_names.txt +++ b/.config/nvim/lua/dictionaries/dictionary_names.txt @@ -30,6 +30,7 @@ FIDO-Stick Forest Frevert Freverts +GrapheneOS Greater Grixis Gump @@ -41,6 +42,7 @@ Higgers IFAM IFAMs IMRaD +Ikigai Int Ira Jeanine @@ -58,10 +60,12 @@ Matvey MiiMii Mint Nate +NeoVIM Númenor Oberweseler Overwatch Papis +PfingstAka Pluribus PopOS Precon @@ -77,6 +81,7 @@ Stina TCAV Thinkpad Tjark +VIM Weizman Willenborg WinterAka diff --git a/.config/nvim/lua/plugins/conform.lua b/.config/nvim/lua/plugins/conform.lua index 0ceb713..e26f28b 100644 --- a/.config/nvim/lua/plugins/conform.lua +++ b/.config/nvim/lua/plugins/conform.lua @@ -8,24 +8,13 @@ return { lua = { "stylua" }, markdown = { "mdformat" }, python = { "isort", "yapf" }, - sh = { "beautysh" }, - shell = { "beautysh" }, + sh = { "shfmt" }, + bash = { "shfmt" }, + zsh = { "shfmt" }, tex = { "latexindent" }, yaml = { "yamlfmt" }, }, }) - require("conform").formatters.latexindent = { - args = require("conform.util").extend_args( - require("conform.formatters.latexindent").args, - { "-y=defaultIndent: ' '" } - ), - } - require("conform").formatters.beautysh = { - args = require("conform.util").extend_args( - require("conform.formatters.beautysh").args, - { "--indent-size=2", "--force-function-style=fnpar" } - ), - } end, }, } diff --git a/.config/nvim/lua/plugins/mason.lua b/.config/nvim/lua/plugins/mason.lua index fa1beda..2c7a280 100644 --- a/.config/nvim/lua/plugins/mason.lua +++ b/.config/nvim/lua/plugins/mason.lua @@ -1,15 +1,15 @@ return { -- lang server installations { - 'williamboman/mason.nvim', + "williamboman/mason.nvim", dependencies = { { - 'nvimtools/none-ls.nvim', + "nvimtools/none-ls.nvim", config = function() require("null-ls").setup({ sources = { - -- latex - -- require("null-ls").builtins.formatting.latexindent, + -- assembler + require("null-ls").builtins.formatting.asmfmt, -- lua require("null-ls").builtins.formatting.stylua, -- markdown @@ -18,20 +18,20 @@ return { require("null-ls").builtins.formatting.isort, require("null-ls").builtins.formatting.yapf, -- shell - -- require("null-ls").builtins.formatting.beautysh, + require("null-ls").builtins.formatting.shfmt, -- yaml require("null-ls").builtins.formatting.yamlfmt, - } + }, }) - end + end, }, { - 'jay-babu/mason-null-ls.nvim', + "jay-babu/mason-null-ls.nvim", opts = { automatic_installation = true, ensure_installed = { - -- latex - "latexindent", + -- assembler + "asmfmt", -- lua "stylua", -- markdown @@ -40,13 +40,13 @@ return { "isort", "yapf", -- shell - "beautysh", + "shfmt", -- yaml "yamlfmt", - } - } + }, + }, }, }, - opts = { ui = { icons = Install_signs } } - } + opts = { ui = { icons = Install_signs } }, + }, } diff --git a/.config/nvim/lua/plugins/nvim-lspconfig.lua b/.config/nvim/lua/plugins/nvim-lspconfig.lua index 8a2d8fd..92657a2 100644 --- a/.config/nvim/lua/plugins/nvim-lspconfig.lua +++ b/.config/nvim/lua/plugins/nvim-lspconfig.lua @@ -24,22 +24,40 @@ return { require("mason-lspconfig").setup({ automatic_setup = true, ensure_installed = { - "bashls", + -- assembler + "asm_lsp", + -- c "clangd", + -- docker "dockerls", + -- go "gopls", + -- html "html", + -- json "jsonls", + -- xml "lemminx", + -- latex "ltex", - "lua_ls", - "marksman", - "nimls", - "pyright", - "r_language_server", - "sqlls", "texlab", - -- "tsserver", + -- lua + "lua_ls", + -- markdown + "marksman", + -- nim + "nimls", + -- python + "pyright", + -- r + "r_language_server", + -- shell + "bashls", + -- sql + "sqlls", + -- typescript / javascript + "ts_ls", + -- yaml "yamlls", }, }) diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc index edc491f..1515149 100644 --- a/.config/vifm/vifmrc +++ b/.config/vifm/vifmrc @@ -223,7 +223,7 @@ filextype *.svg \ inkview %f, " Audio -filetype *.wav,*.mp3,*.flac,*.m4a,*.wma,*.ape,*.ac3,*.og[agx],*.spx,*.opus +filetype *.wav,*.mp3,*.flac,*.m4a,*.wma,*.ape,*.ac3,*.og[agx],*.spx,*.opus,*.aac \ {Play using mpv} \ mpv %c, \ {Play using ffplay} @@ -438,9 +438,9 @@ set classify+=' ::../::, ::*.sh::, ::*.[hc]pp::, ::*.[hc]::, " archives set classify+=' ::*.7z,,*.ace,,*.arj,,*.bz2,,*.cpio,,*.deb,,*.dz,,*.gz,,*.jar,,*.lzh,,*.lzma,,*.rar,,*.rpm,,*.rz,,*.tar,,*.taz,,*.tb2,,*.tbz,,*.tbz2,,*.tgz,,*.tlz,,*.trz,,*.txz,,*.tz,,*.tz2,,*.xz,,*.z,,*.zip,,*.zoo::' " images -set classify+=' ::*.bmp,,*.gif,,*.jpeg,,*.jpg,,*.ico,,*.png,,*.ppm,,*.svg,,*.svgz,,*.tga,,*.tif,,*.tiff,,*.xbm,,*.xcf,,*.xpm,,*.xspf,,*.xwd::' +set classify+=' ::*.bmp,,*.gif,,*.jpeg,,*.jpg,,*.ico,,*.png,,*.ppm,,*.svg,,*.svgz,,*.tga,,*.tif,,*.tiff,,*.xbm,,*.xcf,,*.xpm,,*.xspf,,*.xwd,,*.webp::' " audio -set classify+=' ::*.aac,,*.anx,,*.asf,,*.au,,*.axa,,*.flac,,*.m2a,,*.m4a,,*.mid,,*.midi,,*.mp3,,*.mpc,,*.oga,,*.ogg,,*.ogx,,*.ra,,*.ram,,*.rm,,*.spx,,*.wav,,*.wma,,*.ac3::' +set classify+=' ::*.aac,,*.anx,,*.asf,,*.au,,*.axa,,*.flac,,*.m2a,,*.m4a,,*.mid,,*.midi,,*.mp3,,*.mpc,,*.oga,,*.ogg,,*.ogx,,*.ra,,*.ram,,*.rm,,*.spx,,*.wav,,*.wma,,*.ac3,,*.opus,,*.aac::' " media set classify+=' ::*.avi,,*.ts,,*.axv,,*.divx,,*.m2v,,*.m4p,,*.m4v,,.mka,,*.mkv,,*.mov,,*.mp4,,*.flv,,*.mp4v,,*.mpeg,,*.mpg,,*.nuv,,*.ogv,,*.pbm,,*.pgm,,*.qt,,*.vob,,*.wmv,,*.xvid::' " office files diff --git a/.indentconfig.yaml b/.indentconfig.yaml new file mode 100644 index 0000000..a3b710f --- /dev/null +++ b/.indentconfig.yaml @@ -0,0 +1,2 @@ +paths: + - /home/user/.config/latexindent/latexindent.yaml diff --git a/.local/bin/etc/nvim/compiler b/.local/bin/etc/nvim/compiler index 690216e..e70ca77 100755 --- a/.local/bin/etc/nvim/compiler +++ b/.local/bin/etc/nvim/compiler @@ -26,27 +26,30 @@ textype() { \ } case "$file" in - *\.vpr) $vipercmd "$file" ;; - *\.ms) refer -PS -e "$file" | groff -me -ms -kept -T pdf > "$base".pdf ;; - *\.mom) refer -PS -e "$file" | groff -mom -kept -T pdf > "$base".pdf ;; *\.[0-9]) refer -PS -e "$file" | groff -mandoc -T pdf > "$base".pdf ;; - *\.rmd) echo "require(rmarkdown); render('$file')" | R -q --vanilla ;; - *\.m) octave -qW "$file" ;; - *\.md) pandoc "$file" --pdf-engine=xelatex -o "$base".pdf ;; - *config.h) sudo make install ;; - *\.tex) textype "$file" ;; - *\.java) java "$file" ;; - *\.js) node "$file" ;; - *\.c) if [ -f Makefile ]; then make run; else cc "$file" -o "$base" && "$base"; fi ;; - *\.nim) nim c -r -d:noColors "$file" ;; - *\.py) python3 "$file" ;; + *\.bash) bash "$file" ;; *\.go) go run "$file" ;; *\.lua) lua "$file" ;; + *\.md) pandoc "$file" --pdf-engine=xelatex -o "$base".pdf ;; + *\.mom) refer -PS -e "$file" | groff -mom -kept -T pdf > "$base".pdf ;; + *\.ms) refer -PS -e "$file" | groff -me -ms -kept -T pdf > "$base".pdf ;; + *\.py) python3 "$file" ;; + *\.rmd) echo "require(rmarkdown); render('$file')" | R -q --vanilla ;; *\.sent) setsid sent "$file" 2>/dev/null & ;; + *config.h) sudo make install ;; + *\.c) if [ -f Makefile ]; then make run; else cc "$file" -o "$base" && "$base"; fi ;; + *\.java) java "$file" ;; + *\.js) node "$file" ;; + *\.m) octave -qW "$file" ;; + *\.nim) nim c -r -d:noColors "$file" ;; *\.r|*\.R) Rscript "$file" ;; - *\.smt2) z3 "$file" ;; *\.rs) (cd "$dir" && cargo locate-project >/dev/null 2>&1) \ && (cd "$(dirname "$(cd "$dir" && cargo locate-project --message-format plain)")" && cargo run) \ || (rustc "$file" && "./$(basename "${file%.rs}")") ;; + *\.sh) dash "$file" ;; + *\.smt2) z3 "$file" ;; + *\.tex) textype "$file" ;; + *\.vpr) $vipercmd "$file" ;; + *\.zsh) zsh "$file" ;; *) sed 1q "$file" | grep "^#!/" | sed "s/^#!//" | xargs -r -I % "$file" ;; esac