From 67b83113ae6a52ff94ffd08d1e2cc2b61a615c00 Mon Sep 17 00:00:00 2001 From: yannickreiss Date: Sat, 16 Sep 2023 15:39:27 +0200 Subject: [PATCH] Major update --- UltiSnips/c.snippets | 22 ++++++++++------------ UltiSnips/rust.snippets | 22 +++++++++++++++------- UltiSnips/tex.snippets | 2 +- init.lua | 5 +++-- lua/code-completion.lua | 10 +++++----- lua/plugins.lua | 6 +++--- spell/de.utf-8.add | 20 ++++++++++++++++++++ spell/de.utf-8.add.spl | Bin 399 -> 791 bytes spell/en.utf-8.add | 9 +++++++++ spell/en.utf-8.add.spl | Bin 93 -> 214 bytes viml/legacyconf.vim | 2 +- 11 files changed, 67 insertions(+), 31 deletions(-) diff --git a/UltiSnips/c.snippets b/UltiSnips/c.snippets index fa9028e..3dcd0e8 100644 --- a/UltiSnips/c.snippets +++ b/UltiSnips/c.snippets @@ -45,16 +45,15 @@ endsnippet snippet pfun "prototype for function" bA /** - * $2 -> $1 + * @name $2 * @return $1 - * @brief Description: - * ${4: Description} - * @param Parameter:`!p -params = t[3].split(", ") + * @brief ${4: Description} + * `!p +params = t[3].replace(", ", ",").split(",") rval = "" for param in params: if len(param.split(' ')) >= 2: - rval += f"\n *\t\t{param}:\t{t[2]}_{param.split(' ')[1]}" + rval += f"\n *\t@param {param}:\t{t[2]}_{param.split(' ')[1]}" snip.rv = rval` */ ${1:int} ${2:MyFunc} (${3:void}); @@ -62,16 +61,15 @@ endsnippet snippet exfun "New Function with Documentation" /** - * $2 -> $1 + * @name $2 * @return $1 - * @brief Description: - * ${4: Description} - * @param Parameter:`!p -params = t[3].split(",") + * @brief ${4: Description} + * `!p +params = t[3].replace(", ", ",").split(",") rval = "" for param in params: if len(param.split(' ')) >= 2: - rval += f"\n *\t\t{param}:\t{t[2]}_{param.split(' ')[1]}" + rval += f"\n *\t@param {param}:\t{t[2]}_{param.split(' ')[1]}" snip.rv = rval` */ ${1:int} ${2:MyFunc} (${3:void}) { diff --git a/UltiSnips/rust.snippets b/UltiSnips/rust.snippets index 779c83a..0d6d635 100644 --- a/UltiSnips/rust.snippets +++ b/UltiSnips/rust.snippets @@ -1,6 +1,8 @@ snippet fn "function declaration" i -// $3 $1 -// ${4:Description} +// @name $1 +// @return $3 +// @brief ${4:Description} +// @param $2 fn $1($2) `!p if t[3] == "": snip.rv = "" @@ -11,7 +13,14 @@ else: $0 endsnippet -snippet struct "struct declaration" +snippet doxygen "Doxygen comment" b +// @name ${1:name} +// @return ${2:Return type} +// @param ${3:Parameter} +// @brief ${4:Description} +endsnippet + +snippet struct "struct declaration" // $1 // ${2:Description} struct ${1:Name} { @@ -20,7 +29,7 @@ struct ${1:Name} { $0 endsnippet -snippet impl "implement struct" +snippet impl "implement struct" // Implementation of $1 // ${2:Desciption} impl ${1:struct} { @@ -29,7 +38,7 @@ impl ${1:struct} { $0 endsnippet -snippet for "for-loop" +snippet for "for-loop" for ${1:i} in ${2:$3..$4} { $5 }$0 @@ -52,7 +61,7 @@ def create_parameter_placeholders(snip): if placeholders_amount > 0: anon_snippet_body = anon_snippet_body + ', ' - + anon_snippet_body = anon_snippet_body + ', '.join(['$' + str(i+1) for i in range(placeholders_amount, 2*placeholders_amount)]) + ");" snip.expand_anon(anon_snippet_body) @@ -66,4 +75,3 @@ endsnippet snippet println "println" A println!("$1");$0 endsnippet - diff --git a/UltiSnips/tex.snippets b/UltiSnips/tex.snippets index 503a9a7..2282d97 100644 --- a/UltiSnips/tex.snippets +++ b/UltiSnips/tex.snippets @@ -149,7 +149,7 @@ snippet fquote "Full Quote" endsnippet snippet href "html reference" -\\href{https://${1:link}}{\\underline{\\textcolor{blue}{${2:Text}}}}$0 +\\href{${1:link}}{\\underline{\\textcolor{blue}{${2:Text}}}}$0 endsnippet snippet *_ "Intervall/Isotope-Notation" i diff --git a/init.lua b/init.lua index 28461f3..2fda60f 100644 --- a/init.lua +++ b/init.lua @@ -21,7 +21,8 @@ vim.opt.guifont = "DroidSansMono Nerd Font 11" -- set color scheme vim.opt.termguicolors = true vim.cmd([[ -colorscheme tokyonight-night +let g:vim_monokai_tasty_italic = 1 +colorscheme vim-monokai-tasty ]]) -- vim.cmd('source ~/.config/nvim/viml/plugins.vim') @@ -35,7 +36,7 @@ vim.g.UltiSnipsEditSplit = "vertical" vim.g.UltiSnipsSnippetDirectories = { "~/.config/nvim/UltiSnips" } -- indentLine config -vim.g.indentLine_char = "┆" +vim.g.indentLine_char = "•" -- NERDTree Config vim.g.NERDTreeShowHidden = 1 diff --git a/lua/code-completion.lua b/lua/code-completion.lua index be7505e..6ec690e 100644 --- a/lua/code-completion.lua +++ b/lua/code-completion.lua @@ -24,9 +24,9 @@ cmp.setup({ -- mapping mapping = cmp.mapping.preset.insert({ -- Shift+TAB to go to the Previous Suggested item - [""] = cmp.mapping.select_prev_item(), + [""] = cmp.mapping.select_prev_item(), -- Tab to go to the next suggestion - [""] = cmp.mapping.select_next_item(), + [""] = cmp.mapping.select_next_item(), -- CTRL+SHIFT+f to scroll backwards in description [""] = cmp.mapping.scroll_docs(-4), -- CTRL+F to scroll forwards in the description @@ -34,7 +34,7 @@ cmp.setup({ -- CTRL+SPACE to bring up completion at current Cursor location [""] = cmp.mapping.complete(), -- CTRL+e to exit suggestion and close it - [""] = cmp.mapping.close(), -- TODO: Search better option + [""] = cmp.mapping.close(), -- TODO: Search better option -- CR (enter or return) to CONFIRM the currently selection suggestion -- We set the ConfirmBehavior to insert the Selected suggestion [""] = cmp.mapping.confirm({ @@ -48,8 +48,8 @@ cmp.setup({ { name = "path" }, { name = "nvim_lsp", keyword_length = 1 }, { name = "nvim_lsp_signature_help" }, - { name = "nvim_lua", keyword_length = 2 }, - { name = "buffer", keyword_length = 4 }, + { name = "nvim_lua", keyword_length = 1 }, + { name = "buffer", keyword_length = 2 }, { name = "ultisnips", keyword_length = 1 }, { name = "calc" }, { name = "lua-latex-symbols", option = { cache = true } }, diff --git a/lua/plugins.lua b/lua/plugins.lua index eef0dc0..34d2924 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -5,9 +5,9 @@ return require("packer").startup(function(use) use("Xuyuanp/nerdtree-git-plugin") use("tpope/vim-surround") use("SirVer/ultisnips") - use("powerline/powerline") + use("powerline/powerline") use("vim-airline/vim-airline") - use("vim-airline/vim-airline-themes") + use("vim-airline/vim-airline-themes") use({ "nvim-treesitter/nvim-treesitter", run = function() @@ -23,7 +23,6 @@ return require("packer").startup(function(use) use("mfussenegger/nvim-dap") use("f-person/git-blame.nvim") use("mfussenegger/nvim-lint") - use("lewis6991/gitsigns.nvim") use("p00f/nvim-ts-rainbow") use("cohama/lexima.vim") use("hrsh7th/nvim-cmp") @@ -47,4 +46,5 @@ return require("packer").startup(function(use) use("mhartington/formatter.nvim") use("tzachar/highlight-undo.nvim") use("folke/tokyonight.nvim") + use("patstockwell/vim-monokai-tasty") end) diff --git a/spell/de.utf-8.add b/spell/de.utf-8.add index 68dcc02..a15daaf 100644 --- a/spell/de.utf-8.add +++ b/spell/de.utf-8.add @@ -37,3 +37,23 @@ Jacobideterminante Chlorionen Coulombkraft Coulomb'schen +Youtube +Whiteboard +DuckDuckGo +duckduckgo +Ecosia +ecosia +DOSB +https +www +org +search +method +index +com +Scherenschlag +ausschwimmen +Gewöhnungsübung +Scherenschlages +Theorieteil +Whatsapp diff --git a/spell/de.utf-8.add.spl b/spell/de.utf-8.add.spl index a35e38efe66b2dd142cb3bc68fa3803f6e365941..366a4c529ab324375926784addee64f740bf2a4c 100644 GIT binary patch literal 791 zcmX|9v2GMG5cSO7FMt$&$G>BD_lT?kiyjNw-=?6BLr$8qvs=CH)H=2DN(Tn|(!k>OIQ(2gcL zlBWfqBQjRC*?(ka?tuh1HYM72ib=S z8!SBvOJ6tECGjGG;~CT4NdpT!qK^aI&9sLJnMX=&_#4&5e7sS74&`3l^VLj{k&aqSFiy019DQpYJ3bodSub3C8pm2SHXHgvxOTFTswHi?Y z;(KJDWN{fFEN!xw1r`Bxu%e`WXoR0_XPpO5nh#7jlA*V`pkodQ$;tu1_b{@pAi}ag zfhs}u380J~TEGO78RL1Z2-U-O&vQ^SS;o7-R<#G|Cl_ozhK=_W;@me>lr)+{dIsXCZ0Nr1cHe_qaPHmbS$I9nU-+ u*~;50sOy#VDcpc8F@PTJbw(vn3r^eNZ!f6`4$)y@cRp|*pNd2 literal 399 zcmXX?K~BUl42)eKzyYm#?uqLn@c@pCw9=lqhh1+QHAzd-g6NgU@JnEvkV8BkkDYN| z4#zx;_Yc3un4eqwdcIuy!Hqt|Ipu|yl@^-F;2sbYF_Wj2$e310IA&Bdafp1wR%+e} zkD&LP7CTF#@h-4S3Z8lpg=*t}X+)n;AgA^FjoqYR=P8mtVG&gjVL?dSQSChBwxHNp z5YOVEKEo=MO%LWHW%w27lwHx^tNu&aE*PjoHjJF`@;hXSt{6Bd|DAaB3UBIYGy>J5D?ilD7>o2Ru++U%StOSQB3{S>rulFDVuvH&uOWwD$o4OU2-gRXxhKy6 delta 33 ocmcb{7%Lv;>04Zonv-MnpMilvm8qnZ(SVVGF=t|d?8LR20ISvsy#N3J diff --git a/viml/legacyconf.vim b/viml/legacyconf.vim index c3c3b2d..a36b4b6 100644 --- a/viml/legacyconf.vim +++ b/viml/legacyconf.vim @@ -38,7 +38,7 @@ nnoremap :call Litde() " Theme nnoremap :colo morning -nnoremap :colo tokyonight-night +nnoremap :colo vim-monokai-tasty " Fuzzy finder nnoremap :Lines