Convert bulk of options to lua

This commit is contained in:
Evie Litherland-Smith 2022-11-01 15:26:31 +00:00
parent 4706ac1a6b
commit 72a5ce841b
2 changed files with 29 additions and 33 deletions

View file

@ -48,42 +48,14 @@ Plug 'folke/trouble.nvim'
call plug#end() call plug#end()
]] ]]
vim.notify = require("notify")
require 'keymaps'
require 'config_lsp'
require 'config_plugins'
-- TODO convert to lua -- TODO convert to lua
vim.cmd[[ vim.cmd[[
" set runtimepath^=~/.vim runtimepath+=~/.vim/after
" let &packpath = &runtimepath
" source ~/.vimrc
let g:loaded = 1
let g:loaded_netrwPlugin = 1
let &t_ut='' " For kitty background colour support
set updatetime=500
set mouse=nv
let g:python3_host_prog = '~/.pyenv/versions/neovim3/bin/python' let g:python3_host_prog = '~/.pyenv/versions/neovim3/bin/python'
if exists('+termguicolors')
set termguicolors
endif
colorscheme nightfox
if executable('ag') if executable('ag')
let g:ackprg = 'ag --vimgrep' let g:ackprg = 'ag --vimgrep'
endif endif
set number
set relativenumber
set listchars=trail:.,tab:>_
set list
set wrap
set linebreak
set autoread
au BufRead,BufNewFile *.ipynb setlocal filetype=json au BufRead,BufNewFile *.ipynb setlocal filetype=json
au BufRead,BufNewFile *.md setlocal spell au BufRead,BufNewFile *.md setlocal spell
au BufRead,BufNewFile *.code-workspace setlocal filetype=json au BufRead,BufNewFile *.code-workspace setlocal filetype=json
@ -97,11 +69,33 @@ if &diff
endif endif
au OptionSet diff highlight! link DiffText MatchParen au OptionSet diff highlight! link DiffText MatchParen
set expandtab
set autoindent
set smartindent
filetype plugin indent on filetype plugin indent on
set splitbelow
set splitright
]] ]]
vim.notify = require("notify")
vim.cmd("let &t_ut=''") -- For kitty background colour support
vim.opt.updatetime=500
vim.opt.mouse="nv"
vim.opt.termguicolors=true
vim.cmd("colorscheme nightfox") -- TODO
vim.opt.number=true
vim.opt.relativenumber=true
-- vim.opt.listchars=trail:.,tab:>_ -- TODO
vim.opt.list=true
vim.opt.wrap=true
vim.opt.linebreak=true
vim.opt.autoread=true
vim.opt.expandtab=true
vim.opt.autoindent=true
vim.opt.smartindent=true
vim.opt.splitbelow=true
vim.opt.splitright=true
require 'keymaps'
require 'config_lsp'
require 'config_plugins'

View file

@ -1,3 +1,5 @@
vim.g.loaded = 1
vim.g.loaded_netrwPlugin = 1
require('nvim-tree').setup{ require('nvim-tree').setup{
filters = { custom = { "^.git$" } } filters = { custom = { "^.git$" } }
} }