Skip to content

Commit

Permalink
cleanup vimRCs
Browse files Browse the repository at this point in the history
  • Loading branch information
flovilmart committed Nov 19, 2023
1 parent f200509 commit 6de73d8
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 1,006 deletions.
2 changes: 0 additions & 2 deletions init.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
vim.g.mapleader = ","

require('flovilmart')

-- vim.cmd('source ~/.config/nvim/vimrcs/basic.vim')
31 changes: 12 additions & 19 deletions lua/flovilmart/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,14 @@ local Plug = vim.fn['plug#']

vim.call('plug#begin', '~/.config/nvim/plugged')

-- Style and coloring
Plug ('altercation/vim-colors-solarized')
Plug ('sheerun/vim-wombat-scheme')
Plug ('tpope/vim-vinegar')

Plug ('vim-airline/vim-airline')
Plug ('vim-airline/vim-airline-themes')
Plug ('github/copilot.vim')

--" Searching
Plug ( 'junegunn/fzf', { dir = '~/.fzf', ['do'] = vim.fn['fzf#install']})

Plug ( 'junegunn/fzf.vim')

--" TreeSitter: Code parsing
Expand All @@ -25,29 +22,34 @@ vim.call('plug#begin', '~/.config/nvim/plugged')
Plug ('airblade/vim-gitgutter')

-- Language support
--" Plug ('sheerun/vim-polyglot')
Plug ('dense-analysis/ale')

-- LSP support, completion and snippets
Plug ('neovim/nvim-lspconfig')

Plug ('hrsh7th/nvim-cmp')
Plug ('hrsh7th/cmp-nvim-lsp')
Plug ('hrsh7th/cmp-buffer')
Plug ('hrsh7th/cmp-path')
Plug ('hrsh7th/cmp-cmdline')
Plug ('hrsh7th/nvim-cmp')
Plug ('hrsh7th/vim-vsnip')

Plug ('github/copilot.vim')

-- Rust
Plug ('simrat39/rust-tools.nvim')

-- Java
Plug ('mfussenegger/nvim-jdtls')

-- Rails
Plug ('tpope/vim-rails')

-- Navigation
Plug ('nvim-lua/plenary.nvim')
Plug ('nvim-telescope/telescope.nvim')
Plug ('nvim-telescope/telescope-file-browser.nvim')

--. Plug ('vim-ruby/vim-ruby')
Plug ('tpope/vim-rails')

-- " Plug ('fatih/vim-go', { 'do': ':GoUpdateBinaries' }

-- " Additional features
Plug ('mg979/vim-visual-multi')
Expand All @@ -62,15 +64,6 @@ vim.call('plug#begin', '~/.config/nvim/plugged')
Plug ('jgdavey/tslime.vim')
end

Plug ('leafgarland/typescript-vim')

-- " Syntax coloring
-- " Plug ('ap/vim-css-color')
Plug ('cespare/vim-toml', { branch = 'main' })
Plug ('peitalin/vim-jsx-typescript')
Plug ('jelera/vim-javascript-syntax')
Plug ('tpope/vim-markdown')

Plug ('iamcco/markdown-preview.nvim', {
['do'] = function() vim.fn["mkdp#util#install"]() end,
['for'] = {'markdown', 'vim-plug'} })
Expand Down
10 changes: 2 additions & 8 deletions plugin/after/cmp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,16 @@ 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.
-- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
-- require'snippy'.expand_snippet(args.body) -- For `snippy` users.
end,
},
mapping = {
['<C-b>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }),
['<Down>'] = cmp.mapping(cmp.mapping.select_next_item(), { 'i', 'c' }),
['<Up>'] = cmp.mapping(cmp.mapping.select_prev_item(), { 'i', 'c' }),
['<C-y>'] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
['<C-e>'] = cmp.mapping({
i = cmp.mapping.abort(),
Expand All @@ -26,10 +24,6 @@ cmp.setup({
},
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' },
})
Expand Down
Loading

0 comments on commit 6de73d8

Please sign in to comment.