diff --git a/.config/nvim/lua/user/init.lua b/.config/nvim/lua/user/init.lua index 6fe4977..a8b2537 100644 --- a/.config/nvim/lua/user/init.lua +++ b/.config/nvim/lua/user/init.lua @@ -1,4 +1,4 @@ +require("user.packer") + require("user.set") require("user.remap") - -require("user.packer") diff --git a/.config/nvim/lua/user/packer.lua b/.config/nvim/lua/user/packer.lua index ad68d89..555a3da 100644 --- a/.config/nvim/lua/user/packer.lua +++ b/.config/nvim/lua/user/packer.lua @@ -1,7 +1,7 @@ -- This file can be loaded by calling `lua require('plugins')` from your init.vim -- Only required if you have packer configured as `opt` -vim.cmd [[packadd packer.nvim]] +vim.cmd.packadd('packer.nvim') return require('packer').startup(function(use) -- Packer can manage itself diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index b841ce0..1828b89 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -2,9 +2,10 @@ source "$HOME/.config/environment" if [ ! -f "$ZSH/oh-my-zsh.sh" ] then - echo "Installing oh-my-zsh" - RUNZSH="no" sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" > /dev/null - rm "$HOME/.zshrc" + #echo "Installing oh-my-zsh" + #RUNZSH="no" sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" > /dev/null + _autoinstall_git "https://github.com/ohmyzsh/ohmyzsh.git" "$ZSH" + #mv "$ZSH/.zshrc.pre-oh-my-zsh" "$ZSH/.zshrc" fi autoinstall base