From 347492fcbf67dd69843727588c3d9990454178a0 Mon Sep 17 00:00:00 2001 From: Andrew Coleman Date: Fri, 26 Mar 2021 09:07:21 -0400 Subject: [PATCH] revert lua conversion --- .config/nvim/init.vim | 36 ++++++++++++++++++++++++++++++- .config/nvim/lua/vimrc.lua | 44 -------------------------------------- 2 files changed, 35 insertions(+), 45 deletions(-) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 4b6076f..39c90f2 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -22,6 +22,40 @@ 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 visualbell +set noerrorbells +set whichwrap=<,>,[,],b, +set background=dark +set backspace=indent,eol,start +set number +set autoread +set mouse=a +set nobackup +set nowb +set noswapfile +syntax on +let mapleader = " " + lua require('vimrc') syntax on @@ -100,5 +134,5 @@ nnoremap :NvimTreeToggle nnoremap r :NvimTreeRefresh nnoremap n :NvimTreeFindFile let g:nvim_tree_auto_close = 1 -let g:nvim_tree_quit_on_open = 1 +" let g:nvim_tree_quit_on_open = 1 let g:nvim_tree_git_hl = 1 diff --git a/.config/nvim/lua/vimrc.lua b/.config/nvim/lua/vimrc.lua index 7941c79..0600258 100644 --- a/.config/nvim/lua/vimrc.lua +++ b/.config/nvim/lua/vimrc.lua @@ -1,47 +1,3 @@ -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 = {