From 5b99db8a46e7ea03ac90f2f57605f7faffe26c9e Mon Sep 17 00:00:00 2001
From: "flyingscorpio@clevo" <tfranken@protonmail.com>
Date: Sun, 31 Jul 2022 14:40:26 +0200
Subject: [PATCH] Merge some lua files into options.lua

---
 roles/neovim/files/init.lua          |  3 ---
 roles/neovim/files/lua/folding.lua   | 10 ----------
 roles/neovim/files/lua/options.lua   | 26 ++++++++++++++++++++++++++
 roles/neovim/files/lua/searching.lua |  8 --------
 roles/neovim/files/lua/spacetabs.lua |  5 -----
 5 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 roles/neovim/files/lua/folding.lua
 delete mode 100644 roles/neovim/files/lua/searching.lua
 delete mode 100644 roles/neovim/files/lua/spacetabs.lua

diff --git a/roles/neovim/files/init.lua b/roles/neovim/files/init.lua
index fabbdfd..72c7461 100644
--- a/roles/neovim/files/init.lua
+++ b/roles/neovim/files/init.lua
@@ -1,9 +1,6 @@
 require('transition')
 require('encoding')
 require('remaps')
-require('spacetabs')
-require('searching')
-require('folding')
 require('options')
 require('plugins')
 -- require('colors')
diff --git a/roles/neovim/files/lua/folding.lua b/roles/neovim/files/lua/folding.lua
deleted file mode 100644
index 3ae12cc..0000000
--- a/roles/neovim/files/lua/folding.lua
+++ /dev/null
@@ -1,10 +0,0 @@
--- FOLDING 
-
--- enable folding
-vim.opt.foldenable = true
--- open most folds by default (0 to 99)
-vim.opt.foldlevelstart = 10
--- guard against too many nested folds
-vim.opt.foldnestmax = 10
--- fold based on filetype
-vim.opt.foldmethod = 'syntax'
diff --git a/roles/neovim/files/lua/options.lua b/roles/neovim/files/lua/options.lua
index 01eec7e..261d231 100644
--- a/roles/neovim/files/lua/options.lua
+++ b/roles/neovim/files/lua/options.lua
@@ -11,3 +11,29 @@ vim.opt.smartindent = true -- use intelligent indentation for C
 vim.opt.wildmenu = true -- visual autocomplete for command menu
 vim.opt.lazyredraw = true -- redraw only when necessary
 vim.opt.showmatch = true -- highlight matching braces
+
+-- SPACES AND TABS
+
+vim.opt.expandtab = true
+vim.opt.shiftwidth = 4
+vim.opt.softtabstop = 4
+
+-- SEARCHING
+
+-- search as characters are entered
+vim.opt.incsearch = true
+-- highlight matches
+vim.opt.hlsearch = true
+-- turn off search hightlight after search
+vim.keymap.set('n', '<leader', '<cmd>nohlsearch<CR>', { remap = false })
+
+-- FOLDING 
+
+-- enable folding
+vim.opt.foldenable = true
+-- open most folds by default (0 to 99)
+vim.opt.foldlevelstart = 10
+-- guard against too many nested folds
+vim.opt.foldnestmax = 10
+-- fold based on filetype
+vim.opt.foldmethod = 'syntax'
diff --git a/roles/neovim/files/lua/searching.lua b/roles/neovim/files/lua/searching.lua
deleted file mode 100644
index 5adc529..0000000
--- a/roles/neovim/files/lua/searching.lua
+++ /dev/null
@@ -1,8 +0,0 @@
--- SEARCHING
-
--- search as characters are entered
-vim.opt.incsearch = true
--- highlight matches
-vim.opt.hlsearch = true
--- turn off search hightlight after search
-vim.keymap.set('n', '<leader', '<cmd>nohlsearch<CR>', { remap = false })
diff --git a/roles/neovim/files/lua/spacetabs.lua b/roles/neovim/files/lua/spacetabs.lua
deleted file mode 100644
index e59184e..0000000
--- a/roles/neovim/files/lua/spacetabs.lua
+++ /dev/null
@@ -1,5 +0,0 @@
--- SPACES AND TABS
-
-vim.opt.expandtab = true -- expand tabs to spaces
-vim.opt.shiftwidth = 4
-vim.opt.softtabstop = 4 -- number of spaces in tab when editing