5 files changed, 14 insertions, 12 deletions
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index dcf484b..34a081b 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -27,7 +27,7 @@ _G.vimrc = vimrc
 
 -- Environment {{{2
 
-local my_env = require('my_env')
+local my_env = require('vimrc.my_env')
 my_env.mkdir()
 
 
@@ -1104,7 +1104,7 @@ G.loaded_zipPlugin        = 1
 
 vim.api.nvim_create_user_command(
    'PackerSync',
-   function() require('plugins').sync() end,
+   function() require('vimrc.plugins').sync() end,
    {
       desc = '[packer.nvim] Synchronize plugins',
    }
@@ -1116,6 +1116,6 @@ vimrc.autocmd('BufWritePost', {
          pattern = 'PackerCompileDone',
          command = 'echo "[packer] Finished compiling lazy-loaders!"'
       })
-      require('plugins').compile()
+      require('vimrc.plugins').compile()
    end,
 })
diff --git a/.config/nvim/init.mini.lua b/.config/nvim/init.mini.lua
index b551ae6..d9b7c75 100644
--- a/.config/nvim/init.mini.lua
+++ b/.config/nvim/init.mini.lua
@@ -1,4 +1,4 @@
-require('my_env').mkdir()
+require('vimrc.my_env').mkdir()
 require('vimrc').create_augroup_for_vimrc()
-vim.api.nvim_create_user_command('PackerCompile', function() require('plugins').compile() end, {})
-vim.api.nvim_create_user_command('PackerSync', function() require('plugins').sync() end, {})
+vim.api.nvim_create_user_command('PackerCompile', function() require('vimrc.plugins').compile() end, {})
+vim.api.nvim_create_user_command('PackerSync', function() require('vimrc.plugins').sync() end, {})
diff --git a/.config/nvim/lua/vimrc.lua b/.config/nvim/lua/vimrc/init.lua
index 65d229e..65d229e 100644
--- a/.config/nvim/lua/vimrc.lua
+++ b/.config/nvim/lua/vimrc/init.lua
diff --git a/.config/nvim/lua/my_env.lua b/.config/nvim/lua/vimrc/my_env.lua
index dbfcfb6..9860a04 100644
--- a/.config/nvim/lua/my_env.lua
+++ b/.config/nvim/lua/vimrc/my_env.lua
@@ -1,6 +1,8 @@
 local M = {}
 
-local F = vim.fn
+local V = vim
+local E = V.env
+local F = V.fn
 
 if F.has('unix') then
    M.os = 'unix'
@@ -14,9 +16,9 @@ else
    M.os = 'unknown'
 end
 
-M.home = vim.env.HOME or F.expand('~')
+M.home = E.HOME or F.expand('~')
 
-M.config_home = vim.env.XDG_CONFIG_HOME or vim.env.HOME .. '/.config'
+M.config_home = E.XDG_CONFIG_HOME or E.HOME .. '/.config'
 
 M.config_dir = F.stdpath('config')
 M.cache_dir = F.stdpath('cache')
@@ -30,7 +32,7 @@ M.scratch_dir = M.home .. '/scratch'
 
 function M.mkdir()
    for k, v in pairs(M) do
-      if vim.endswith(k, '_dir') and F.isdirectory(v) == 0 then
+      if V.endswith(k, '_dir') and F.isdirectory(v) == 0 then
          F.mkdir(v, 'p')
       end
    end
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/vimrc/plugins.lua
index d72820d..2e1d9cc 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/vimrc/plugins.lua
@@ -19,7 +19,7 @@ packer.startup(function(use)
    use {
       'vim-skk/eskk.vim',
       config = function()
-         local my_env = require('my_env')
+         local my_env = require('vimrc.my_env')
 
          vim.g['eskk#dictionary'] = {
             path = my_env.skk_dir .. '/jisyo',
@@ -765,7 +765,7 @@ packer.startup(function(use)
    use {
       'LeafCage/yankround.vim',
       config = function()
-         local my_env = require('my_env')
+         local my_env = require('vimrc.my_env')
 
          vim.g.yankround_dir = my_env.yankround_dir
          vim.g.yankround_use_region_hl = true