From 3c0d75b7e6b0e5e1db78b930bf14c60fed71fd54 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Sat, 30 Oct 2021 12:05:09 +0100
Subject: [PATCH] refactor(nvim): move vim options into lua

---
 nvim/.config/nvim/lua/opdavies/init.lua | 26 ++++++++++++++++++++++++
 nvim/.config/nvim/plugins/options.vim   | 27 -------------------------
 2 files changed, 26 insertions(+), 27 deletions(-)
 delete mode 100644 nvim/.config/nvim/plugins/options.vim

diff --git a/nvim/.config/nvim/lua/opdavies/init.lua b/nvim/.config/nvim/lua/opdavies/init.lua
index 9d1024d..6e98d91 100644
--- a/nvim/.config/nvim/lua/opdavies/init.lua
+++ b/nvim/.config/nvim/lua/opdavies/init.lua
@@ -1,3 +1,29 @@
+vim.g.mapleader = ' '
+
+vim.cmd('filetype indent on')
+vim.cmd('filetype on')
+vim.cmd('filetype plugin on')
+vim.cmd('syntax on')
+
+vim.opt.autoindent = true
+vim.opt.breakindent = true
+vim.opt.clipboard:append 'unnamedplus'
+vim.opt.expandtab = true
+vim.opt.foldmethod = 'indent'
+vim.opt.formatoptions = 'lm'
+vim.opt.linebreak = true
+vim.opt.mouse = 'n'
+vim.opt.number = true
+vim.opt.scrolloff = 10
+vim.opt.shiftwidth = 2
+vim.opt.smartindent = true
+vim.opt.softtabstop = 2
+vim.opt.swapfile = false
+vim.opt.tabstop = 2
+vim.opt.termguicolors = true
+vim.opt.updatetime = 1000
+vim.opt.wrap = true
+
 require "opdavies.plugins.colours"
 require "opdavies.plugins.completion"
 require "opdavies.plugins.floaterm"
diff --git a/nvim/.config/nvim/plugins/options.vim b/nvim/.config/nvim/plugins/options.vim
deleted file mode 100644
index 7397fe5..0000000
--- a/nvim/.config/nvim/plugins/options.vim
+++ /dev/null
@@ -1,27 +0,0 @@
-let mapleader = " "
-
-syntax on
-filetype on
-filetype indent on
-filetype plugin on
-
-set autoindent
-set breakindent
-set clipboard+=unnamedplus
-set complete+=kspell
-set expandtab
-set foldlevelstart=99 " Start unfolded
-set foldmethod=indent
-set formatoptions=l
-set linebreak
-set list listchars=tab:»·,trail:· " Display extra whitespace
-set mouse=n
-set noswapfile
-set nowrap
-set number relativenumber
-set scrolloff=10 " Automatically scroll
-set shiftwidth=2
-set smartindent
-set tabstop=2 softtabstop=2
-set termguicolors
-