From fcd370fa7e7297b6fbfccc4fc2a9786961498f07 Mon Sep 17 00:00:00 2001 From: PlexSheep Date: Sat, 20 Jan 2024 17:26:50 +0100 Subject: [PATCH] fix noice conflict --- lua/custom/init.lua | 2 +- lua/custom/plugins.lua | 10 +++++----- spell/en.utf-8.add | 20 ++++++++++++++++++++ spell/en.utf-8.add.spl | Bin 3203 -> 3368 bytes 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/lua/custom/init.lua b/lua/custom/init.lua index 13a9de4..75bd82e 100644 --- a/lua/custom/init.lua +++ b/lua/custom/init.lua @@ -7,7 +7,7 @@ opt.spelllang = "en,de" opt.clipboard = "" -- don't just use the system clipboard opt.wrap = false opt.breakindent = false -opt.spell = true +opt.spell = false opt.list = true opt.conceallevel = 2 opt.undofile = true diff --git a/lua/custom/plugins.lua b/lua/custom/plugins.lua index c42e0f0..8547376 100644 --- a/lua/custom/plugins.lua +++ b/lua/custom/plugins.lua @@ -312,9 +312,7 @@ local plugins = { "folke/noice.nvim", enabled = not vim.g.started_by_firenvim, event = "VeryLazy", - opts = { - -- add any options here - }, + -- config.lsp.signature.enabled = false dependencies = { -- if you lazy-load any plugin below, make sure to add proper `module="..."` entries "MunifTanjim/nui.nvim", @@ -326,13 +324,15 @@ local plugins = { config = function() require("noice").setup { lsp = { - -- override markdown rendering so that **cmp** and other plugins use **Treesitter** override = { ["vim.lsp.util.convert_input_to_markdown_lines"] = true, ["vim.lsp.util.stylize_markdown"] = true, ["cmp.entry.get_documentation"] = true, - ["hover.enabled"] = false, }, + -- IDK how to disable the nvchad builtins for this, which would + -- produce a conflict + signature = { enabled = false }, + hover = { enabled = false }, }, -- you can enable a preset for easier configuration presets = { diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index 47c8f62..38ee409 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -240,3 +240,23 @@ Parth Narula wordpress PlexSheep's +nvchad +IDK +lazyloading +nv +ftplugins +stylua +nvim +lsp +builtins +cmdline +popupmenu +󰈻 +󰈼 +󰈽 +󰈾 +󰈿 +󰉀 +#m +ufo +treesitter diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl index 5282ec5bcef1d9ba905e838e199edb7852e667cc..36d14d9cf7bd41792f91405b67052efda1f13ce0 100644 GIT binary patch literal 3368 zcmYjTJ8T@+6`gx$Ny&{OqzDM9^8!{YQKqcVxR6995Q4Q7lZt`BurNC_J3HFhnbmxj zTvZBSfDW7@K;XDq7zkV$2I0nlW66$SH7SUc>4+4GZGbLasFQupeJk2raOTZ>@BYs{ z@BRKpubw1%zWRgb9e?$7*pK35kPfrEqkLSHlY3R&wA1a`{r`Wz?5)K`)rhLZQb{5; zex+233D4`+(nyYZPs6c9GL%9v9fUHKS41E9NnT?*k_&Q{3%!dHnuZK-$`^Q#@xKP` z`2Owca@bF@yw#|d5v&z%9(EFpGV>sUO?V(P(T-V*G^Ae*%x7+Y;3P9irG<_ZtD*E| z0I3jPw46X=gMWK6Gagtb9zT3D?X!47w@S3(H4^=tuCF+0tLKU_k^KNQU%OsdJyIFsXe+^=69| zR+(E1$W5eHPahz6n3-?$dB_|tV(yj*iJ7NPEB$VYk=62Yay*Iwr>fbZ<#`liCkG+c zZPW`jW*IPv5LnjCT&D||>&^fTyn7MC7{d+4ycwC7aG`I>W;k&Cvlgzp(8hSPObON@ zy_aj&_=6nL_*4PC1XBa}Ot^jsU_tjueC4o%nQzji5Ez_@h1(4~h=LI^8zvGsY>a4l znE}uRO;a-=00|37J6!k=eRZ(SzyctGZ|_`D@-Ii2a{d)2#g&Nc>Es84l|By%0%hLo0)+kcAME? z1Pd0PRtS}WO`n_pu%4vDm?p^${%z{$Tfz0)%*us*nzCm?c*ka^b%qQRO|ekrLLak+ zCFW1pNbyWlrcLhbx>I9W-e9xw*7!8s*x|EPX3y9!Z>LWb1ZGPuk63+5g1)nTo z^9UXigP45}b#hfrG0`H!gb|6RwPr1?H(Y;0>#4%`B6^r1`w(9awM1{Av~c5tT0t@x z{Dyg}6-Dr#F^SgHd(m<@%FAj7#t9n)=Zc9v0abZjd(KHoJ3IskkjZm^JS(l*2~9nq zA7^wz%@gYvqlTbG(lR8398Ng1fO=Aa1!9YkF}iapyBx}0>>x*yzZRJ}QCUSYSa_-Q zlZyQU*XAu$L_pKfLeT@ZKIxd*nqZBp8|LG?@>rM*hApGoc>)Or)^?(F!m{CGj}){6 z!nac~I0qF^kG!exN&iWQzX&CB85G#)g z?4_kVg6|`68VwNyJYczFvViGNDdP@$-24I;1H_SyCiwgSr#uSTwA(YoB;hSy=W|93 zc3+` za*5l!7wpSXwcZ-xgdMSX#){xZN5tXB1)eK!FxHO|ORsmyIkbF0xRlD?f&t0tScZ zsvWI&u#wi?EeZ3xEH)j6?Lq`K)6NFKOcet%p0nf6KS?rO61sXJ8sQ@o%gu%##A3xp2O;2k6W z#XaYcBIh$BiS4Zl(#lj>YqKxl7;8qx{*P zAK8-*zAc~VJAYc@@F5?M`1pd4FZuWdv2EBU!wt(?FsS-LxXPgW@`J<_?NYyxE!04+`%} z0Ss(mF9jpbXBh54m}fRwoCvydhO1jQiMD&P;plFKSM~;;EY8FgUTNHIgdFmQ`E$e} zD;2&;{Ehqp5>WScA+JG~Q=g!I>u&x^gw*xSo$JukU=KOt`IYS&PMaIH8hiZv5ySO_ Apa1{> literal 3203 zcmZWrJ8T?P6rKBKZKpsGQ6P&7Ernahj+0nRW5*6MS|<=Y1R+t(Z)YbvJF}k8+H0XG zNU}MKsfdG3G zK+KCwNh^R1Bt2+J40WDR6&8(;NY-oYFpoT%LC-)+- zP47XBk>+bTIunGbn4;RF?Qsy|BnKY$b=3AuNUX7lAeg&Eou?C6YmSh9{I&xG(uX4k z>uO}2!v&u~(081X&uchqgX`m$$%(KJ>0_L7J1N3(sR3$PFcnH@=#g> z*`-L+Yrt^^MF@Bd_-cSXj{l_3v}!hDwGzQkYtx5XEr)gp6J7XCS>Hv9hLwa=5eCg!8sGNM?5&j z{-t$B3lr~U6IC|qego-aUyQT^%}Sz;1s6N1>12w~$Rct=FwFzjM+sP1Px5};@WQBS z#AGwBxI3hx0c>h1&of_i)AU2rEr6w`>4WG|V4-RCU8btNgs*XCiqgbLi9($*U=8^o zg;r?)k=n^N(S&zwom(c@fmid&2MYki$9bpiBfh*sx0{7qeU_ekk2&Q$H93n`UN7L1 zVsjY4K~@@8ZzCm4yEBflPyn#hQz?$GWW0AYLh z_-9+&^q8{-S!IuW(X+%4fW&)2$iC-a|+*lDZMZ1EvL&W3tB{$Xf5L);XwnC|^K9%L_^Fn??0Xx zOv>>OSd>fJ-cySO z(L4@G2y~wp0DF;4i;XsC^bFqLPhBrzw};p(CQOT)f-#4(%;U`qI%B=DZhN>LdrY5_ z8z^p)!f_u~64-#qNoAr$vrJQ|I#2$f`%_<1GlWbBnbz90Y|CyikEvCTY7_E~l;_BN zw^2*jTB%(psZEcpK=vdJQL=Fu!vODN8Y@tW?0Oj5s1PMsjxm(tyB&0(eLi62nBt+0 z=~cb~wCz;1qp4DmzbcTlKx3embOzTu{X_rknQ{*YY1h79aNvMhrmL_T8OJsNE0wnc z_D}3>VWH3pZ|Y_C2OZ(+KAb`i{0Zj8aa>-Ri8AeKwpxx8%qI1!oo~9+JT?!o9ru1( z4uPsMiN0ZaF!}6a{{JPV#t$^3D+S!6(>a2ny5ST!8KpP<&aUwj%vtzCMCR}tB2xPdkt6b?t+)b(K!Bm}FOX4fk^Zc*6xmEn#KzKx#Q{&5ej?w= zC-S>|D&NYl@_~G$-(TxD9lYx}^4jw&YwH`ESKqw8wSD7e6r1bYvWWmLLc#i$T*hbe zKApWJE7)2AHLo$gmlgoxP_Dr}%w|ity(U{aUNLLy9JJO|{Pez@U3AyBwRdKh^wsy4 z+&Ja>RasTxRgJ>l4p)E!AHg&b8HjFanOGjb3^**0Z{hd9JkHnKu59Bh1p||gFx-PM zZ%>l0R>d55x38I~mK|BQWHrn8a0O2$H`XlQ6}+S^1Kd=9P8ndfz}!~cyO4moyO~^t mE{s}pkn{nGuD1d}x2f)2#(IS_?D%Kzrd3=H8@d}h{QC!EnO|D~