Clean up old config stuff
parent
654397e176
commit
05087d8b20
4
Makefile
4
Makefile
|
@ -14,11 +14,11 @@ else
|
|||
endif
|
||||
SCRIPTS_DIR := $(DOTFILES_DIR)/bin
|
||||
SYMLINKS_DIR := $(DOTFILES_DIR)/symlinks
|
||||
BACKUP_DIR := $(HOME)/dotfiles_backup
|
||||
BACKUP_DIR := $(HOME)/.local/share/dotfiles_backup
|
||||
SSH_KEYS_HOME := $(HOME)/.ssh
|
||||
SSH_CONFIG_FILE := $(SSH_KEYS_HOME)/config
|
||||
PERSONAL_SSH_KEYS_HOME := $(SSH_KEYS_HOME)/Personal
|
||||
SCRIPTS_CACHE_DIR := $(HOME)/.script_cache
|
||||
SCRIPTS_CACHE_DIR := $(HOME)/.local/share/script_cache
|
||||
PROJECTS_ROOT := $(HOME)/Projects
|
||||
DOCUMENTS_ROOT := $(HOME)/Documents
|
||||
PICTURES_ROOT := $(HOME)/Pictures
|
||||
|
|
|
@ -27,13 +27,9 @@ export LANG=en_US.UTF-8
|
|||
|
||||
export DEFAULT_USER="ensar"
|
||||
|
||||
export MY_VIM_HOME=$HOME/.vim
|
||||
export MY_VIM_PLUGINS_HOME=$MY_VIM_HOME/plugged
|
||||
export MY_VIM_PLUGIN_MANAGER=plug
|
||||
export MY_DOTFILES_HOME=$HOME/.dotfiles
|
||||
export MY_CONFIG_DIR=$HOME/.config
|
||||
export MY_THEMES_DIR=$HOME/.dotfiles/themes
|
||||
export MY_CONFIG_CACHE_DIR=$HOME/.script_cache
|
||||
export MY_CONFIG_CACHE_DIR=$HOME/.local/share/script_cache
|
||||
export MY_PROJECTS_HOME=$HOME/Projects
|
||||
export MY_DOCUMENTS_HOME=$HOME/Documents
|
||||
|
||||
|
|
|
@ -13,19 +13,11 @@ if !has('win32') && !has('win64')
|
|||
if empty(glob('$PLUGLOCATION'))
|
||||
silent !curl -fLo $PLUGLOCATION --create-dirs
|
||||
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
|
||||
if empty($MYVIMRC)
|
||||
autocmd VimEnter * PlugInstall --sync | source $HOME . '.vimrc'
|
||||
else
|
||||
autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
if empty($MY_VIM_HOME)
|
||||
call plug#begin($VIMHOME . '/plugged')
|
||||
else
|
||||
call plug#begin($MY_VIM_HOME . '/plugged')
|
||||
endif
|
||||
call plug#begin($VIMHOME . '/plugged')
|
||||
|
||||
" -----------------------------------------------------------------------------
|
||||
" - General -
|
||||
|
|
|
@ -8,15 +8,11 @@ else
|
|||
let $NVIMHOME = $HOME."/.local/share/nvim"
|
||||
endif
|
||||
let $VIMPLUGINS = expand($VIMHOME."/plugins.vim")
|
||||
let $LOCAL_VIMRC = $HOME."/.vimrc.local"
|
||||
|
||||
" -----------------------------------------------------------------------------
|
||||
" - Load up plugins -
|
||||
" -----------------------------------------------------------------------------
|
||||
" Use local vimrc for overrides if available and desired
|
||||
if filereadable($LOCAL_VIMRC)
|
||||
source $LOCAL_VIMRC
|
||||
endif
|
||||
source $VIMPLUGINS
|
||||
|
||||
" -----------------------------------------------------------------------------
|
||||
|
|
Loading…
Reference in New Issue