diff --git a/init.lua b/init.lua index 0c8a02b..cfd6a3b 100644 --- a/init.lua +++ b/init.lua @@ -1,14 +1,16 @@ -- Initialization -require('/conf/plugins') -require('/conf/keybinds') -require('/conf/config') -require('/conf/ui') -require('/conf/search') -require('/conf/git') +local config_path = vim.fn.stdpath('config') .. '/' + +require('conf.plugins') +require('conf.keybinds') +require('conf.config') +require('conf.ui') +require('conf.search') +require('conf.git') require('ui') -local paths = vim.fn.glob(vim.fn.stdpath 'config' .. 'config/langs/*.lua', true, true, true) +local paths = vim.fn.glob('lua/conf/langs/*.lua', true, true, true) for _, file in ipairs(paths) do require(file) diff --git a/conf/config.lua b/lua/conf/config.lua similarity index 100% rename from conf/config.lua rename to lua/conf/config.lua diff --git a/conf/git.lua b/lua/conf/git.lua similarity index 100% rename from conf/git.lua rename to lua/conf/git.lua diff --git a/conf/keybinds.lua b/lua/conf/keybinds.lua similarity index 100% rename from conf/keybinds.lua rename to lua/conf/keybinds.lua diff --git a/conf/langs/general.lua b/lua/conf/langs/general.lua similarity index 100% rename from conf/langs/general.lua rename to lua/conf/langs/general.lua diff --git a/conf/langs/python.lua b/lua/conf/langs/python.lua similarity index 100% rename from conf/langs/python.lua rename to lua/conf/langs/python.lua diff --git a/conf/plugins.lua b/lua/conf/plugins.lua similarity index 93% rename from conf/plugins.lua rename to lua/conf/plugins.lua index 9d41515..ca67dc9 100644 --- a/conf/plugins.lua +++ b/lua/conf/plugins.lua @@ -2,6 +2,7 @@ local vim = vim local Plug = vim.fn['plug#'] +local config_path = vim.fn.stdpath('config') .. '/' -- I have no idea how to auto-install vim-plug on Windows -- so you will have to install it manually. @@ -15,7 +16,7 @@ vim.cmd [[ endif ]] -vim.call('plug#begin', '~/.config/nvim/plugged') +vim.call('plug#begin', config_path .. 'plugged') -- UI Plug 'arcticicestudio/nord-vim' diff --git a/conf/search.lua b/lua/conf/search.lua similarity index 100% rename from conf/search.lua rename to lua/conf/search.lua diff --git a/conf/ui.lua b/lua/conf/ui.lua similarity index 100% rename from conf/ui.lua rename to lua/conf/ui.lua diff --git a/ui.lua b/lua/ui.lua similarity index 100% rename from ui.lua rename to lua/ui.lua