From 1eda8b35d612bb4582029892c95fdc923f5b807c Mon Sep 17 00:00:00 2001 From: Andrew Coleman Date: Thu, 25 Mar 2021 10:49:27 -0400 Subject: [PATCH] convert more vimscript to lua --- .config/nvim/init.vim | 28 ++---------- .../lua/{bufferline-init.lua => vimrc.lua} | 44 +++++++++++++++++++ 2 files changed, 47 insertions(+), 25 deletions(-) rename .config/nvim/lua/{bufferline-init.lua => vimrc.lua} (56%) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 155ff2b..4b6076f 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -19,32 +19,12 @@ Plug 'vim-airline/vim-airline-themes' Plug 'kyazdani42/nvim-web-devicons' Plug 'kyazdani42/nvim-tree.lua' Plug 'akinsho/nvim-bufferline.lua' +Plug 'svermeulen/vimpeccable' call plug#end() -set nocompatible -set history=1000 -set title -set encoding=utf-8 -set scrolloff=3 -set ttyfast -set laststatus=2 -set ff=unix -set number -set tabstop=2 -set shiftwidth=2 -set softtabstop=2 -set nojoinspaces -set expandtab -set listchars=tab:>-,trail:- -set list -set noshowmode -set hlsearch -set incsearch -set termguicolors -set mouse=a -syntax on -let mapleader = " " +lua require('vimrc') +syntax on filetype on filetype plugin on filetype plugin indent on @@ -122,5 +102,3 @@ nnoremap n :NvimTreeFindFile let g:nvim_tree_auto_close = 1 let g:nvim_tree_quit_on_open = 1 let g:nvim_tree_git_hl = 1 - -lua require"bufferline-init" diff --git a/.config/nvim/lua/bufferline-init.lua b/.config/nvim/lua/vimrc.lua similarity index 56% rename from .config/nvim/lua/bufferline-init.lua rename to .config/nvim/lua/vimrc.lua index 0600258..7941c79 100644 --- a/.config/nvim/lua/bufferline-init.lua +++ b/.config/nvim/lua/vimrc.lua @@ -1,3 +1,47 @@ +vim.g.mapleader = " " + +-- Uncategorized +vim.g.nocompatible = true +vim.o.history = 1000 +vim.o.title = true +vim.o.encoding = 'utf-8' +vim.o.scrolloff = 3 +vim.o.ttyfast = true +vim.o.laststatus = 2 +vim.o.ff = 'unix' +vim.o.number = true + +-- File indentation +vim.o.tabstop = 2 +vim.o.shiftwidth = vim.o.tabstop +vim.o.softtabstop = vim.o.tabstop +vim.g.nojoinspaces = true +vim.o.expandtab = true +vim.o.listchars = 'tab:>-,trail:-' +vim.o.list = true + +-- Searching +vim.o.hlsearch = true +vim.o.incsearch = true + +-- Alerts +vim.o.visualbell = true +vim.g.noerrorbells = true + +-- Interaction +vim.o.whichwrap = '<,>,[,],b,' +vim.o.background = 'dark' +vim.o.backspace = 'indent,eol,start' +vim.o.termguicolors = true +vim.o.mouse = 'a' + +-- File Handling +vim.o.autoread = true +vim.g.nobackup = true +vim.g.nowb = true +vim.g.noswapfile = true + + -- Top buffer line require'bufferline'.setup({ options = {