From 15a02380781564f3e8a07583ef88bdb3ca749fb7 Mon Sep 17 00:00:00 2001
From: Fernando Schauenburg <dev@schauenburg.me>
Date: Tue, 8 Feb 2022 20:11:18 +0100
Subject: [PATCH] vim: organize my lua utilities

---
 config/nvim/after/ftplugin/lua.lua                    | 2 +-
 config/nvim/lua/fs/config/lualine.lua                 | 2 +-
 config/nvim/lua/fs/config/nvim-tree.lua               | 4 ++--
 config/nvim/lua/fs/config/rainbow_parentheses.lua     | 2 +-
 config/nvim/lua/fs/config/vim-fugitive.lua            | 2 +-
 config/nvim/lua/fs/config/vim-markdown.lua            | 2 +-
 config/nvim/lua/fs/config/vim-trailing-whitespace.lua | 2 +-
 config/nvim/lua/fs/keymaps.lua                        | 2 +-
 config/nvim/lua/fs/{colors.lua => util/color.lua}     | 0
 config/nvim/lua/fs/{ => util}/keymap.lua              | 0
 10 files changed, 9 insertions(+), 9 deletions(-)
 rename config/nvim/lua/fs/{colors.lua => util/color.lua} (100%)
 rename config/nvim/lua/fs/{ => util}/keymap.lua (100%)

diff --git a/config/nvim/after/ftplugin/lua.lua b/config/nvim/after/ftplugin/lua.lua
index 6f6ed20..0020c33 100644
--- a/config/nvim/after/ftplugin/lua.lua
+++ b/config/nvim/after/ftplugin/lua.lua
@@ -1,6 +1,6 @@
 vim.bo.tabstop = 2
 
-local nmap = require 'fs.keymap'.buffer_nmap
+local nmap = require 'fs.util.keymap'.buffer_nmap
 
 -- execute the current line
 nmap { '<leader>x', [[<cmd>call luaeval(getline("."))<cr>]] }
diff --git a/config/nvim/lua/fs/config/lualine.lua b/config/nvim/lua/fs/config/lualine.lua
index 16e41cd..ceb2a73 100644
--- a/config/nvim/lua/fs/config/lualine.lua
+++ b/config/nvim/lua/fs/config/lualine.lua
@@ -10,7 +10,7 @@ local Table = {
   end
 }
 
-local colors = require'fs.colors'.colors()
+local colors = require'fs.util.color'.colors()
 
 local theme = (function()
   local active = {
diff --git a/config/nvim/lua/fs/config/nvim-tree.lua b/config/nvim/lua/fs/config/nvim-tree.lua
index 9ee7d0e..aec319b 100644
--- a/config/nvim/lua/fs/config/nvim-tree.lua
+++ b/config/nvim/lua/fs/config/nvim-tree.lua
@@ -1,5 +1,5 @@
-local nmap = require'fs.keymap'.nmap
-local colors = require'fs.colors'.colors()
+local nmap = require'fs.util.keymap'.nmap
+local colors = require'fs.util.color'.colors()
 
 -- helper to set vim.g options that will be moved to setup() later
 local function set_globals(tbl)
diff --git a/config/nvim/lua/fs/config/rainbow_parentheses.lua b/config/nvim/lua/fs/config/rainbow_parentheses.lua
index 7c37b21..ab80585 100644
--- a/config/nvim/lua/fs/config/rainbow_parentheses.lua
+++ b/config/nvim/lua/fs/config/rainbow_parentheses.lua
@@ -1,4 +1,4 @@
-local nmap = require'fs.keymap'.nmap
+local nmap = require'fs.util.keymap'.nmap
 
 local config = function()
   vim.g['rainbow#pairs'] = { {'(',')'}, {'[',']'}, {'{','}'} }
diff --git a/config/nvim/lua/fs/config/vim-fugitive.lua b/config/nvim/lua/fs/config/vim-fugitive.lua
index f3e80b3..656d899 100644
--- a/config/nvim/lua/fs/config/vim-fugitive.lua
+++ b/config/nvim/lua/fs/config/vim-fugitive.lua
@@ -1,4 +1,4 @@
-local nmap = require'fs.keymap'.nmap
+local nmap = require'fs.util.keymap'.nmap
 
 local config = function()
   nmap { '<leader>gg',        '<cmd>G<cr>' }
diff --git a/config/nvim/lua/fs/config/vim-markdown.lua b/config/nvim/lua/fs/config/vim-markdown.lua
index 3860d22..694d6d7 100644
--- a/config/nvim/lua/fs/config/vim-markdown.lua
+++ b/config/nvim/lua/fs/config/vim-markdown.lua
@@ -1,4 +1,4 @@
-local nmap = require'fs.keymap'.buffer_nmap
+local nmap = require'fs.util.keymap'.buffer_nmap
 
 local setup = function()
   -- Disable concealling on italic, bold, etc.
diff --git a/config/nvim/lua/fs/config/vim-trailing-whitespace.lua b/config/nvim/lua/fs/config/vim-trailing-whitespace.lua
index 88ddc08..6b75392 100644
--- a/config/nvim/lua/fs/config/vim-trailing-whitespace.lua
+++ b/config/nvim/lua/fs/config/vim-trailing-whitespace.lua
@@ -1,4 +1,4 @@
-local nmap = require'fs.keymap'.nmap
+local nmap = require'fs.util.keymap'.nmap
 
 local config = function()
   -- fix whitespace
diff --git a/config/nvim/lua/fs/keymaps.lua b/config/nvim/lua/fs/keymaps.lua
index e63ae94..f35993f 100644
--- a/config/nvim/lua/fs/keymaps.lua
+++ b/config/nvim/lua/fs/keymaps.lua
@@ -1,4 +1,4 @@
-local keymap = require 'fs.keymap'
+local keymap = require 'fs.util.keymap'
 local nmap = keymap.nmap
 local imap = keymap.imap
 local vmap = keymap.vmap
diff --git a/config/nvim/lua/fs/colors.lua b/config/nvim/lua/fs/util/color.lua
similarity index 100%
rename from config/nvim/lua/fs/colors.lua
rename to config/nvim/lua/fs/util/color.lua
diff --git a/config/nvim/lua/fs/keymap.lua b/config/nvim/lua/fs/util/keymap.lua
similarity index 100%
rename from config/nvim/lua/fs/keymap.lua
rename to config/nvim/lua/fs/util/keymap.lua