diff --git a/config/.config/nvim/init.lua b/config/.config/nvim/init.lua index d9f4d84..b8cd798 100644 --- a/config/.config/nvim/init.lua +++ b/config/.config/nvim/init.lua @@ -13,13 +13,14 @@ if not vim.loop.fs_stat(lazypath) then end vim.opt.rtp:prepend(lazypath) vim.opt.rtp:prepend(vim.env.HOME .. "/.vim") -vim.opt.rtp:prepend(vim.env.HOME .. "/.vim/lua") +local luahome = vim.env.HOME .. "/.vim/lua" +vim.opt.rtp:prepend(luahome) package.path = package.path .. ";" .. vim.env.HOME .. "/.vim/lua/?.lua" -require("config.clipboard") -require("config.tmpl") -require("config.zip") +for _, file in ipairs(vim.fn.readdir(luahome .. "/config", [[v:val =~ '\.lua$']])) do + require("config" .. "." .. file:gsub("%.lua$", "")) +end require("lazy").setup({ -- this entry tells lazy.nvim to load the list of of *.lua files from plugins/ diff --git a/vim/.vim/lua/plugins/refactoring.lua b/vim/.vim/lua/plugins/refactoring.lua index f99b708..d79c57d 100644 --- a/vim/.vim/lua/plugins/refactoring.lua +++ b/vim/.vim/lua/plugins/refactoring.lua @@ -5,9 +5,6 @@ return { { "nvim-lua/plenary.nvim" }, { "nvim-treesitter/nvim-treesitter" }, }, - config = function() - require("config.refactoring") - end, -- stylua: ignore keys = { -- remap to open the Telescope refactoring menu in visual mode diff --git a/zsh/.zshrc b/zsh/.zshrc index e71f14b..83c4112 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -164,6 +164,9 @@ export LC_ALL="en_US.UTF-8" export LC_CTYPE="en_US.UTF-8" export LANG_ALL="en_US.UTF-8" +export CARGO_NET_GIT_FETCH_WITH_CLI=true + + source ~/.bash_profile export PATH="$HOME/.local/bin:$PATH"