From 867a84ed50e62716c8783d56406ccaf407481971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=88=D0=BE=D0=B2=D0=B0=D0=BD=20=D0=82=D0=BE=D0=BA=D0=B8?= =?UTF-8?q?=D1=9B-=D0=A8=D1=83=D0=BC=D0=B0=D1=80=D0=B0=D1=86?= Date: Tue, 25 Jul 2023 16:04:24 +0200 Subject: [PATCH] Try to fix readme --- README.md | 12 +---- init.vim | 137 ++++++++++++------------------------------------------ 2 files changed, 33 insertions(+), 116 deletions(-) diff --git a/README.md b/README.md index 3358752..9ea2f14 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,15 @@ +``` ▄▄▄█████▓ ██▀███ ██▓▒██ ██▒▓██ ██▓ - ▓ ██▒ ▓▒▓██ ▒ ██▒▓██▒▒▒ █ █ ▒░ ▒██ ██▒ - ▒ ▓██░ ▒░▓██ ░▄█ ▒▒██▒░░ █ ░ ▒██ ██░ - ░ ▓██▓ ░ ▒██▀▀█▄ ░██░ ░ █ █ ▒ ░ ▐██▓░ - ▒██▒ ░ ░██▓ ▒██▒░██░▒██▒ ▒██▒ ░ ██▒▓░ - ▒ ░░ ░ ▒▓ ░▒▓░░▓ ▒▒ ░ ░▓ ░ ██▒▒▒ - ░ ░▒ ░ ▒░ ▒ ░░░ ░▒ ░ ▓██ ░▒░ - ░ ░░ ░ ▒ ░ ░ ░ ▒ ▒ ░░ - ░ ░ ░ ░ ░ ░ - ░ ░ - +``` Trtixy is a begginer friendy config for nevim, that aims to be powerfull while remaining minimal, compared to other nvim distributions. diff --git a/init.vim b/init.vim index 4f7ae3d..b5079f4 100644 --- a/init.vim +++ b/init.vim @@ -74,21 +74,22 @@ call plug#begin() Plug 'MunifTanjim/nui.nvim' Plug 'SirVer/ultisnips' Plug 'lervag/vimtex' - Plug 'williamboman/mason.nvim', { 'do': ':MasonUpdate' } +" Plug 'williamboman/mason.nvim', { 'do': ':MasonUpdate' } - Plug 'neovim/nvim-lspconfig' - Plug 'hrsh7th/cmp-nvim-lsp' - Plug 'hrsh7th/cmp-buffer' - Plug 'hrsh7th/cmp-path' - Plug 'hrsh7th/cmp-cmdline' - Plug 'hrsh7th/nvim-cmp' +" Plug 'neovim/nvim-lspconfig' +" Plug 'hrsh7th/cmp-nvim-lsp' +" Plug 'hrsh7th/cmp-buffer' +" Plug 'hrsh7th/cmp-path' +" Plug 'hrsh7th/cmp-cmdline' +" Plug 'hrsh7th/nvim-cmp' - Plug 'SirVer/ultisnips' - Plug 'quangnguyen30192/cmp-nvim-ultisnips' +" Plug 'SirVer/ultisnips' +" Plug 'quangnguyen30192/cmp-nvim-ultisnips' Plug 'bkad/camelcasemotion' - + Plug 'nvim-treesitter.configs' + Plug 'HiPhish/nvim-ts-rainbow2' Plug 'nvim-neorg/neorg' Plug 'nvim-lua/plenary.nvim' @@ -115,12 +116,12 @@ call plug#end() " .__/ | \| | | | |___ | .__/ -let g:UltiSnipsExpandTrigger="" -let g:UltiSnipsJumpForwardTrigger="jk" -let g:UltiSnipsJumpBackwardTrigger="kj" +" let g:UltiSnipsExpandTrigger="" +" let g:UltiSnipsJumpForwardTrigger="jk" +" let g:UltiSnipsJumpBackwardTrigger="kj" -let g:UltiSnipsSnippetDirectories = [$HOME.'/.config/nvim/UltiSnips'] -let g:UltiSnipsEditSplit = 'context' +" let g:UltiSnipsSnippetDirectories = [$HOME.'/.config/nvim/UltiSnips'] +" let g:UltiSnipsEditSplit = 'context' @@ -158,7 +159,7 @@ nnoremap tw lua MiniTrailspace.trim() nnoremap ff lua MiniFiles.open() nnoremap fc lua MiniFiles.close() nnoremap tt 12 split Tnew -nnoremap sc TSEnable highlight +" nnoremap sc TSEnable highlight nnoremap zt Twilight nnoremap zz ZenMode @@ -167,8 +168,8 @@ nnoremap zz ZenMode nnoremap v :vsplit ~/.config/nvim/init.vim nnoremap V :source ~/.config/nvim/init.vim -nnoremap s :UltiSnipsEdit -nnoremap S :call UltiSnips#RefreshSnippets() +" nnoremap s :UltiSnipsEdit +" nnoremap S :call UltiSnips#RefreshSnippets() map w CamelCaseMotion_w map b CamelCaseMotion_b @@ -201,17 +202,25 @@ lua << EOF require('mini.starter').setup() require('mini.trailspace').setup() require('mini.statusline').setup() - require('mini.trailspace').setup() require('mini.hipatterns').setup() require('mini.indentscope').setup() require('noice').setup() - require("mason").setup() - require('smoothcursor').setup() +-- require('mason').setup() --- Neorg SETUP + require('nvim-treesitter.configs').setup { + rainbow = { + enable = true, + -- list of languages you want to disable the plugin for + disable = { 'jsx' }, + -- Which query to use for finding delimiters + query = 'rainbow-parens', + -- Highlight the entire buffer all at once + strategy = require('ts-rainbow').strategy.global, + } + } require('neorg').setup { @@ -234,90 +243,6 @@ lua << EOF - - --- CMP SETUP - - - - -- Set up nvim-cmp. - local cmp = require'cmp' - - cmp.setup({ - snippet = { - -- REQUIRED - you must specify a snippet engine - expand = function(args) - --vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users. - -- require('luasnip').lsp_expand(args.body) -- For `luasnip` users. - -- require('snippy').expand_snippet(args.body) -- For `snippy` users. - vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users. - end, - }, - window = { - -- completion = cmp.config.window.bordered(), - -- documentation = cmp.config.window.bordered(), - }, - mapping = cmp.mapping.preset.insert({ - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.abort(), - [''] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. - }), - sources = cmp.config.sources({ - { name = 'nvim_lsp' }, - -- { name = 'vsnip' }, -- For vsnip users. - -- { name = 'luasnip' }, -- For luasnip users. - { name = 'ultisnips' }, -- For ultisnips users. - -- { name = 'snippy' }, -- For snippy users. - }, { - { name = 'buffer' }, - }) - }) - - -- Set configuration for specific filetype. - cmp.setup.filetype('gitcommit', { - sources = cmp.config.sources({ - { name = 'git' }, -- You can specify the `git` source if [you were installed it](https://github.com/petertriho/cmp-git). - }, { - { name = 'buffer' }, - }) - }) - - -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore). - cmp.setup.cmdline({ '/', '?' }, { - mapping = cmp.mapping.preset.cmdline(), - sources = { - { name = 'buffer' } - } - }) - - -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore). - cmp.setup.cmdline(':', { - mapping = cmp.mapping.preset.cmdline(), - sources = cmp.config.sources({ - { name = 'path' } - }, { - { name = 'cmdline' } - }) - }) - - -- Set up lspconfig. - local capabilities = require('cmp_nvim_lsp').default_capabilities() - -- Replace with each lsp server you've enabled. - require('lspconfig')['clangd'].setup { - capabilities = capabilities - } - require('lspconfig')['texlab'].setup { - capabilities = capabilities - } - - - - - - - require('smoothcursor').setup({ autostart = true, cursor = "", -- cursor shape (need nerd font)