nvim: Use lua instead of VimScript

This includes switching from vim-plug to packer.nvim, and cleaning up
some packages I never use.
This commit is contained in:
snow flurry 2022-08-06 19:28:59 -07:00
parent 7d2c01f2b0
commit c036f22cdf
3 changed files with 59 additions and 101 deletions

View file

@ -1,13 +0,0 @@
set mouse=a
if exists(':Guifont')
Guifont Terminus [xos4]:h9
endif
if exists(':GuiTabline')
GuiTabline 0
endif
if exists(':GuiPopupmenu')
GuiPopupmenu 0
endif

View file

@ -0,0 +1,59 @@
local fn = vim.fn
local packer_bootstrap = false
local install_path = fn.stdpath('data') .. "/site/pack/packer/opt/packer.nvim"
if fn.empty(fn.glob(install_path)) > 0 then
vim.api.nvim_echo({ {"Installing packer.nvim", "Type" } }, true, {})
packer_bootstrap = fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
end
vim.cmd([[ packadd packer.nvim ]])
vim.api.nvim_create_autocmd("BufWritePost", {
pattern = "init.lua",
command = "source <afile> | PackerCompile",
})
require('packer').startup(function(use)
use { "wbthomason/packer.nvim", opt = true }
use { "nvim-lua/plenary.nvim" }
use {
"lewis6991/gitsigns.nvim",
config = function()
require('gitsigns').setup()
end
}
use { "catppuccin/nvim", as = "catppuccin",
config = function()
vim.g.catppuccin_flavour = "frappe"
require("catppuccin").setup({
transparent_background = true,
integrations = {
gitsigns = true
}
})
vim.cmd([[ colorscheme catppuccin ]])
end
}
if packer_bootstrap then
require('packer').sync()
end
end)
vim.o.sw = 4
vim.o.ts = 4
vim.o.sts = 4
vim.o.expandtab = true
vim.o.compatible = false
vim.cmd([[
syntax on
autocmd FileType make set noexpandtab shiftwidth=8 tabstop=8 softtabstop=0
set bs=indent
set number
]])

View file

@ -1,88 +0,0 @@
call plug#begin('~/.vim/plug')
Plug 'equalsraf/neovim-gui-shim'
Plug 'neovim/nvim-lspconfig'
Plug 'Pocco81/Catppuccino.nvim'
Plug 'vim-scripts/bash-support.vim'
Plug 'romgrk/barbar.nvim'
Plug 'kyazdani42/nvim-tree.lua'
Plug 'nvim-lua/plenary.nvim'
Plug 'lewis6991/gitsigns.nvim'
call plug#end()
lua << EOF
require'lspconfig'.rls.setup{}
EOF
lua << EOF
local catppuccino = require('catppuccino')
catppuccino.setup(
{
colorscheme = "catppuccino",
transparency = true,
integrations = {
treesitter = true,
native_lsp = {
enabled = true,
underlines = {
errors = "underline",
hints = "underline",
warnings = "underline",
information = "underline"
}
},
gitsigns = true,
nvimtree = {
enabled = true,
show_root = false
},
barbar = true
}
}
)
catppuccino.load()
EOF
" Barbar
let bufferline = get(g:, 'bufferline', {})
let bufferline.icons = v:false
let bufferline.animation = v:false
let bufferline.auto_hide = v:true
" nvim-tree
let g:nvim_tree_follow = 1
let g:nvim_tree_auto_open = 1
let g:nvim_tree_auto_close = 1
let g:nvim_tree_show_icons = {
\ 'git': 0,
\ 'folders': 0,
\ 'files': 0,
\ 'folder_arrows': 0,
\ }
nnoremap <silent> <A-1> :BufferGoto 1<CR>
nnoremap <silent> <A-2> :BufferGoto 2<CR>
nnoremap <silent> <A-3> :BufferGoto 3<CR>
nnoremap <silent> <A-4> :BufferGoto 4<CR>
nnoremap <silent> <A-5> :BufferGoto 5<CR>
nnoremap <silent> <A-6> :BufferGoto 6<CR>
nnoremap <silent> <A-7> :BufferGoto 7<CR>
nnoremap <silent> <A-8> :BufferGoto 8<CR>
nnoremap <silent> <A-9> :BufferGoto 9<CR>
nnoremap <silent> <A-,> :BufferPrevious<CR>
nnoremap <silent> <A-.> :BufferNext<CR>
nnoremap <silent> <A-p> :BufferPin<CR>
nnoremap <silent> <A-q> :BufferClose<CR>
set nocompatible
set sw=4 ts=4 sts=4 et
syntax on
autocmd FileType make set noexpandtab shiftwidth=8 tabstop=8 softtabstop=0
set bs=indent,eol,start
set ruler