From a62e8c4a0c71105093d1d8b4ed1f3b422c3599f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20La=C3=ADn?= Date: Thu, 3 Aug 2023 12:04:38 +0200 Subject: [PATCH] nvim config redesign, deleting and modifying a lot of plugins --- ...nelTabs_new_302085663057248267.config.json | 17 +- .../VSCodium/User/globalStorage/state.vscdb | Bin 765952 -> 770048 bytes .../User/globalStorage/state.vscdb.backup | Bin 765952 -> 770048 bytes .../VSCodium/User/globalStorage/storage.json | 74 +++-- .../-1645caa6/globalStorage/state.vscdb | Bin 667648 -> 667648 bytes .../globalStorage/state.vscdb.backup | Bin 667648 -> 667648 bytes .config/VSCodium/User/settings.json | 1 - .config/nvim/LICENSE | 201 +++++++++++++ .config/nvim/README.md | 142 +-------- .config/nvim/lazy-lock.json | 29 +- .config/nvim/lua/config/lazy.lua | 9 +- .config/nvim/lua/config/options.lua | 74 ++--- .config/nvim/lua/plugins/alpha.lua | 19 -- .config/nvim/lua/plugins/blame.lua | 3 - .config/nvim/lua/plugins/bufferline.lua | 48 --- .config/nvim/lua/plugins/catppuccin.lua | 38 --- .config/nvim/lua/plugins/cinnamon.lua | 6 - .config/nvim/lua/plugins/colorizer.lua | 1 + .config/nvim/lua/plugins/colorscheme.lua | 8 +- .config/nvim/lua/plugins/copilot-cmp.lua.bak | 18 -- .config/nvim/lua/plugins/dap-ui.lua | 26 -- .config/nvim/lua/plugins/dap-virtual-text.lua | 6 - .config/nvim/lua/plugins/dap.lua | 188 ------------ .config/nvim/lua/plugins/example.lua | 266 ----------------- .config/nvim/lua/plugins/glance.lua | 8 +- .config/nvim/lua/plugins/glow.lua | 2 +- .config/nvim/lua/plugins/legendary.lua | 11 - .config/nvim/lua/plugins/live-server.lua | 3 +- .config/nvim/lua/plugins/lspconfig.lua | 281 ------------------ .config/nvim/lua/plugins/mason.lua | 81 +---- .config/nvim/lua/plugins/mini-animate.lua.bak | 36 --- .config/nvim/lua/plugins/null-ls.lua | 33 +- .config/nvim/lua/plugins/numb.lua | 6 - .config/nvim/lua/plugins/project.lua | 14 - .config/nvim/lua/plugins/ranger.lua | 3 - .config/nvim/lua/plugins/tabout.lua.bak | 26 -- .config/nvim/lua/plugins/treesitter.lua | 19 -- .config/nvim/lua/plugins/twilight.lua.bak | 23 -- .config/nvim/lua/plugins/undotree.lua | 8 +- .config/nvim/lua/plugins/which-key.lua | 12 - .config/nvim/lua/plugins/xplr.lua.bak | 8 - .config/nvim/stylua.toml | 3 +- 42 files changed, 336 insertions(+), 1415 deletions(-) create mode 100644 .config/nvim/LICENSE delete mode 100644 .config/nvim/lua/plugins/alpha.lua delete mode 100644 .config/nvim/lua/plugins/blame.lua delete mode 100644 .config/nvim/lua/plugins/bufferline.lua delete mode 100644 .config/nvim/lua/plugins/catppuccin.lua delete mode 100644 .config/nvim/lua/plugins/cinnamon.lua delete mode 100644 .config/nvim/lua/plugins/copilot-cmp.lua.bak delete mode 100644 .config/nvim/lua/plugins/dap-ui.lua delete mode 100644 .config/nvim/lua/plugins/dap-virtual-text.lua delete mode 100644 .config/nvim/lua/plugins/dap.lua delete mode 100644 .config/nvim/lua/plugins/example.lua delete mode 100644 .config/nvim/lua/plugins/legendary.lua delete mode 100644 .config/nvim/lua/plugins/lspconfig.lua delete mode 100644 .config/nvim/lua/plugins/mini-animate.lua.bak delete mode 100644 .config/nvim/lua/plugins/numb.lua delete mode 100644 .config/nvim/lua/plugins/project.lua delete mode 100644 .config/nvim/lua/plugins/ranger.lua delete mode 100644 .config/nvim/lua/plugins/tabout.lua.bak delete mode 100644 .config/nvim/lua/plugins/twilight.lua.bak delete mode 100644 .config/nvim/lua/plugins/which-key.lua delete mode 100644 .config/nvim/lua/plugins/xplr.lua.bak diff --git a/.config/BetterDiscord/plugins/ChannelTabs_new_302085663057248267.config.json b/.config/BetterDiscord/plugins/ChannelTabs_new_302085663057248267.config.json index 8317dca2..e6ec6ec1 100644 --- a/.config/BetterDiscord/plugins/ChannelTabs_new_302085663057248267.config.json +++ b/.config/BetterDiscord/plugins/ChannelTabs_new_302085663057248267.config.json @@ -4,7 +4,7 @@ { "name": "#general", "url": "/channels/674984102860161025/674985827121758208", - "selected": false, + "selected": true, "currentStatus": "none", "iconUrl": "https://cdn.discordapp.com/icons/674984102860161025/a4c5c84a118b923dfe68dccd886d1d87.webp?size=40", "channelId": "674985827121758208" @@ -18,20 +18,19 @@ "channelId": "1066831318618472468" }, { - "name": "#ricing-theming", - "url": "/channels/635612648934735892/635625925748457482", + "name": "#showcase", + "url": "/channels/635612648934735892/635625917623828520", "selected": false, "currentStatus": "none", "iconUrl": "https://cdn.discordapp.com/icons/635612648934735892/a_3a2557b931496fa8f2d0134b2ced5feb.webp?size=40", - "channelId": "635625925748457482" + "channelId": "635625917623828520" }, { - "name": "#general", - "url": "/channels/674984102860161025/674985827121758208", - "selected": true, + "name": "Friends", + "url": "/channels/@me", + "selected": false, "currentStatus": "none", - "iconUrl": "https://cdn.discordapp.com/icons/674984102860161025/a4c5c84a118b923dfe68dccd886d1d87.webp?size=40", - "channelId": "674985827121758208" + "iconUrl": "https://cdn.discordapp.com/embed/avatars/0.png" } ], "favs": [], diff --git a/.config/VSCodium/User/globalStorage/state.vscdb b/.config/VSCodium/User/globalStorage/state.vscdb index 3b89900309bae0145757ba22706f4d27cdd027c7..8b02e32b89ff606441dfdddce85efaf7226f9ff7 100644 GIT binary patch delta 2603 zcmbVOeQXow8Nc_-A93t6p$iEl&BYL>j1U}$Bu=^v91;vvW##y&63 zAhIu|5vw{i>uG%}DhjGvN;jASta&%Bo6@jKt+WY`R+=<*8=EF=(y@`h+D7P}x{9oF;R zMYz^6cPy8CRkywAkpGGC07_evJQW zp-wM2WZGKGnrHK_i#9EbMITpSfXL2N=wk%R?oPk{vTm0^I!~%Rf@@dUr@-_Nb(CYEvZOU-5Fbs&;F5wWhfcv ztabOU!psA0-?yCdm)~3nuqT#G#pAq|N|-ZPAi!z-fzx?YKzZFlUbpLQ=XvK%=S_Zu1@p*-t(p;He?c&WYzM0OSU|libYEx> zESm$|)^GUP`VpDfqZvEs6olh+3c(HfxnFFc^#~rIKSi+ef)Bb^JK=W(1WrNwb#TgA zdH=#*?&=t@Pe9G6$K%fyQ~5m-pzi~ChDITL{IRO1J<*ixsZtXu<*>S509r;n*jR z(jy14m&VVcC)q$8o)sB7kH9pHh3WA)tS~p$vi2$T4&OL}fkfL+;}M#zh90`Su`iot9L+=)K^;{=-ccM)P?&R!u5ebLv5gzzku~} zpw7Qp?(d_Ym%%D%w6iJ+ek6jK88^W`ntK_Q(qGQuRV*-zKM*f;5@}|ZAU8u<@?s4M zR-oOGc78x4n2yq)Tp@4cP$_Dr<=4np=!vUjJBYBks{{a;ZfEabBWnQI!T$Iovev`Q#MQj0nq}BvuH8{d&;dZP$2rMe**5 z$X%cGfEB*pUE`~(t>H7c(KmkhYnm~H+Cr)lRfZKcF;?B5N+kGv=~j~Flr_)py@RPL z$yX}{Q%5Dg&tEI~0!?*|O+KF#+P$|?GmfDxAv#>m5s)q*om2ldvcJN=X4-Jql@;u@ZuqK|PVa|)cI;_5h0VVNjvt=M zn;Pean_Y-M7Wc zE|xfo0H~+$l{(^NdnM|El>70(bQ}A|IPdTy0tHG8wn@r)1jFuawR=|1B4 Qtb+w-EpsCO>iPP=0cj6jTmS$7 delta 1436 zcmZuxYiv_h9KYvvZ@1g_7AIS~S8vDKwd1iqR@RkASEfu%HafDAL8t?w5E35S0@;u( z>76`+7%5)KAs9070rSDw80(3V$ao1lkP*d1gEEaDKw?^nA5b&!RP>wotCs|}#E(pRW9Gf`c0e1~pKD_!}#ZaKMLq6irjTXnWKa~4QyK-ImS$Uv* z&vBoDA-P<^GqiMagiJ--XkZ59(3Pe$IXz6^kz($MbLo2=b7%X5LT;R~> zd8A5!U|cX5z&NKCp#_g}6AX~u?c6JNbp>okh^Iq85dG$zm<7t(sg+u~hD7`BAUZV< z7P8;h!y8gQH+<5>I|6nJ22rX)Kf!%qCzt91Iek#e%*4H~*yx&05~7!z;bF9K+Zx)s z47$a5-!d&zNe36gUj5i557i>Djd~(*HvKjNE6DLWE#qNrVc3AgxW<>d>F}50XVbkQ zUohzRRR@E;@l%_$Oa)$XCyyrQK^Gg$gS$mKJWg!-qi&IXR|=gVFO_u;3bzI2Fz?O^ z5h23!^aWdV6Mt$ptku#zxK#txks{@^?;!}kNh)EwYjhU*N&&6M>!1bm{pHjVh50nL zh!|K|2mC?F&8h-)P(TNHsQXaPp>_P6ar3Y#>&nw?=wj|3i7vd9Yi5hbb4PIT)~;RQ;`U&;FPAk(dQR=v+@%@5L_K z5y$h`x+FTH>_G_#1bU?(*W$ojub=+*CoW;m3_hkvaqgLW^NX}IiJaLjGgwm$k17lu zMPP_FUBz2y!c59&)iNBQW)0`Cn+fda^Q$pXsrM2N)7W1ihYp;_X4X1}KUA_AsHIo- zqgra)i>5PM5)Ue=qZq4nVmU6M*A|fi7OEpx6{|_!B_Mo6kjwA{J_2=^|D^E{cVTw+ zA-F4YHN1oWzl=|yNo=7gfePtl6;x^8BV5Gn2{fP>xW!m)&|5>3E?7$MDX@U{_hW_S zsql=FvJmWLIL3>Hp%|I6TTO;Sfsm-6+%}FIUpF?9=#$3HcnI0m!pn`#io>rVHs8Y4 zeAJ8ad@WQk_{}hKUQkgn;6g4a#8BQJUl@on~HR)JX zZi=Kh{hsXGSbu36ZYc>1glrYe5%V`qljLt?tMQng0nc#{YYE#*00x+&iD@CH%qC4> zPbmVX7&A-2WYXH52UyGlUjBGF7cp771@U9?buna_v%G8R<`$YP^kfC>XQw{Je>G9N z2OKbLt!9nW1y@8R3#53mC>rZok!*Spfl75Bk6D? z9+y+2#+!@3?ntB+V`mW{i-wU~h-0_hCnuEn=zM^SSh;UFUk7mCaH2mpP$OrR+sTtX+ph_zpi?O5bey-Jv0t-a<0C9oK+bMa^)UMjf?;IYSHrIb)U!4F9emvZq{NnN$Dn6}Sg3v+LQzZaj(!_Y?e z(0=Tp$y4ZI)}Mr@M25~FFbNY;dL#)e4aRELI)UEdj6)bmwDkvgnC5Gsn{Idk`KhA= zTiLJMu}=i;RMl`X>zu$BL^?T+9JDBp)=izkSfbwJcoVHCgI0P@#SYe$$3GDZZpR3k z1kl7|3j+3;6Ta`5x{i?(2&^%WW<+}FCMc15{efWbMqjWl+FKtD1cUYdpr0SWKqOe_ z+ZgHVrC(IQYN)reY6*TKf~hGd!CpH15-O*^oWUzta2kIko^2=6)HFd(hVtaOS`w;6 zyC7}I$v5cHOJo~}v6)K*0GMrMA6_P_0NBp{_%>N>W4PV+ zFP@HBa%;|M7tag0@DV|bi`9;}NCFCc|??P*Z;ezZAEhbnBPuEiw%h9ocdUM=M8{yv&D@nz=A!lSU>nwzf# z(gdV&{7)h4%lwn31$SIr#$N4&ubAoNUg%?wKME(X@t44{gHy8wN4ArJ8q@=|9Vge) z(~vaUS3Zpy@Dqazy`ggPJ!A>pwtkPXR9 z@8l80NbyPz!H|I{%m-s*tS3ey;}y_>8&OO&D3kaBB&L=40W||pLBDxVe&?5a9>4$N zod1c(E8>%L69uN_f*^d(v55m7a8-fjL#scK^|^8z6luBhhQ%!Yh>uk@%RIc`^t<+PZrnd75}UoEe2R*6o5w>IB^yUAZ_Y)|30Bj?{^7f&Ie~i<_`I0x;0cRqwe_ z+ceEnUqDB#l3A>*;%Ze|#NuazB52M-NHj5>0z^?~S5rA?VID190Il@W6R?nNaDqc$ zW|Im5f-ym_2Vf``$@ZEI-D zGUyUxz01^eIUQI8d$ePh-Bb<3R_YGJIrRH5EF&js)U=zmhG0E1#8kf2g&TS|&}cVN z=<8pL$EOFqfq>6j83^>mPH$4vWq8G%Y?_!4oopZ*?iT6L7|GKfcZuwWV(0+b$&8aw zxGl(sd3R0-3t^tGuUPF({DoP+R!w!|78Ou?l9bZkM*kNr~-6QKnHoq`%u=Qb^N?>(~v3S%5*k($*@O97hN`(+2S$7 zFfQEMx$V`Sn8{QoAb3kKUNqi?w|E-@9}BCv!g)A6F!EcLHhEsr-aG%oe+MuewIB!` z>*?yf*h$-Ccs^T~Ku6>~C=P)@ulC_;?4RfH(ck~VMa+@L$7EfMd*<5w3hhWBM`p`R z))>VjGDAlZ7^IEY@D>_3lM-674Ew2B#aZlT9Q*kEY77+Wxr{?J`Zvg;{THyAwT$9V zDB$Hn&$0AGgw{%56H=*7%OyQIWD5tYe_B(){twm)gX-H0VzfHosiFxdET;Em zm`nTmu*|X*cvenY2=*`><;BBLluX&ICVjp@NJNlt8^?@q8yiXFS>tBhgzReOWyfa6 z;I|N)Z{bQl>cMz{nzm8TxM;ICY}q_p@q3k*wrx~=9-m+FR)zw>kUyZ*H#AqP>0;VG zE*6&j-?BOLjZtX580JrQUE|X`}r)HDKXqmGI36jsZ=FTOXdR{#(!bw z+{%%8S6mz+j>Q~HI2t&TnOA0<-Rci%nQ1KN7oGCL--rRH5!dX_eS@!;b2K z77piVp0JMf7fMzDX3+~pQadRtLrw5$T~J;ZX4vgyD~qK$02e#aQred*<+BfM(#xKc NXp~s^J(Q-F{sSV=rN00G diff --git a/.config/VSCodium/User/globalStorage/storage.json b/.config/VSCodium/User/globalStorage/storage.json index d6cc0221..db23febb 100644 --- a/.config/VSCodium/User/globalStorage/storage.json +++ b/.config/VSCodium/User/globalStorage/storage.json @@ -38,8 +38,7 @@ "items": [ { "id": "workbench.action.reopenClosedEditor", - "label": "&&Reopen Closed Editor", - "enabled": false + "label": "&&Reopen Closed Editor" }, { "id": "vscode.menubar.separator" @@ -324,7 +323,7 @@ "items": [ { "id": "workbench.profiles.actions.exportProfile", - "label": "Export Profile (Default)..." + "label": "Export Profile (Lua)..." }, { "id": "workbench.profiles.actions.importProfile", @@ -347,7 +346,7 @@ "items": [ { "id": "submenuitem.Profiles", - "label": "Profiles (Default)", + "label": "Profiles (Lua)", "submenu": { "items": [ { @@ -364,8 +363,7 @@ }, { "id": "workbench.profiles.actions.profileEntry.__default__profile__", - "label": "Default", - "checked": true + "label": "Default" }, { "id": "workbench.profiles.actions.profileEntry.-7191cca2", @@ -377,7 +375,8 @@ }, { "id": "workbench.profiles.actions.profileEntry.-1645caa6", - "label": "Lua" + "label": "Lua", + "checked": true }, { "id": "workbench.profiles.actions.profileEntry.-1f364037", @@ -394,6 +393,10 @@ { "id": "vscode.menubar.separator" }, + { + "id": "workbench.profiles.actions.renameCurrentProfile", + "label": "Rename..." + }, { "id": "workbench.profiles.actions.showProfileContents", "label": "Show Contents..." @@ -521,6 +524,22 @@ "id": "editor.action.clipboardCopyAction", "label": "&&Copy" }, + { + "id": "submenuitem.MenubarCopy", + "label": "Copy As", + "submenu": { + "items": [ + { + "id": "gitlens.copyRemoteFileUrlToClipboard", + "label": "Copy Remote File URL" + }, + { + "id": "gitlens.copyRemoteFileUrlFrom", + "label": "Copy Remote File URL From..." + } + ] + } + }, { "id": "editor.action.clipboardPasteAction", "label": "&&Paste" @@ -693,7 +712,8 @@ }, { "id": "workbench.action.toggleActivityBarVisibility", - "label": "&&Activity Bar" + "label": "&&Activity Bar", + "checked": true }, { "id": "workbench.action.togglePanel", @@ -888,6 +908,10 @@ "id": "workbench.view.extensions", "label": "E&&xtensions" }, + { + "id": "workbench.view.extension.test", + "label": "T&&esting" + }, { "id": "vscode.menubar.separator" }, @@ -1002,54 +1026,45 @@ }, { "id": "workbench.action.focusThirdEditorGroup", - "label": "Group &&3", - "enabled": false + "label": "Group &&3" }, { "id": "workbench.action.focusFourthEditorGroup", - "label": "Group &&4", - "enabled": false + "label": "Group &&4" }, { "id": "workbench.action.focusFifthEditorGroup", - "label": "Group &&5", - "enabled": false + "label": "Group &&5" }, { "id": "vscode.menubar.separator" }, { "id": "workbench.action.focusNextGroup", - "label": "&&Next Group", - "enabled": false + "label": "&&Next Group" }, { "id": "workbench.action.focusPreviousGroup", - "label": "&&Previous Group", - "enabled": false + "label": "&&Previous Group" }, { "id": "vscode.menubar.separator" }, { "id": "workbench.action.focusLeftGroup", - "label": "Group &&Left", - "enabled": false + "label": "Group &&Left" }, { "id": "workbench.action.focusRightGroup", - "label": "Group &&Right", - "enabled": false + "label": "Group &&Right" }, { "id": "workbench.action.focusAboveGroup", - "label": "Group &&Above", - "enabled": false + "label": "Group &&Above" }, { "id": "workbench.action.focusBelowGroup", - "label": "Group &&Below", - "enabled": false + "label": "Group &&Below" } ] } @@ -1801,8 +1816,8 @@ "sideBarSide": "left", "editorPartMinWidth": 220, "titleBarHeight": 0, - "activityBarWidth": 0, - "sideBarWidth": 247, + "activityBarWidth": 48, + "sideBarWidth": 310, "statusBarHeight": 0, "windowBorder": false } @@ -1899,7 +1914,8 @@ "file:///home/matt/Juegos/SteamLibrary/steamapps/common/ELDEN%20RING": "__default__profile__", "file:///docs/Documentos/Repos/Personal/Cursos/Python": "-1f364037", "file:///home/matt/.config/nvim": "-1645caa6", - "file:///home/matt/.config": "__default__profile__" + "file:///home/matt/.config/nvim.old": "__default__profile__", + "file:///home/matt/.config": "-1645caa6" }, "emptyWindows": {} }, diff --git a/.config/VSCodium/User/profiles/-1645caa6/globalStorage/state.vscdb b/.config/VSCodium/User/profiles/-1645caa6/globalStorage/state.vscdb index 3a00013941ea3ee5a34a688bbb186bb982479b41..70cce155d979c5261a5c5f146089932528c6cced 100644 GIT binary patch delta 849 zcmZuuZAepL6u$4rKJJ~DcS|GFt<7sqGp*I;=K3Ji>{rnj6j7Sf%@VCKmwk&SdA-mF zt{1wZkvb{*AZXm_FeEYxp+6NtMXXx%BZ8n?L_f8=2>KI;=e*}U=RME+a!yaCv?o(K zPyk_0%vz)QMB^P|8zbMzSMr(sBJap7c|@kkB)LaklNaPRxuLA?IZs$l!VJS0`vp2} z&u8OOj+Tu|2Kvrkg7<>=1=Q%+4RJeda5x~EQhFTw0exR&huB2ti`GNT(G7yA$A%SX zFOXL(AV+uNn+EtrUHt>qjfdO8&WY|C5OQ_|tHMKbd?i2aaH(O@s9s)k9`h*Z7ZW{XoA{OTb_d?k%c$FDmyZO<9O{A zfC3B(BqDndp30RBsY?!SD2KOZOAy8wB*R!D(g$%bl+1MF*aQXfJWF#lDwH4X=nU1D z?-Nc24!6_%xQ(=T2L7`3gCU7mhR0iS{^)=(1D|NFH4zB_WA9GMglo@5<&X1hp%RR{ vfpN$uad<Ui$o%H{MtTLMN>We>qCqHpnfLzPYP%u`@PK9}b=JT(Gf delta 821 zcmZvYSxA&o6vyv2<2P5QYtuqbGxL4pzE+Sn+q8usEt8??}(Ek>bf(>O(;Xj9#X z_UT5q4aO3}h{EBEJ_;XNsGg#g3b8aIdMNOVAbN=Gv#6&I{LVe+{?Fx{dpZX5I|lQQ zdlBqT`l@W7uDingnd}Su%s#Sj>XLC;}TrWKvl+=?5OW z@jo+KCq0CSy%*Jb9`uL?T|;=GaYXNTY7=n<+SR#x2ugTQ}8Lt>0mvd+K40 ziYt*Qj(d%+qS`923uKT1z#g;9tew@dLZylfAO)_=T9S_5BMPtO3rY2nOwp|SjMvF| znC`tgm3thOiN26nq&l$4jwjFidf5L8WV z5Z+?kg4{yf!rUU|FOD=YpqzC@^vpWP10{0Yfkep0LTa}w*c#N$2 aQY!;Ks+-5Yy0&LIE*@CMn~dP8=ja!Kn)s;z diff --git a/.config/VSCodium/User/profiles/-1645caa6/globalStorage/state.vscdb.backup b/.config/VSCodium/User/profiles/-1645caa6/globalStorage/state.vscdb.backup index 3a00013941ea3ee5a34a688bbb186bb982479b41..3b64578bf3c9d5b9d15258c8780e7008b097b7b8 100644 GIT binary patch delta 822 zcmZuuZAepL6u#$u-_3iku6N5Kbz5#%TV}3io104{Y}l`&FAAirrkf>MGN+}LXi~dB z`apZ3D;4<#(FZ}}&V~|EPz3#{2qI$DqF?=pZqbiEpml|!KXG`@;T$;6Ip;Zp*^0qz z#jq7}BeoFal6!7Yu(1MjF}_Z(sMUj~s4yY-avaCY61!7cB;?CIdM3&-_PTT_X@WN; zjCX8Dq=W5pI1rvu2OT?sy>U9=C(AkO;VY|`WW%@RxCto}zXS*SAT`1dwz8}qKC=U5 zZbWL>r82u@#X)qqvul4#^kD1074h~+bZxjxk4K_-mgAP<&4`UnNeF*uxv~IcSfISd zOtBLkinn$~qAT{ccjHs)vGPZNOzo`EwFIuR{VpebP|vtBMnd0nwvmP+^`yIht!)p- zlZzaELa)&QT4mT^s3bS_!reJb#`?*8D(7RT!?L zrsAG8SZ4)eGKPSh+$zV?ZnyXxEwjn1aj@|J%6O|i$8T8Jj`;g@D{m>QkX~=8Ir3iT}=3GC84q z=+?Zs4h(f1R?rC4C1Y;jhqlN^N$5med6yHcYGl$2WC+Pe*qVuH29pact?{^2)!o$- zZLZoO^@R^~u%byj?dS>rsWy*B%L)&u5_$_ImY^pX@YdF@^80*J zvp(3aRt~?QYE7WcKv>r;wtG^b%}}BMahfvq;Q5;4p{7=wmXr4U?Hdxi@{* iAzmneas7GN3}flad+>r9+x-4$O^b5>G1zgy^qm7LsVj8t+5gAm{L(L`} z1eVosqSFhe2ZT{t)0Hkoiz2F3q$LqzX+*0Q-gd33Yf!6x`1rs7@$o3}$dJu*oNh89-_pwZPsz5MERGP8*cSdoS!%n+4w#XLweye43c4LWE#Z=H zD{uDsu%k^&`gQ`J_6H!rfB9>mgVzL3TH-~d5%V4UR6ZA|gzFy4-7jIYnut6JA zr>(waqzWJE>Tcf??QGq@D&Dp?THn%b`Xf=;sE|6$Ly27NW=T_ht_@|;86>}vZ_9mh zvs^6I(-|zm?wrk;*mEkeCbogDAIj!ksz>{fswMV;kwWIO)Fr2ae3P21MJ}bSlDScy ziC`+G@Z!F(;z@2KRSW;WKzTUA`}$71ubYCuNSjB6%C>}$@?w`9Y%x}A*RjZx$ZQ%m8L!W)NmjW>}bEWk%LRLn4MCPr)U=&A?*O{|ub^ zqNngemUqox4tNsbNxTh-Ozb6=E*G#4S~Hffy}n^_@Xz;@`43{Jjtv_&2^vI>m1vNj jPsNT(j~22xZT#NEy?0gpEU_QVvD`SZg>`EF3-9o66!q&N diff --git a/.config/VSCodium/User/settings.json b/.config/VSCodium/User/settings.json index f07e9722..1859337a 100644 --- a/.config/VSCodium/User/settings.json +++ b/.config/VSCodium/User/settings.json @@ -255,7 +255,6 @@ "search.followSymlinks": false, "workbench.editor.showTabs": false, "editor.minimap.enabled": false, - "workbench.activityBar.visible": false, "cSpell.enableFiletypes": [ "!yaml" ], diff --git a/.config/nvim/LICENSE b/.config/nvim/LICENSE new file mode 100644 index 00000000..261eeb9e --- /dev/null +++ b/.config/nvim/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/.config/nvim/README.md b/.config/nvim/README.md index 4b5ad5e9..185280b0 100644 --- a/.config/nvim/README.md +++ b/.config/nvim/README.md @@ -1,140 +1,4 @@ -# dotfiles/.config/nvim +# 💤 LazyVim - - - - -## Install Instructions - -> Install requires Neovim 0.9+. Always review the code before installing a configuration. - -Clone the repository and install the plugins: - -```sh -git clone git@github.com:Matt-FTW/dotfiles ~/.config/Matt-FTW/dotfiles -NVIM_APPNAME=Matt-FTW/dotfiles/.config/nvim nvim --headless +"Lazy! sync" +qa -``` - -Open Neovim with this config: - -```sh -NVIM_APPNAME=Matt-FTW/dotfiles/.config/nvim nvim -``` - -## Plugins - -### colorscheme - -- [catppuccin/nvim](https://dotfyle.com/plugins/catppuccin/nvim) - -### completion - -- [zbirenbaum/copilot.lua](https://dotfyle.com/plugins/zbirenbaum/copilot.lua) -- [hrsh7th/nvim-cmp](https://dotfyle.com/plugins/hrsh7th/nvim-cmp) - -### debugging - -- [rcarriga/nvim-dap-ui](https://dotfyle.com/plugins/rcarriga/nvim-dap-ui) -- [mfussenegger/nvim-dap](https://dotfyle.com/plugins/mfussenegger/nvim-dap) - -### diagnostics - -- [folke/trouble.nvim](https://dotfyle.com/plugins/folke/trouble.nvim) - -### editing-support - -- [nacro90/numb.nvim](https://dotfyle.com/plugins/nacro90/numb.nvim) - -### file-explorer - -- [kevinhwang91/rnvimr](https://dotfyle.com/plugins/kevinhwang91/rnvimr) - -### fuzzy-finder - -- [nvim-telescope/telescope.nvim](https://dotfyle.com/plugins/nvim-telescope/telescope.nvim) - -### keybinding - -- [folke/which-key.nvim](https://dotfyle.com/plugins/folke/which-key.nvim) -- [mrjones2014/legendary.nvim](https://dotfyle.com/plugins/mrjones2014/legendary.nvim) - -### lsp - -- [simrat39/symbols-outline.nvim](https://dotfyle.com/plugins/simrat39/symbols-outline.nvim) -- [jose-elias-alvarez/null-ls.nvim](https://dotfyle.com/plugins/jose-elias-alvarez/null-ls.nvim) -- [neovim/nvim-lspconfig](https://dotfyle.com/plugins/neovim/nvim-lspconfig) -- [jose-elias-alvarez/typescript.nvim](https://dotfyle.com/plugins/jose-elias-alvarez/typescript.nvim) - -### lsp-installer - -- [williamboman/mason.nvim](https://dotfyle.com/plugins/williamboman/mason.nvim) - -### lua-colorscheme - -- [ellisonleao/gruvbox.nvim](https://dotfyle.com/plugins/ellisonleao/gruvbox.nvim) - -### markdown-and-latex - -- [ellisonleao/glow.nvim](https://dotfyle.com/plugins/ellisonleao/glow.nvim) - -### media - -- [andweeb/presence.nvim](https://dotfyle.com/plugins/andweeb/presence.nvim) - -### nvim-dev - -- [kkharji/sqlite.lua](https://dotfyle.com/plugins/kkharji/sqlite.lua) - -### plugin-manager - -- [folke/lazy.nvim](https://dotfyle.com/plugins/folke/lazy.nvim) - -### preconfigured - -- [LazyVim/LazyVim](https://dotfyle.com/plugins/LazyVim/LazyVim) - -### project - -- [ahmedkhalf/project.nvim](https://dotfyle.com/plugins/ahmedkhalf/project.nvim) - -### scrolling - -- [declancm/cinnamon.nvim](https://dotfyle.com/plugins/declancm/cinnamon.nvim) - -### snippet - -- [L3MON4D3/LuaSnip](https://dotfyle.com/plugins/L3MON4D3/LuaSnip) - -### startup - -- [goolord/alpha-nvim](https://dotfyle.com/plugins/goolord/alpha-nvim) - -### statusline - -- [nvim-lualine/lualine.nvim](https://dotfyle.com/plugins/nvim-lualine/lualine.nvim) - -### syntax - -- [nvim-treesitter/nvim-treesitter](https://dotfyle.com/plugins/nvim-treesitter/nvim-treesitter) - -### tabline - -- [akinsho/bufferline.nvim](https://dotfyle.com/plugins/akinsho/bufferline.nvim) - -### test - -- [nvim-neotest/neotest](https://dotfyle.com/plugins/nvim-neotest/neotest) - -## Language Servers - -- cmake -- eslint -- gopls -- html -- intelephense -- jdtls -- omnisharp -- pyright -- ruff_lsp -- svelte -- taplo +A starter template for [LazyVim](https://github.com/LazyVim/LazyVim). +Refer to the [documentation](https://lazyvim.github.io/installation) to get started. diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 3927f229..5ae00233 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,13 +1,10 @@ { "LazyVim": { "branch": "main", "commit": "aa1cccf230a01bd85d5173f7d87f782fd83caa88" }, "LuaSnip": { "branch": "master", "commit": "e81cbe6004051c390721d8570a4a0541ceb0df10" }, - "SchemaStore.nvim": { "branch": "main", "commit": "fba131b5ef7a54a8f8d71ef2a2e8d2263b87daac" }, + "SchemaStore.nvim": { "branch": "main", "commit": "787ffac7dff081f51b4fdcb5f6a85ec7d385504e" }, "alpha-nvim": { "branch": "main", "commit": "e4fc5e29b731bdf55d204c5c6a11dc3be70f3b65" }, - "blamer.nvim": { "branch": "master", "commit": "f4eb22a9013642c411725fdda945ae45f8d93181" }, "bufferline.nvim": { "branch": "main", "commit": "99f0932365b34e22549ff58e1bea388465d15e99" }, "catppuccin": { "branch": "main", "commit": "057c34f849cf21059487d849e2f3b3efcd4ee0eb" }, - "cinnamon.nvim": { "branch": "master", "commit": "c406ffda3a0302f32c23b24ab756ea20467d6578" }, - "cmake-tools.nvim": { "branch": "master", "commit": "14d73cc59a4068463bf3f1efb211275f5cf9f9ba" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, @@ -23,9 +20,8 @@ "glow.nvim": { "branch": "main", "commit": "8942dfb05794f436af4fbc90a34393f1fd36f361" }, "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" }, "lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" }, - "legendary.nvim": { "branch": "master", "commit": "3db15cae08d63bab40d0c38474e368f97414f090" }, "live-server.nvim": { "branch": "main", "commit": "8cae0641cabe8c555311f09dbb0ae36a513a9d5c" }, - "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, + "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "e86a4c84ff35240639643ffed56ee1c4d55f538e" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "e4d56b400e9757b1dc77d620fd3069396e92d5fc" }, "mason.nvim": { "branch": "main", "commit": "fe9e34a9ab4d64321cdc3ecab4ea1809239bb73f" }, @@ -35,26 +31,25 @@ "mini.indentscope": { "branch": "main", "commit": "f60e9b51a6214c73a170ffc5445ce91560981031" }, "mini.pairs": { "branch": "main", "commit": "dfa9f6e2576bb8853be277d96b735af59d9be7c2" }, "mini.surround": { "branch": "main", "commit": "9d1956b576d7051da3a483b251dfc778121c60db" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "981a43adcca25e7ccc3c589902d49f25e4d48ebc" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "7951701fd21291ac473ea92d3fd57ec5c8bf10bb" }, "neoconf.nvim": { "branch": "main", "commit": "08f146d53e075055500dca35e93281faff95716b" }, - "neodev.nvim": { "branch": "main", "commit": "2973d6c56cbde46c04e12476bb40eefd516d5f35" }, + "neodev.nvim": { "branch": "main", "commit": "c2546d7456071308accc30e59fab24b1065ae4f6" }, "noice.nvim": { "branch": "main", "commit": "894db25ec726d32047799d4d0a982b701bec453b" }, "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, "null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" }, - "numb.nvim": { "branch": "master", "commit": "2c89245d1185e02fec1494c45bc765a38b6b40b3" }, "nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" }, "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, - "nvim-dap": { "branch": "master", "commit": "2f28ea843bcdb378b171a66ddcd568516e431d55" }, - "nvim-dap-go": { "branch": "main", "commit": "eab43d63cef832801a701812913e4d1d726725e5" }, + "nvim-dap": { "branch": "master", "commit": "1c63f37f95cd4fb54512898168138d9a75d1516a" }, + "nvim-dap-go": { "branch": "main", "commit": "208f0e685b48a98bec2cdd8648559c4274b84ca2" }, "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" }, "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" }, - "nvim-jdtls": { "branch": "master", "commit": "96e3978c3fdae3950f6ccda548775e8b8952f74a" }, - "nvim-lspconfig": { "branch": "master", "commit": "b6091272422bb0fbd729f7f5d17a56d37499c54f" }, + "nvim-jdtls": { "branch": "master", "commit": "095dc490f362adc85be66dc14bd9665ddd94413b" }, + "nvim-lspconfig": { "branch": "master", "commit": "a59d74e12340242c0735666fb2e91afdbe6f2496" }, "nvim-navic": { "branch": "master", "commit": "9c89730da6a05acfeb6a197e212dfadf5aa60ca0" }, "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, "nvim-spectre": { "branch": "master", "commit": "3ba6edeea1390457caaf73e96ab9c086ff6f90e9" }, - "nvim-treesitter": { "branch": "master", "commit": "82c948653909d8c1582f28313aa1cf9d68d66fe8" }, + "nvim-treesitter": { "branch": "master", "commit": "1e5576fa0165a222529777731a3257343047f916" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "9e519b6146512c8e2e702faf8ac48420f4f5deec" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "e9062e2dfb9854e6a927370f2d720de354c88524" }, "nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" }, @@ -62,16 +57,16 @@ "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "rnvimr": { "branch": "main", "commit": "a89e373330649326a80c2fcafe7b92b5814792f6" }, "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, - "telescope.nvim": { "branch": "master", "commit": "b6fccfb0f7589a87587875206786daccba62acc3" }, + "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "65565c62963579897d28390dbd1ba8fb15ba545f" }, + "telescope.nvim": { "branch": "master", "commit": "d2e17ba18a6840b7e7079764b282616c3188e0de" }, "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" }, "tokyonight.nvim": { "branch": "main", "commit": "1ee11019f8a81dac989ae1db1a013e3d582e2033" }, "trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" }, "typescript.nvim": { "branch": "main", "commit": "de304087e6e49981fde01af8ccc5b21e8519306f" }, "undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" }, "venv-selector.nvim": { "branch": "main", "commit": "cc312074371aff5b0d8d481b80c9c4de2a5287d7" }, - "vim-illuminate": { "branch": "master", "commit": "a2907275a6899c570d16e95b9db5fd921c167502" }, + "vim-illuminate": { "branch": "master", "commit": "5ed17582a8e97bf0a0c617c3cf762e98f87b9859" }, "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" }, "vim-wakatime": { "branch": "master", "commit": "018fa9a80c27ccf2a8967b9e27890372e5c2fb4f" }, "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" } diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua index cde1bf29..c67f91e6 100644 --- a/.config/nvim/lua/config/lazy.lua +++ b/.config/nvim/lua/config/lazy.lua @@ -10,25 +10,21 @@ vim.opt.rtp:prepend(vim.env.LAZY or lazypath) require("lazy").setup({ spec = { -- add LazyVim and import its plugins - { "LazyVim/LazyVim", import = "lazyvim.plugins" }, + { "LazyVim/LazyVim", import = "lazyvim.plugins" }, -- import any extras modules here { import = "lazyvim.plugins.extras.lang.typescript" }, { import = "lazyvim.plugins.extras.lang.json" }, - --{ import = "lazyvim.plugins.extras.ui.mini-animate" } { import = "lazyvim.plugins.extras.dap.core" }, { import = "lazyvim.plugins.extras.formatting.prettier" }, { import = "lazyvim.plugins.extras.util.project" }, { import = "lazyvim.plugins.extras.lang.python" }, { import = "lazyvim.plugins.extras.lang.docker" }, { import = "lazyvim.plugins.extras.lang.go" }, - { import = "lazyvim.plugins.extras.lang.cmake" }, { import = "lazyvim.plugins.extras.lang.java" }, { import = "lazyvim.plugins.extras.lang.rust" }, + { import = "lazyvim.plugins.extras.lang.tailwind" }, { import = "lazyvim.plugins.extras.linting.eslint" }, - { import = "lazyvim.plugins.extras.dap.core" }, { import = "lazyvim.plugins.extras.coding.copilot" }, - --{ import = "lazyvim.plugins.extras.editor.flash" }, - -- import/override with your plugins { import = "plugins" }, }, defaults = { @@ -40,7 +36,6 @@ require("lazy").setup({ version = false, -- always use the latest git commit -- version = "*", -- try installing the latest stable version for plugins that support semver }, - install = { colorscheme = { "tokyonight", "habamax" } }, checker = { enabled = true }, -- automatically check for plugin updates performance = { rtp = { diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim/lua/config/options.lua index 7976d344..378d1e88 100644 --- a/.config/nvim/lua/config/options.lua +++ b/.config/nvim/lua/config/options.lua @@ -6,17 +6,17 @@ vim.g.gui_font_size = vim.g.gui_font_default_size vim.g.gui_font_face = "JetBrainsMono Nerd Font" RefreshGuiFont = function() - vim.opt.guifont = string.format("%s:h%s", vim.g.gui_font_face, vim.g.gui_font_size) + vim.opt.guifont = string.format("%s:h%s", vim.g.gui_font_face, vim.g.gui_font_size) end ResizeGuiFont = function(delta) - vim.g.gui_font_size = vim.g.gui_font_size + delta - RefreshGuiFont() + vim.g.gui_font_size = vim.g.gui_font_size + delta + RefreshGuiFont() end ResetGuiFont = function() - vim.g.gui_font_size = vim.g.gui_font_default_size - RefreshGuiFont() + vim.g.gui_font_size = vim.g.gui_font_default_size + RefreshGuiFont() end -- Call function on startup to set default value @@ -27,52 +27,52 @@ ResetGuiFont() local opts = { noremap = true, silent = true } vim.keymap.set({ "n", "i" }, "", function() - ResizeGuiFont(1) + ResizeGuiFont(1) end, opts) vim.keymap.set({ "n", "i" }, "", function() - ResizeGuiFont(-1) + ResizeGuiFont(-1) end, opts) vim.keymap.set({ "n", "i" }, "", function() - ResetGuiFont() + ResetGuiFont() end, opts) if vim.g.neovide then - -- Put anything you want to happen only in Neovide here - vim.g.neovide_padding_top = 10 - vim.g.neovide_padding_right = 10 - vim.g.neovide_padding_left = 10 + -- Put anything you want to happen only in Neovide here + vim.g.neovide_padding_top = 10 + vim.g.neovide_padding_right = 10 + vim.g.neovide_padding_left = 10 - vim.g.neovide_floating_blur_amount_x = 5.0 - vim.g.neovide_floating_blur_amount_y = 5.0 + vim.g.neovide_floating_blur_amount_x = 5.0 + vim.g.neovide_floating_blur_amount_y = 5.0 - vim.g.neovide_transparency = 0.85 + vim.g.neovide_transparency = 0.85 - vim.g.neovide_cursor_antialiasing = false + vim.g.neovide_cursor_antialiasing = false - vim.g.neovide_cursor_vfx_mode = "pixiedust" + vim.g.neovide_cursor_vfx_mode = "pixiedust" - vim.opt.winblend = 20 + vim.opt.winblend = 20 - if vim.fn.exists("g:terminal_color_0") == 0 then - vim.api.nvim_set_var("terminal_color_0", "#494D64") - vim.api.nvim_set_var("terminal_color_1", "#ED8796") - vim.api.nvim_set_var("terminal_color_2", "#A6DA95") - vim.api.nvim_set_var("terminal_color_3", "#EED49F") - vim.api.nvim_set_var("terminal_color_4", "#8AADF4") - vim.api.nvim_set_var("terminal_color_5", "#F5BDE6") - vim.api.nvim_set_var("terminal_color_6", "#8BD5CA") - vim.api.nvim_set_var("terminal_color_7", "#B8C0E0") - vim.api.nvim_set_var("terminal_color_8", "#5B6078") - vim.api.nvim_set_var("terminal_color_9", "#ED8796") - vim.api.nvim_set_var("terminal_color_10", "#A6DA95") - vim.api.nvim_set_var("terminal_color_11", "#EED49F") - vim.api.nvim_set_var("terminal_color_12", "#8AADF4") - vim.api.nvim_set_var("terminal_color_13", "#F5BDE6") - vim.api.nvim_set_var("terminal_color_14", "#8BD5CA") - vim.api.nvim_set_var("terminal_color_15", "#B8C0E0") - end + if vim.fn.exists("g:terminal_color_0") == 0 then + vim.api.nvim_set_var("terminal_color_0", "#494D64") + vim.api.nvim_set_var("terminal_color_1", "#ED8796") + vim.api.nvim_set_var("terminal_color_2", "#A6DA95") + vim.api.nvim_set_var("terminal_color_3", "#EED49F") + vim.api.nvim_set_var("terminal_color_4", "#8AADF4") + vim.api.nvim_set_var("terminal_color_5", "#F5BDE6") + vim.api.nvim_set_var("terminal_color_6", "#8BD5CA") + vim.api.nvim_set_var("terminal_color_7", "#B8C0E0") + vim.api.nvim_set_var("terminal_color_8", "#5B6078") + vim.api.nvim_set_var("terminal_color_9", "#ED8796") + vim.api.nvim_set_var("terminal_color_10", "#A6DA95") + vim.api.nvim_set_var("terminal_color_11", "#EED49F") + vim.api.nvim_set_var("terminal_color_12", "#8AADF4") + vim.api.nvim_set_var("terminal_color_13", "#F5BDE6") + vim.api.nvim_set_var("terminal_color_14", "#8BD5CA") + vim.api.nvim_set_var("terminal_color_15", "#B8C0E0") + end - vim.g.neovide_theme = "catppuccin-macchiato" + vim.g.neovide_theme = "catppuccin-macchiato" end vim.opt.relativenumber = false diff --git a/.config/nvim/lua/plugins/alpha.lua b/.config/nvim/lua/plugins/alpha.lua deleted file mode 100644 index cc47c712..00000000 --- a/.config/nvim/lua/plugins/alpha.lua +++ /dev/null @@ -1,19 +0,0 @@ -return { - { - "goolord/alpha-nvim", - event = "VimEnter", - opts = function() - local dashboard = require("alpha.themes.dashboard") - local logo = [[ - ███╗ ███╗ █████╗ ████████╗████████╗ ██╗██████╗ ███████╗ - ████╗ ████║██╔══██╗╚══██╔══╝╚══██╔══╝ ██║██╔══██╗██╔════╝ - ██╔████╔██║███████║ ██║ ██║ ██║██║ ██║█████╗ - ██║╚██╔╝██║██╔══██║ ██║ ██║ ██║██║ ██║██╔══╝ - ██║ ╚═╝ ██║██║ ██║ ██║ ██║ ██║██████╔╝███████╗ - ╚═╝ ╚═╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝╚═════╝ ╚══════╝ - ]] - dashboard.section.header.val = vim.split(logo, "\n") - return dashboard - end - } -} diff --git a/.config/nvim/lua/plugins/blame.lua b/.config/nvim/lua/plugins/blame.lua deleted file mode 100644 index 458ed051..00000000 --- a/.config/nvim/lua/plugins/blame.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - { "APZelos/blamer.nvim", lazy = false } -} diff --git a/.config/nvim/lua/plugins/bufferline.lua b/.config/nvim/lua/plugins/bufferline.lua deleted file mode 100644 index 9ae44331..00000000 --- a/.config/nvim/lua/plugins/bufferline.lua +++ /dev/null @@ -1,48 +0,0 @@ -return { - { - "akinsho/bufferline.nvim", - event = "VeryLazy", - keys = { - { "bp", "BufferLineTogglePin", desc = "Toggle pin" }, - { "bP", "BufferLineGroupClose ungrouped", desc = "Delete non-pinned buffers" }, - }, - opts = { - options = { - -- stylua: ignore - close_command = function(n) require("mini.bufremove").delete(n, false) end, - -- stylua: ignore - separator_style = "slope", - highlights = { - fill = { - fg = "#cad3f5", - bg = "#24273a", - }, - background = { - fg = "#cad3f5", - bg = "#24273a", - } - }, - - right_mouse_command = function(n) - require("mini.bufremove").delete(n, false) - end, - diagnostics = "nvim_lsp", - always_show_bufferline = false, - diagnostics_indicator = function(_, _, diag) - local icons = require("lazyvim.config").icons.diagnostics - local ret = (diag.error and icons.Error .. diag.error .. " " or "") - .. (diag.warning and icons.Warn .. diag.warning or "") - return vim.trim(ret) - end, - offsets = { - { - filetype = "neo-tree", - text = "Neo-tree", - highlight = "Directory", - text_align = "left", - }, - }, - }, - }, - }, -} diff --git a/.config/nvim/lua/plugins/catppuccin.lua b/.config/nvim/lua/plugins/catppuccin.lua deleted file mode 100644 index 4be3ce80..00000000 --- a/.config/nvim/lua/plugins/catppuccin.lua +++ /dev/null @@ -1,38 +0,0 @@ -return { - { - "catppuccin/nvim", - lazy = true, - name = "catppuccin", - opts = { - integrations = { - alpha = true, - cmp = true, - flash = true, - gitsigns = true, - illuminate = true, - indent_blankline = { enabled = true }, - lsp_trouble = true, - mason = true, - mini = true, - native_lsp = { - enabled = true, - underlines = { - errors = { "undercurl" }, - hints = { "undercurl" }, - warnings = { "undercurl" }, - information = { "undercurl" }, - }, - }, - navic = { enabled = true, custom_bg = "lualine" }, - neotest = true, - noice = true, - notify = true, - neotree = true, - semantic_tokens = true, - telescope = true, - treesitter = true, - which_key = true, - }, - }, - }, -} diff --git a/.config/nvim/lua/plugins/cinnamon.lua b/.config/nvim/lua/plugins/cinnamon.lua deleted file mode 100644 index 9088ff85..00000000 --- a/.config/nvim/lua/plugins/cinnamon.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - { - "declancm/cinnamon.nvim", - lazy = false, - } -} diff --git a/.config/nvim/lua/plugins/colorizer.lua b/.config/nvim/lua/plugins/colorizer.lua index 505382ce..9d9cd884 100644 --- a/.config/nvim/lua/plugins/colorizer.lua +++ b/.config/nvim/lua/plugins/colorizer.lua @@ -1,6 +1,7 @@ return { { "NvChad/nvim-colorizer.lua", + lazy = false, config = function() require("colorizer").setup() end, diff --git a/.config/nvim/lua/plugins/colorscheme.lua b/.config/nvim/lua/plugins/colorscheme.lua index 3c9c407a..a6134856 100644 --- a/.config/nvim/lua/plugins/colorscheme.lua +++ b/.config/nvim/lua/plugins/colorscheme.lua @@ -1,6 +1,6 @@ return { - "LazyVim/LazyVim", - opts = { - colorscheme = "catppuccin-macchiato", - }, + "LazyVim/LazyVim", + opts = { + colorscheme = "catppuccin-macchiato", + }, } diff --git a/.config/nvim/lua/plugins/copilot-cmp.lua.bak b/.config/nvim/lua/plugins/copilot-cmp.lua.bak deleted file mode 100644 index 06867d9e..00000000 --- a/.config/nvim/lua/plugins/copilot-cmp.lua.bak +++ /dev/null @@ -1,18 +0,0 @@ -return { - { - "zbirenbaum/copilot-cmp", - dependencies = "copilot.lua", - opts = {}, - config = function(_, opts) - local copilot_cmp = require("copilot_cmp") - copilot_cmp.setup(opts) - -- attach cmp source whenever copilot attaches - -- fixes lazy-loading issues with the copilot cmp source - require("lazyvim.util").on_attach(function(client) - if client.name == "copilot" then - copilot_cmp._on_insert_enter({}) - end - end) - end, - }, -} diff --git a/.config/nvim/lua/plugins/dap-ui.lua b/.config/nvim/lua/plugins/dap-ui.lua deleted file mode 100644 index eebfb2c5..00000000 --- a/.config/nvim/lua/plugins/dap-ui.lua +++ /dev/null @@ -1,26 +0,0 @@ -return { - { - "rcarriga/nvim-dap-ui", - -- stylua: ignore - keys = { - { "du", function() require("dapui").toggle({}) end, desc = "Dap UI" }, - { "de", function() require("dapui").eval() end, desc = "Eval", mode = { "n", "v" } }, - }, - lazy = false, - opts = {}, - config = function(_, opts) - local dap = require("dap") - local dapui = require("dapui") - dapui.setup(opts) - dap.listeners.after.event_initialized["dapui_config"] = function() - dapui.open({}) - end - dap.listeners.before.event_terminated["dapui_config"] = function() - dapui.close({}) - end - dap.listeners.before.event_exited["dapui_config"] = function() - dapui.close({}) - end - end, - } -} diff --git a/.config/nvim/lua/plugins/dap-virtual-text.lua b/.config/nvim/lua/plugins/dap-virtual-text.lua deleted file mode 100644 index 874c244e..00000000 --- a/.config/nvim/lua/plugins/dap-virtual-text.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - { - "theHamsta/nvim-dap-virtual-text", - opts = {}, - } -} diff --git a/.config/nvim/lua/plugins/dap.lua b/.config/nvim/lua/plugins/dap.lua deleted file mode 100644 index 67e84596..00000000 --- a/.config/nvim/lua/plugins/dap.lua +++ /dev/null @@ -1,188 +0,0 @@ -return { - { - "mfussenegger/nvim-dap", - - dependencies = { - - -- fancy UI for the debugger - { - "rcarriga/nvim-dap-ui", - -- stylua: ignore - keys = { - { "du", function() require("dapui").toggle({}) end, desc = "Dap UI" }, - { "de", function() require("dapui").eval() end, desc = "Eval", mode = { "n", "v" } }, - }, - opts = {}, - config = function(_, opts) - local dap = require("dap") - local dapui = require("dapui") - dapui.setup(opts) - dap.listeners.after.event_initialized["dapui_config"] = function() - dapui.open({}) - end - dap.listeners.before.event_terminated["dapui_config"] = function() - dapui.close({}) - end - dap.listeners.before.event_exited["dapui_config"] = function() - dapui.close({}) - end - end, - }, - - -- virtual text for the debugger - { - "theHamsta/nvim-dap-virtual-text", - opts = {}, - }, - - -- which key integration - { - "folke/which-key.nvim", - optional = true, - opts = { - defaults = { - ["d"] = { name = "+debug" }, - ["da"] = { name = "+adapters" }, - }, - }, - }, - - -- mason.nvim integration - { - "jay-babu/mason-nvim-dap.nvim", - dependencies = "mason.nvim", - cmd = { "DapInstall", "DapUninstall" }, - opts = { - -- Makes a best effort to setup the various debuggers with - -- reasonable debug configurations - automatic_installation = true, - - -- You can provide additional configuration to the handlers, - -- see mason-nvim-dap README for more information - handlers = {}, - - -- You'll need to check that you have the required things installed - -- online, please don't ask me how to install them :) - ensure_installed = { - -- Update this to ensure that you have the debuggers for the langs you want - }, - }, - }, - }, - - lazy = false, - - -- stylua: ignore - keys = { - { - "dB", - function() require("dap").set_breakpoint(vim.fn.input('Breakpoint condition: ')) end, - desc = - "Breakpoint Condition" - }, - { - "db", - function() require("dap").toggle_breakpoint() end, - desc = - "Toggle Breakpoint" - }, - { - "dc", - function() require("dap").continue() end, - desc = - "Continue" - }, - { - "dC", - function() require("dap").run_to_cursor() end, - desc = - "Run to Cursor" - }, - { - "dg", - function() require("dap").goto_() end, - desc = - "Go to line (no execute)" - }, - { - "di", - function() require("dap").step_into() end, - desc = - "Step Into" - }, - { - "dj", - function() require("dap").down() end, - desc = - "Down" - }, - { - "dk", - function() require("dap").up() end, - desc = - "Up" - }, - { - "dl", - function() require("dap").run_last() end, - desc = - "Run Last" - }, - { - "do", - function() require("dap").step_out() end, - desc = - "Step Out" - }, - { - "dO", - function() require("dap").step_over() end, - desc = - "Step Over" - }, - { - "dp", - function() require("dap").pause() end, - desc = - "Pause" - }, - { - "dr", - function() require("dap").repl.toggle() end, - desc = - "Toggle REPL" - }, - { - "ds", - function() require("dap").session() end, - desc = - "Session" - }, - { - "dt", - function() require("dap").terminate() end, - desc = - "Terminate" - }, - { - "dw", - function() require("dap.ui.widgets").hover() end, - desc = - "Widgets" - }, - }, - - config = function() - local Config = require("lazyvim.config") - vim.api.nvim_set_hl(0, "DapStoppedLine", { default = true, link = "Visual" }) - - for name, sign in pairs(Config.icons.dap) do - sign = type(sign) == "table" and sign or { sign } - vim.fn.sign_define( - "Dap" .. name, - { text = sign[1], texthl = sign[2] or "DiagnosticInfo", linehl = sign[3], numhl = sign[3] } - ) - end - end, - } -} diff --git a/.config/nvim/lua/plugins/example.lua b/.config/nvim/lua/plugins/example.lua deleted file mode 100644 index 78a33705..00000000 --- a/.config/nvim/lua/plugins/example.lua +++ /dev/null @@ -1,266 +0,0 @@ --- since this is just an example spec, don't actually load anything here and return an empty spec --- stylua: ignore -if true then return {} end - --- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim --- --- In your plugin files, you can: --- * add extra plugins --- * disable/enabled LazyVim plugins --- * override the configuration of LazyVim plugins -return { - -- add gruvbox - { "ellisonleao/gruvbox.nvim" }, - - -- Configure LazyVim to load gruvbox - { - "LazyVim/LazyVim", - opts = { - colorscheme = "gruvbox", - }, - }, - - -- change trouble config - { - "folke/trouble.nvim", - -- opts will be merged with the parent spec - opts = { use_diagnostic_signs = true }, - }, - - -- disable trouble - { "folke/trouble.nvim", enabled = false }, - - -- add symbols-outline - { - "simrat39/symbols-outline.nvim", - cmd = "SymbolsOutline", - keys = { { "cs", "SymbolsOutline", desc = "Symbols Outline" } }, - config = true, - }, - - -- override nvim-cmp and add cmp-emoji - { - "hrsh7th/nvim-cmp", - dependencies = { "hrsh7th/cmp-emoji" }, - ---@param opts cmp.ConfigSchema - opts = function(_, opts) - local cmp = require("cmp") - opts.sources = cmp.config.sources(vim.list_extend(opts.sources, { { name = "emoji" } })) - end, - }, - - -- change some telescope options and a keymap to browse plugin files - { - "nvim-telescope/telescope.nvim", - keys = { - -- add a keymap to browse plugin files - -- stylua: ignore - { - "fp", - function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end, - desc = "Find Plugin File", - }, - }, - -- change some options - opts = { - defaults = { - layout_strategy = "horizontal", - layout_config = { prompt_position = "top" }, - sorting_strategy = "ascending", - winblend = 0, - }, - }, - }, - - -- add telescope-fzf-native - { - "telescope.nvim", - dependencies = { - "nvim-telescope/telescope-fzf-native.nvim", - build = "make", - config = function() - require("telescope").load_extension("fzf") - end, - }, - }, - - -- add pyright to lspconfig - { - "neovim/nvim-lspconfig", - ---@class PluginLspOpts - opts = { - ---@type lspconfig.options - servers = { - -- pyright will be automatically installed with mason and loaded with lspconfig - pyright = {}, - }, - }, - }, - - -- add tsserver and setup with typescript.nvim instead of lspconfig - { - "neovim/nvim-lspconfig", - dependencies = { - "jose-elias-alvarez/typescript.nvim", - init = function() - require("lazyvim.util").on_attach(function(_, buffer) - -- stylua: ignore - vim.keymap.set( "n", "co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" }) - vim.keymap.set("n", "cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer }) - end) - end, - }, - ---@class PluginLspOpts - opts = { - ---@type lspconfig.options - servers = { - -- tsserver will be automatically installed with mason and loaded with lspconfig - tsserver = {}, - }, - -- you can do any additional lsp server setup here - -- return true if you don't want this server to be setup with lspconfig - ---@type table - setup = { - -- example to setup with typescript.nvim - tsserver = function(_, opts) - require("typescript").setup({ server = opts }) - return true - end, - -- Specify * to use this function as a fallback for any server - -- ["*"] = function(server, opts) end, - }, - }, - }, - - -- for typescript, LazyVim also includes extra specs to properly setup lspconfig, - -- treesitter, mason and typescript.nvim. So instead of the above, you can use: - { import = "lazyvim.plugins.extras.lang.typescript" }, - - -- add more treesitter parsers - { - "nvim-treesitter/nvim-treesitter", - opts = { - ensure_installed = { - "bash", - "html", - "javascript", - "json", - "lua", - "markdown", - "markdown_inline", - "python", - "query", - "regex", - "tsx", - "typescript", - "vim", - "yaml", - }, - }, - }, - - -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above - -- would overwrite `ensure_installed` with the new value. - -- If you'd rather extend the default config, use the code below instead: - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - -- add tsx and treesitter - vim.list_extend(opts.ensure_installed, { - "tsx", - "typescript", - }) - end, - }, - - -- the opts function can also be used to change the default opts: - { - "nvim-lualine/lualine.nvim", - event = "VeryLazy", - opts = function(_, opts) - table.insert(opts.sections.lualine_x, "😄") - end, - }, - - -- or you can return new options to override all the defaults - { - "nvim-lualine/lualine.nvim", - event = "VeryLazy", - opts = function() - return { - --[[add your custom lualine config here]] - } - end, - }, - - -- use mini.starter instead of alpha - { import = "lazyvim.plugins.extras.ui.mini-starter" }, - - -- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc - { import = "lazyvim.plugins.extras.lang.json" }, - - -- add any tools you want to have installed below - { - "williamboman/mason.nvim", - opts = { - ensure_installed = { - "stylua", - "shellcheck", - "shfmt", - "flake8", - }, - }, - }, - - -- Use for completion and snippets (supertab) - -- first: disable default and behavior in LuaSnip - { - "L3MON4D3/LuaSnip", - keys = function() - return {} - end, - }, - -- then: setup supertab in cmp - { - "hrsh7th/nvim-cmp", - dependencies = { - "hrsh7th/cmp-emoji", - }, - ---@param opts cmp.ConfigSchema - opts = function(_, opts) - local has_words_before = function() - unpack = unpack or table.unpack - local line, col = unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil - end - - local luasnip = require("luasnip") - local cmp = require("cmp") - - opts.mapping = vim.tbl_extend("force", opts.mapping, { - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - -- You could replace the expand_or_jumpable() calls with expand_or_locally_jumpable() - -- this way you will only jump inside the snippet region - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - elseif has_words_before() then - cmp.complete() - else - fallback() - end - end, { "i", "s" }), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { "i", "s" }), - }) - end, - }, -} diff --git a/.config/nvim/lua/plugins/glance.lua b/.config/nvim/lua/plugins/glance.lua index 6ccfdb64..0c927f52 100644 --- a/.config/nvim/lua/plugins/glance.lua +++ b/.config/nvim/lua/plugins/glance.lua @@ -1,6 +1,6 @@ return { - { - "dnlhc/glance.nvim", - lazy = false, - }, + { + "dnlhc/glance.nvim", + lazy = true, + }, } diff --git a/.config/nvim/lua/plugins/glow.lua b/.config/nvim/lua/plugins/glow.lua index 8dfc1dd6..9f5c230b 100644 --- a/.config/nvim/lua/plugins/glow.lua +++ b/.config/nvim/lua/plugins/glow.lua @@ -1,3 +1,3 @@ return { - { "ellisonleao/glow.nvim", config = true, lazy = false, cmd = "Glow" } + { "ellisonleao/glow.nvim", config = true, lazy = true, cmd = "Glow" }, } diff --git a/.config/nvim/lua/plugins/legendary.lua b/.config/nvim/lua/plugins/legendary.lua deleted file mode 100644 index a1f0a516..00000000 --- a/.config/nvim/lua/plugins/legendary.lua +++ /dev/null @@ -1,11 +0,0 @@ -return { - { - 'mrjones2014/legendary.nvim', - -- since legendary.nvim handles all your keymaps/commands, - -- its recommended to load legendary.nvim before other plugins - priority = 10000, - lazy = false, - -- sqlite is only needed if you want to use frecency sorting - -- dependencies = { 'kkharji/sqlite.lua' } - } -} diff --git a/.config/nvim/lua/plugins/live-server.lua b/.config/nvim/lua/plugins/live-server.lua index 8f69a514..3d2df7e7 100644 --- a/.config/nvim/lua/plugins/live-server.lua +++ b/.config/nvim/lua/plugins/live-server.lua @@ -1,4 +1,3 @@ return { - { "barrett-ruth/live-server.nvim", lazy = false, build = 'yarn global add live-server', config = true - } + { "barrett-ruth/live-server.nvim", lazy = true, build = "yarn global add live-server", config = true }, } diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua deleted file mode 100644 index 82c7d38d..00000000 --- a/.config/nvim/lua/plugins/lspconfig.lua +++ /dev/null @@ -1,281 +0,0 @@ -return { - { - "neovim/nvim-lspconfig", - opts = { - servers = { - eslint = { - settings = { - -- helps eslint find the eslintrc when it's placed in a subfolder instead of the cwd root - workingDirectory = { mode = "auto" }, - }, - }, - pyright = {}, - ruff_lsp = {}, - neocmake = {}, - dockerls = {}, - docker_compose_language_service = {}, - gopls = { - keys = { - -- Workaround for the lack of a DAP strategy in neotest-go: https://github.com/nvim-neotest/neotest-go/issues/12 - { "td", "lua require('dap-go').debug_test()", desc = "Debug Nearest (Go)" }, - }, - settings = { - gopls = { - gofumpt = true, - codelenses = { - gc_details = false, - generate = true, - regenerate_cgo = true, - run_govulncheck = true, - test = true, - tidy = true, - upgrade_dependency = true, - vendor = true, - }, - hints = { - assignVariableTypes = true, - compositeLiteralFields = true, - compositeLiteralTypes = true, - constantValues = true, - functionTypeParameters = true, - parameterNames = true, - rangeVariableTypes = true, - }, - analyses = { - fieldalignment = true, - nilness = true, - unusedparams = true, - unusedwrite = true, - useany = true, - }, - usePlaceholders = true, - completeUnimported = true, - staticcheck = true, - directoryFilters = { "-.git", "-.vscode", "-.idea", "-.vscode-test", "-node_modules" }, - semanticTokens = true, - }, - }, - }, - jdtls = { - -- stylua: ignore - keys = { - { - "co", - function() require("jdtls").organize_imports() end, - desc = - "Organize Imports", - }, - { - "cR", - function() require("jdtls").rename_file() end, - desc = - "Rename File", - }, - { - "cxv", - function() require("jdtls").extract_variable() end, - desc = - "Extract Variable", - }, - { - "cxv", - function() require("jdtls").extract_variable({ visual = true }) end, - mode = "v", - desc = - "Extract Variable", - }, - { - "cxc", - function() require("jdtls").extract_constant() end, - desc = - "Extract Constant", - }, - { - "cxc", - function() require("jdtls").extract_constant({ visual = true }) end, - mode = "v", - desc = - "Extract Constant", - }, - { - "cxm", - function() require("jdtls").extract_method({ visual = true }) end, - mode = "v", - desc = - "Extract Method", - }, - }, - }, - rust_analyzer = { - keys = { - { "K", "RustHoverActions", desc = "Hover Actions (Rust)" }, - { "cR", "RustCodeAction", desc = "Code Action (Rust)" }, - { "dr", "RustDebuggables", desc = "Run Debuggables (Rust)" }, - }, - settings = { - ["rust-analyzer"] = { - cargo = { - allFeatures = true, - loadOutDirsFromCheck = true, - runBuildScripts = true, - }, - -- Add clippy lints for Rust. - checkOnSave = { - allFeatures = true, - command = "clippy", - extraArgs = { "--no-deps" }, - }, - procMacro = { - enable = true, - ignored = { - ["async-trait"] = { "async_trait" }, - ["napi-derive"] = { "napi" }, - ["async-recursion"] = { "async_recursion" }, - }, - }, - }, - }, - }, - taplo = { - keys = { - { - "K", - function() - if vim.fn.expand("%:t") == "Cargo.toml" and require("crates").popup_available() then - require("crates").show_popup() - else - vim.lsp.buf.hover() - end - end, - desc = "Show Crate Documentation", - }, - }, - }, - }, - tsserver = { - keys = { - { "co", "TypescriptOrganizeImports", desc = "Organize Imports" }, - { "cR", "TypescriptRenameFile", desc = "Rename File" }, - }, - settings = { - typescript = { - format = { - indentSize = vim.o.shiftwidth, - convertTabsToSpaces = vim.o.expandtab, - tabSize = vim.o.tabstop, - }, - }, - javascript = { - format = { - indentSize = vim.o.shiftwidth, - convertTabsToSpaces = vim.o.expandtab, - tabSize = vim.o.tabstop, - }, - }, - completions = { - completeFunctionCalls = true, - }, - }, - }, - }, - setup = { - rust_analyzer = function(_, opts) - local rust_tools_opts = require("lazyvim.util").opts("rust-tools.nvim") - require("rust-tools").setup(vim.tbl_deep_extend("force", rust_tools_opts or {}, { server = opts })) - return true - end, - ruff_lsp = function() - require("lazyvim.util").on_attach(function(client, _) - if client.name == "ruff_lsp" then - -- Disable hover in favor of Pyright - client.server_capabilities.hoverProvider = false - end - end) - end, - - gopls = function(_, opts) - -- workaround for gopls not supporting semanticTokensProvider - -- https://github.com/golang/go/issues/54531#issuecomment-1464982242 - require("lazyvim.util").on_attach(function(client, _) - if client.name == "gopls" then - if not client.server_capabilities.semanticTokensProvider then - local semantic = client.config.capabilities.textDocument.semanticTokens - client.server_capabilities.semanticTokensProvider = { - full = true, - legend = { - tokenTypes = semantic.tokenTypes, - tokenModifiers = semantic.tokenModifiers, - }, - range = true, - } - end - end - end) - -- end workaround - end, - - jdtls = function() - -- The lspconfig configuration for jdtls contains two useful items: - -- 1. The list of filetypes on which to match. - -- 2. Custom method for finding the root for a java project. - local lsp_config = require("lspconfig.server_configurations.jdtls").default_config - local find_java_project_root = lsp_config.root_dir - local filetypes = lsp_config.filetypes - - -- Attach jdtls for the proper filetypes (i.e. java). - -- Existing server will be reused if the root_dir matches. - vim.api.nvim_create_autocmd("FileType", { - group = vim.api.nvim_create_augroup("MyJdtls", { clear = true }), - pattern = filetypes, - callback = function() - local fname = vim.api.nvim_buf_get_name(0) - local root_dir = find_java_project_root(fname) - local project_name = root_dir and vim.fs.basename(root_dir) - local cmd = { "jdtls" } - if project_name then - local jdtls_cache_dir = vim.fs.joinpath(vim.fn.stdpath("cache"), "jdtls", project_name) - vim.list_extend(cmd, { - "-configuration", - vim.fs.joinpath(jdtls_cache_dir, "config"), - "-data", - vim.fs.joinpath(jdtls_cache_dir, "workspace"), - }) - end - require("jdtls").start_or_attach({ - cmd = cmd, - root_dir = root_dir, - }) - require("which-key").register({ c = { x = { name = "Extract" } } }, { prefix = "" }) - end, - }) - - return true -- avoid duplicate servers - end, - - tsserver = function(_, opts) - require("typescript").setup({ server = opts }) - return true - end, - - eslint = function() - vim.api.nvim_create_autocmd("BufWritePre", { - callback = function(event) - if not require("lazyvim.plugins.lsp.format").enabled() then - -- exit early if autoformat is not enabled - return - end - - local client = vim.lsp.get_active_clients({ bufnr = event.buf, name = "eslint" })[1] - if client then - local diag = vim.diagnostic.get(event.buf, - { namespace = vim.lsp.diagnostic.get_namespace(client.id) }) - if #diag > 0 then - vim.cmd("EslintFixAll") - end - end - end, - }) - end, - }, - }, -} diff --git a/.config/nvim/lua/plugins/mason.lua b/.config/nvim/lua/plugins/mason.lua index b0ca0ae5..af47bddf 100644 --- a/.config/nvim/lua/plugins/mason.lua +++ b/.config/nvim/lua/plugins/mason.lua @@ -3,90 +3,13 @@ return { "williamboman/mason.nvim", opts = { ensure_installed = { - "angular-language-server", - "arduino-language-server", - "bash-language-server", - "bash-debug-adapter", + "black", "beautysh", - "clang-format", - "cmake-language-server", - "cmakelang", - "cmakelint", - "codelldb", "codespell", - "csharp-language-server", "csharpier", - "css-lsp", - "cssmodules-language-server", - "dart-debug-adapter", - "debugpy", - "delve", - "docformatter", - "docker-compose-language-service", - "dockerfile-language-server", - "elixir-ls", - "emmet-language-server", - "emmet-ls", - "eslint-lsp", - "eslint_d", - "firefox-debug-adapter", - "gitlint", - "go-debug-adapter", - "gofumpt", - "goimports", - "goimports-reviser", - "golangci-lint", - "golangci-lint-langserver", - "gomodifytags", - "gopls", - "gradle-language-server", - "grammarly-languageserver", - "graphql-language-service-cli", - "hadolint", - "html-lsp", - "impl", - "intelephense", - "java-debug-adapter", - "java-test", - "jdtls", - "js-debug-adapter", - "json-lsp", - "jsonlint", - "julia-lsp", - "kotlin-language-server", - "kotlin-debug-adapter", "ktlint", - "lua-language-server", - "luacheck", - "markdownlint", - "neocmakelsp", - "netcoredbg", - "omnisharp", - "omnisharp-mono", - "php-debug-adapter", - "prettier", - "prettierd", - "purescript-language-server", - "pyright", - "ruff-lsp", - "rust-analyzer", "rustywind", - "shfmt", - "sql-formatter", - "stylelint-lsp", - "stylua", - "svelte-language-server", - "tailwindcss-language-server", - "taplo", - "ts-standard", - "typescript-language-server", - "vetur-vls", - "vim-language-server", - "vue-language-server", - "xmlformatter", - "yaml-language-server", - "yamlfix", - "stylelint", + "sqlfmt", }, }, }, diff --git a/.config/nvim/lua/plugins/mini-animate.lua.bak b/.config/nvim/lua/plugins/mini-animate.lua.bak deleted file mode 100644 index 349baf9f..00000000 --- a/.config/nvim/lua/plugins/mini-animate.lua.bak +++ /dev/null @@ -1,36 +0,0 @@ -return { - { - "echasnovski/mini.animate", - event = "VeryLazy", - opts = function() - -- don't use animate when scrolling with the mouse - local mouse_scrolled = false - for _, scroll in ipairs({ "Up", "Down" }) do - local key = "" - vim.keymap.set({ "", "i" }, key, function() - mouse_scrolled = true - return key - end, { expr = true }) - end - - local animate = require("mini.animate") - return { - resize = { - timing = animate.gen_timing.linear({ duration = 50, unit = "total" }), - }, - scroll = { - timing = animate.gen_timing.linear({ duration = 50, unit = "total" }), - subscroll = animate.gen_subscroll.equal({ - predicate = function(total_scroll) - if mouse_scrolled then - mouse_scrolled = false - return false - end - return total_scroll > 1 - end, - }), - }, - } - end, - } -} diff --git a/.config/nvim/lua/plugins/null-ls.lua b/.config/nvim/lua/plugins/null-ls.lua index 0043e9df..71bfc8a4 100644 --- a/.config/nvim/lua/plugins/null-ls.lua +++ b/.config/nvim/lua/plugins/null-ls.lua @@ -2,32 +2,19 @@ return { { "jose-elias-alvarez/null-ls.nvim", opts = function(_, opts) - if type(opts.sources) == "table" then - local nls = require("null-ls") - vim.list_extend(opts.sources, { - nls.builtins.code_actions.gomodifytags, - nls.builtins.code_actions.impl, - nls.builtins.formatting.gofumpt, - nls.builtins.formatting.goimports_reviser, - }) - end - local nls = require("null-ls") + opts.sources = opts.sources or {} vim.list_extend(opts.sources, { - nls.builtins.diagnostics.hadolint, + nls.builtins.formatting.beautysh, + nls.builtins.formatting.black, + nls.builtins.formatting.codespell, + nls.builtins.formatting.csharpier, + nls.builtins.formatting.ktlint, + nls.builtins.formatting.rustywind, + nls.builtins.formatting.sqlfmt, + nls.builtins.formatting.rustfmt }) - - local nls = require("null-ls") - opts.sources = opts.sources or {} - vim.list_extend(opts.sources, { - nls.builtins.diagnostics.cmake_lint, - }) - - table.insert(opts.sources, require("typescript.extensions.null-ls.code-actions")) - - local nls = require("null-ls") - table.insert(opts.sources, nls.builtins.formatting.prettierd) end, - } + }, } diff --git a/.config/nvim/lua/plugins/numb.lua b/.config/nvim/lua/plugins/numb.lua deleted file mode 100644 index fa73adc0..00000000 --- a/.config/nvim/lua/plugins/numb.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - { - "nacro90/numb.nvim", - lazy = false - } -} diff --git a/.config/nvim/lua/plugins/project.lua b/.config/nvim/lua/plugins/project.lua deleted file mode 100644 index 64334e8e..00000000 --- a/.config/nvim/lua/plugins/project.lua +++ /dev/null @@ -1,14 +0,0 @@ -return { - { - "ahmedkhalf/project.nvim", - opts = {}, - event = "VeryLazy", - config = function(_, opts) - require("project_nvim").setup(opts) - require("telescope").load_extension("projects") - end, - keys = { - { "fp", "Telescope projects", desc = "Projects" }, - }, - }, -} diff --git a/.config/nvim/lua/plugins/ranger.lua b/.config/nvim/lua/plugins/ranger.lua deleted file mode 100644 index 96638f97..00000000 --- a/.config/nvim/lua/plugins/ranger.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - { "kevinhwang91/rnvimr", lazy = false } -} diff --git a/.config/nvim/lua/plugins/tabout.lua.bak b/.config/nvim/lua/plugins/tabout.lua.bak deleted file mode 100644 index e42c8505..00000000 --- a/.config/nvim/lua/plugins/tabout.lua.bak +++ /dev/null @@ -1,26 +0,0 @@ -return { - { - "abecodes/tabout.nvim", - lazy = false, - opts = { - tabkey = '', -- key to trigger tabout, set to an empty string to disable - backwards_tabkey = '', -- key to trigger backwards tabout, set to an empty string to disable - act_as_tab = true, -- shift content if tab out is not possible - act_as_shift_tab = false, -- reverse shift content if tab out is not possible (if your keyboard/terminal supports ) - default_tab = '', -- shift default action (only at the beginning of a line, otherwise is used) - default_shift_tab = '', -- reverse shift default action, - enable_backwards = true, -- well ... - completion = true, -- if the tabkey is used in a completion pum - tabouts = { - { open = "'", close = "'" }, - { open = '"', close = '"' }, - { open = '`', close = '`' }, - { open = '(', close = ')' }, - { open = '[', close = ']' }, - { open = '{', close = '}' } - }, - ignore_beginning = true, --[[ if the cursor is at the beginning of a filled element it will rather tab out than shift the content ]] - exclude = {} -- tabout will ignore these filetypes - } - } -} diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua index f68deced..666d459b 100644 --- a/.config/nvim/lua/plugins/treesitter.lua +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -6,34 +6,22 @@ return { enable = true, } vim.list_extend(opts.ensure_installed, { - "tsx", - "typescript", "arduino", - "cmake", "diff", "dart", "css", - "c", "c_sharp", - "elixir", "comment", - "dockerfile", "fish", "git_config", "git_rebase", "gitattributes", "gitcommit", "gitignore", - "go", - "gomod", - "gowork", - "gosum", "groovy", "hjson", "http", "ini", - "java", - "json5", "luadoc", "make", "kotlin", @@ -42,24 +30,17 @@ return { "perl", "php", "prisma", - "python", "r", - "ron", "rasi", "regex", "ruby", - "rust", "sql", "scss", "slint", "svelte", - "toml", "todotxt", "vim", "vue", - "yaml", - "ninja", - "rst" }) end, }, diff --git a/.config/nvim/lua/plugins/twilight.lua.bak b/.config/nvim/lua/plugins/twilight.lua.bak deleted file mode 100644 index a5f62dec..00000000 --- a/.config/nvim/lua/plugins/twilight.lua.bak +++ /dev/null @@ -1,23 +0,0 @@ -return { - { - "folke/twilight.nvim", - lazy = false, - opts = { - dimming = { - alpha = 0.55, -- amount of dimming - -- we try to get the foreground from the highlight groups or fallback color - color = { "Normal", "#ffffff" }, - term_bg = "#000000", -- if guibg=NONE, this will be used to calculate text color - inactive = false, -- when true, other windows will be fully dimmed (unless they contain the same buffer) - }, - context = 10, -- amount of lines we will try to show around the current line - treesitter = true, -- use treesitter when available for the filetype - -- treesitter is used to automatically expand the visible text, - -- but you can further control the types of nodes that should always be fully expanded - expand = { -- for treesitter, we we always try to expand to the top-most ancestor with these types - "function", - }, - exclude = {}, -- exclude these filetypes - } - } -} diff --git a/.config/nvim/lua/plugins/undotree.lua b/.config/nvim/lua/plugins/undotree.lua index cecf757c..a040450c 100644 --- a/.config/nvim/lua/plugins/undotree.lua +++ b/.config/nvim/lua/plugins/undotree.lua @@ -1,6 +1,6 @@ return { - { - "mbbill/undotree", - lazy = false, - }, + { + "mbbill/undotree", + lazy = true, + }, } diff --git a/.config/nvim/lua/plugins/which-key.lua b/.config/nvim/lua/plugins/which-key.lua deleted file mode 100644 index 963b8645..00000000 --- a/.config/nvim/lua/plugins/which-key.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - { - "folke/which-key.nvim", - optional = true, - opts = { - defaults = { - ["d"] = { name = "+debug" }, - ["da"] = { name = "+adapters" }, - }, - }, - } -} diff --git a/.config/nvim/lua/plugins/xplr.lua.bak b/.config/nvim/lua/plugins/xplr.lua.bak deleted file mode 100644 index faea7e59..00000000 --- a/.config/nvim/lua/plugins/xplr.lua.bak +++ /dev/null @@ -1,8 +0,0 @@ -return { - { - "fhill2/xplr.nvim", - lazy = false, - build = function() require 'xplr'.install({ hide = true }) end, - dependencies = { { 'nvim-lua/plenary.nvim' }, { 'MunifTanjim/nui.nvim' } } - } -} diff --git a/.config/nvim/stylua.toml b/.config/nvim/stylua.toml index 36d1d669..35848308 100644 --- a/.config/nvim/stylua.toml +++ b/.config/nvim/stylua.toml @@ -1,4 +1,3 @@ indent_type = "Spaces" indent_width = 4 -column_width = 120 - +column_width = 120 \ No newline at end of file