From be465941c94023bd2471e2b88b8e0e9cd48b04fe Mon Sep 17 00:00:00 2001 From: Hamza Ali Date: Mon, 14 Mar 2022 11:31:34 +0700 Subject: [PATCH] Update on March 14 --- nvim/coc-settings.json | 119 +++++++++++++----- nvim/init.vim | 48 ++++---- nvim/plugins.vim | 8 +- nvim/spell/en.utf-8.add | 15 +++ nvim/spell/en.utf-8.add.spl | Bin 1259 -> 1457 bytes picom/picom.conf | 232 ++++++++++++++++++++++++++++++++++++ 6 files changed, 369 insertions(+), 53 deletions(-) create mode 100644 picom/picom.conf diff --git a/nvim/coc-settings.json b/nvim/coc-settings.json index 0bb2950..c1367b5 100644 --- a/nvim/coc-settings.json +++ b/nvim/coc-settings.json @@ -1,5 +1,15 @@ { - "codeLens.enable": true, + "coc.preferences.formatOnSaveFiletypes": ["gunk", "go", "css", "svelte", "typescript", "javascript"], + "coc.preferences.currentFunctionSymbolAutoUpdate": true, + "diagnostic.virtualText": true, + "diagnostic.virtualTextCurrentLineOnly": true, + "diagnostic.virtualTextPrefix": " ⇒ ", + "diagnostic.virtualTextLineSeparator": "|", + "diagnostic.errorSign": "✘", + "diagnostic.warningSign": "!", + "diagnostic.infoSign": "?", + "diagnostic.checkCurrentLine": true, + "codeLens.enable": false, "languageserver": { "golang": { "command": "gopls", @@ -16,16 +26,33 @@ "L": ["wait", "expandable?", "expand", "open"] } }, - "markdownlint.config": { - "default": true, - "MD001": false, - "MD007": false, - "MD012": false, - "MD013": false, - "MD024": false, - "MD032": false, - "MD033": false, - "MD041": false + "suggest.completionItemKindLabels": { + "class": "", + "color": "", + "constant": "", + "constructor": "", + "default": "", + "enum": "", + "enumMember": "", + "event": "鬒", + "field": "", + "file": "", + "folder": "", + "function": "ƒ", + "interface": "", + "keyword": "", + "method": "", + "module": "פּ", + "operator": "", + "property": "", + "reference": "", + "snippet": "", + "struct": "", + "text": "", + "typeParameter": "", + "unit": "", + "value": "", + "variable": "⒳" }, "go.goplsOptions": { "completeUnimported": true, @@ -33,22 +60,58 @@ "hoverKind": "SynopsisDocumentation", "linksInHover": false }, - "typescript": { - "implementationsCodeLense.enable": false, - "referencesCodeLens.enable": false - }, - "javascript": { - "implementationsCodeLense.enable": false, - "referencesCodeLens.enable": false - }, - "Lua": { - "workspace.library": { - "/usr/share/nvim/runtime/lua": true, - "/usr/share/nvim/runtime/lua/vim": true, - "/usr/share/nvim/runtime/lua/vim/lsp": true, - }, - "diagnostics": { - "globals": ["vim"] + "cSpell.allowCompoundWords": true, + "cSpell.enabledLanguageIds": [ "markdown", "pandoc" ], + "cSpell.languagesettings": [ + + { + "languageId": "gunk", + "local": "en", + "dictionaries": ["wordsEn", "softwareTerms", "misc", "go"] } - } + ], + "cSpell.userWords": [ + "Brankas", + "GRPC", + "Glitchless", + "Gorm", + "Idempotency", + "Minecraft", + "ORMs", + "Overworld", + "Piglin", + "Speedrunning", + "accountingreports", + "appstatus", + "authorizationholds", + "discordgo", + "emptypb", + "fset", + "glaccounts", + "gohtml", + "hhhapz", + "livestreams", + "newpage", + "nums", + "openapiv", + "pagebreak", + "pkgs", + "proto", + "protobuf", + "protoc", + "resends", + "speedrun", + "speedrunner", + "speedrunners", + "speedruns", + "struct", + "teamortix", + "textwidth", + "unban" + ], + "coc-gunk": { + "server.args": ["-lint"] + }, + "svelte.enable-ts-plugin": true + } diff --git a/nvim/init.vim b/nvim/init.vim index 1a70b46..2331f87 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -5,13 +5,12 @@ so ~/.config/nvim/word_processing.vim " --Plugin Configurations let g:airline#extensions#tabline#enabled = 1 +let g:airline#extensions#whitespace#enabled = 0 let g:airline_powerline_fonts = 1 let g:airline_theme='base16_bespin' -let g:formatdef_gunk = '"gunk format -"' -let g:formatters_gunk = ['gunk'] -let g:go_go_fmt_command="gopls" +" let g:formatdef_gunk = '"gunk format -"' +" let g:formatters_gunk = ['gunk'] let g:go_gopls_enabled = 1 -let g:go_gopls_gofumpt=1 let g:pandoc#command#autoexec_command = "Pandoc! pdf --citeproc" let g:pandoc#formatting#mode = 'ha' let g:pandoc#formatting#textwidth = 100 @@ -44,7 +43,7 @@ set guicursor+=a:blinkon0 set nofoldenable set updatetime=300 set shortmess+=c -set mouse=a +set mouse=ar " Indentation and highlighting filetype on @@ -68,18 +67,13 @@ hi Normal guibg=#NONE ctermbg=NONE set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')} lua <', ''}, - hide_cursor = true, - stop_eof = true, - use_local_scrolloff = false, - respect_scrolloff = false, - cursor_scrolls_alone = true, - easing_function = nil, - pre_hook = nil, - post_hook = nil, +-- telescope + +require'telescope'.setup { + defaults = { + initial_mode = "normal" } +} -- better syntax highlighting require'nvim-treesitter.configs'.setup { @@ -107,7 +101,7 @@ nnoremap :bprev nnoremap :bnext inoremap :bprev inoremap :bnext -nnoremap gf :e +nnoremap gf :e noremap noremap @@ -123,6 +117,10 @@ nnoremap w :e nnoremap E :Files nnoremap b :Buffers nnoremap d :bp:bd # +nnoremap ff Telescope find_files +nnoremap fg Telescope live_grep +nnoremap fb Telescope buffers +nnoremap fh Telescope help_tags nmap a (coc-codeaction-selected) noremap y :VCopy @@ -130,12 +128,13 @@ vnoremap y :VCopyVisual noremap pd :Pandoc pdf --citeproc -Vmainfont="TeX Gyre Schola" \ -Vmathfont="TeX Gyre Schola Math" -Vdocumentclass="scrartcl" \ --resource-path=images --highlight-style ~/.config/pandoc/code.theme - \ -Fpandoc-crossref -Fpandoc-include -Fpantable + \ -Fpandoc-crossref -Fpandoc-include -Fpantable nnoremap g :GoRun nnoremap f :PrettierAsync nnoremap so :so ~/.config/nvim/init.vim nnoremap e :CocCommand explorer --toggle +nnoremap lg :CocCommand workspace.showOutput coc-gunk noremap dap } p noremap vap :m '<-2gv=gv @@ -148,6 +147,11 @@ nmap gr (coc-references) nmap rn (coc-rename) nnoremap o :CocList outline +let g:copilot_filetypes = { + \ '*': v:false, + \ 'gunk': v:true, + \ } + """""""""""""""""""""""""""""""""""""""" " " " FILE TYPES " @@ -160,7 +164,8 @@ autocmd FileType html,css,scss autocmd FileType javascript,typescript,typescriptreact,svelte \ setlocal ts=2 sts=2 sw=2 expandtab autocmd BufNewFile,BufRead *.markdown,*.text - \ setlocal ts=2 sts=2 sw=2 textwidth=100 colorcolumn=101 + \ setlocal ts=2 sts=2 sw=2 + \ set textwidth=100 colorcolumn=101 autocmd FileType sql \setlocal ts=2 sts=2 sw=2 expandtab autocmd BufNewFile,BufRead *.md.tmpl @@ -185,8 +190,8 @@ autocmd BufNewFile,BufRead *.gltf \ setlocal filetype=gltf syntax=json autocmd BufNewFile,BufRead *.frag \ setlocal filetype=glsl syntax=glsl -autocmd BufWrite *.gunk - \ :Autoformat +" autocmd BufWrite *.gunk +" \ :Autoformat let g:coc_snippet_next = '' let g:coc_snippetnext = '' @@ -249,3 +254,4 @@ augroup mygroup autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp') augroup end +noremap py :! clear; python % diff --git a/nvim/plugins.vim b/nvim/plugins.vim index a1e7532..081619e 100644 --- a/nvim/plugins.vim +++ b/nvim/plugins.vim @@ -1,17 +1,16 @@ call plug#begin() +Plug 'chrisbra/Colorizer' Plug 'KabbAmine/vCoolor.vim' Plug 'ap/vim-css-color' Plug 'cespare/vim-toml' -Plug 'chiedo/vim-case-convert' Plug 'evanleck/vim-svelte', {'branch': 'main'} Plug 'fatih/vim-go' Plug 'github/copilot.vim' -Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }, 'for': ['markdown', 'vim-plug']} Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } Plug 'junegunn/fzf.vim' -Plug 'karb94/neoscroll.nvim' -Plug 'lervag/vimtex' +Plug 'nvim-lua/plenary.nvim' +Plug 'nvim-telescope/telescope.nvim' Plug 'machakann/vim-highlightedyank' Plug 'mattn/emmet-vim' Plug 'neoclide/coc.nvim', {'branch': 'release'} @@ -29,5 +28,6 @@ Plug 'vim-autoformat/vim-autoformat' Plug 'vim-pandoc/vim-pandoc' Plug 'vim-pandoc/vim-pandoc-syntax' Plug '~/code/misc/vcopy.nvim' +Plug 'hashivim/vim-terraform' call plug#end() diff --git a/nvim/spell/en.utf-8.add b/nvim/spell/en.utf-8.add index 613a63a..cfc7869 100644 --- a/nvim/spell/en.utf-8.add +++ b/nvim/spell/en.utf-8.add @@ -85,3 +85,18 @@ Haskell IBCS middleware middlewares +speedrunning +YouTuber +livestreams +RSG +Piglin +Piglins +Q2 +Q1 +during +COVID +gameplay +lockdown +Tegnell +FlyQuest +LabQuest diff --git a/nvim/spell/en.utf-8.add.spl b/nvim/spell/en.utf-8.add.spl index d8278f5096881daadd6d77a77a8597dc04e8bb37..402118d9516a0a470891dd19645047f2a918d533 100644 GIT binary patch literal 1457 zcmZWoJ8u&~5Z)P^7Nv?phulO$E{G!}Xpn#tB9RlE7+FxRee3h#_1@(kcAP2|Qabnt zl=&I-l=%&m&{M%Ta}Efh)7|aPy{5Wr8FbHq>?h4;$fzgxlP7&%68BCg5)@+3C+n-pqLCSr^mR=cg5bD&*tvUqGtlyY7xneYS$cab7f}`pP&e)m&LcV{oXzYX%E} zF4-_M3Lq&;>_iDJ5MA$ILd(u-UX*m93ab^;l)D}%7KIS%7nCTavT?h1JeKsK%F4#1 zBh^~s6}glGy6YU~8LgVUqoQqHs@3{DhGDEJj$vS%ByVD#E+L$N9lVo?rXcljFoEP| z0o`0nzLI+sS^}6rE3F8KEj9LdEKVt8;)U`{&!r+Ojpf*gcL{-TwHO)PyA=?U#^*8G z%AwTIf58Gw#nGd6_;)-9X@%yR23la|O1ym82CV|lQ=mx~H`T`kBx)bf6p4rifoGy& zFq1!IfS16FA?GcbqVAr2dNqVWQhP~wxV%#4yl0d;v9otO`(lZ3J8I^Z3g{2vXL!|Ci0o4 z@;wKVj(KOFZ6TxQQ2=N@*(PUNyyPVWN|XoxyE?Af zOoxr0I1Vf9rncj|s-l`*is6uTqAM8~J$%r;p%{v}=Isl9TIgs6XMLqpLr)Tot?t}Q6PJpx7=pDhlU7BOD z={Xvz?EvItQ-(-!vnjp2$>o8p!=EXR)MM6jvSEaZDkrY%Z5~oN|5-u@8w0q~hvvYfE$Lq`GQbZ9w z5+A__ptQ7XQ~#t9Na*4n!>J8#~b8Nb~>jFt0#Hv6){iE;~L{R8UTQLy<}v<6)+Pxl6|MVt2#(nq)hq5lzWapo|P|$_e&lNfx## z-Z=FIV@4I;5tbo&z2n#xvU%=d9>JMm$@Njk`9R3k9s>j0Bn{Gtx8`~dPmse_Lp3!Z z>hPVxs;v6%fh~NwfJN*Q9QD>*_d`f)kT3@iht!b`GeeM2mJAcUHlt;G{uDYkpYtrz zl{%~{Rt?@s zrrd{c*jB@BhAudSEd|h_NJWW^78a?7D0EQdVQB!YwYx>_q%|URp+Js}aE*#2lE;G9 zZ-6jqV_u>S93qkm+&x&pP69oh%eUt_)NpG9CxK=djfllJ9aq+f9Ro~Sa#vGyPY6yF z6`DWGNL(O1gPm7sj%`rhqTr5wf;zIzAh1DBdVI#nd|C()j$g`dUY$2=OO)2>ssSc@ z2`B*Xm~Z%_UN^rMY{lc~5>|m*$36q0IfX7JAc(vu;(iq5Wzdt6yvBvRFM-lFb(3u^ z)8e5Hp7&M>W7si7IG?Tq5b!@oT`PfkwFDQB@{2+dBe^xtbq=;TJ#`!w_${=;-*g6( zxlF+nddP6c!6iHTU_oMtefy^=q0pNyrKi}xhv_~Cj8R30oMOLG`ynmj^63;uCBBFx2B2U##F0m Jwj7FJ%pcq=