vim: organize my lua utilities

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>]] }

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 = {

config/nvim/lua/fs/config/nvim-tree.lua

@@ -1,5 +1,5 @@
-local nmap = require'fs.keymap'.nmap
+local nmap = require'fs.util.keymap'.nmap
-local colors = require'fs.colors'.colors()
+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)

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'] = { {'(',')'}, {'[',']'}, {'{','}'} }

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>' }

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.

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

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