diff options
| -rw-r--r-- | .zshrc | 18 | ||||
| -rw-r--r-- | init.el | 29 |
2 files changed, 38 insertions, 9 deletions
@@ -8,11 +8,6 @@ HISTSIZE=1000 SAVEHIST=1000 HISTFILE=~/.zsh_history -export EDITOR=/usr/bin/vim -[ -f /usr/local/bin/mvim ] && \ - export EDITOR='/usr/local/bin/mvim -v' \ - alias vim='mvim -v' - # file [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh [ -f /usr/local/etc/profile.d/autojump.sh ] && . /usr/local/etc/profile.d/autojump.sh @@ -27,9 +22,6 @@ export no_proxy=localhost,127.0.0.1 case `uname` in Darwin) # commands for macOS - export PATH="/usr/local/opt/openjdk/bin:$PATH" - export CPPFLAGS="-I/usr/local/opt/openjdk/include" - [ -d $HOME/.gem ] && export GEM_HOME="$HOME/.gem" ;; Linux) # commands for Linux @@ -39,10 +31,18 @@ FreeBSD) ;; esac +# WSL 2 +if [[ `uname -a` =~ "microsoft" ]]; then + export hostip=$(cat /etc/resolv.conf | grep -oP '(?<=nameserver\ ).*') + export http_proxy="socks5://${hostip}:7890" + export https_proxy="socks5://${hostip}:7890" + export all_proxy="socks5://${hostip}:7890" +fi + # zplug if [ ! -d ~/.zplug ]; then echo 'Installing zplug ... ' - git clone [email protected]:zplug/zplug.git ~/.zplug + git clone https://github.com/zplug/zplug.git ~/.zplug fi source ~/.zplug/init.zsh zplug "plugins/git", from:oh-my-zsh @@ -0,0 +1,29 @@ +;; Set up package.el to work with MELPA +(require 'package) +(add-to-list 'package-archives + '("melpa" . "https://melpa.org/packages/")) +(package-initialize) +(package-refresh-contents) + +(when (version<= "26.0.50" emacs-version) + (global-display-line-numbers-mode)) + +;; Download Evil +(unless (package-installed-p 'evil) + (package-install 'evil)) + +;; Enable Evil +(require 'evil) +(evil-mode 1) +(custom-set-variables + ;; custom-set-variables was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(package-selected-packages (quote (evil)))) +(custom-set-faces + ;; custom-set-faces was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + ) |