esensar
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up old config stuff

main
Ensar Sarajčić 2022-05-09 18:16:47 +02:00
parent 654397e176
commit 05087d8b20
4 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -14,11 +14,11 @@ else
endif endif
SCRIPTS_DIR := $(DOTFILES_DIR)/bin SCRIPTS_DIR := $(DOTFILES_DIR)/bin
SYMLINKS_DIR := $(DOTFILES_DIR)/symlinks SYMLINKS_DIR := $(DOTFILES_DIR)/symlinks
BACKUP_DIR := $(HOME)/dotfiles_backup BACKUP_DIR := $(HOME)/.local/share/dotfiles_backup
SSH_KEYS_HOME := $(HOME)/.ssh SSH_KEYS_HOME := $(HOME)/.ssh
SSH_CONFIG_FILE := $(SSH_KEYS_HOME)/config SSH_CONFIG_FILE := $(SSH_KEYS_HOME)/config
PERSONAL_SSH_KEYS_HOME := $(SSH_KEYS_HOME)/Personal 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 PROJECTS_ROOT := $(HOME)/Projects
DOCUMENTS_ROOT := $(HOME)/Documents DOCUMENTS_ROOT := $(HOME)/Documents
PICTURES_ROOT := $(HOME)/Pictures PICTURES_ROOT := $(HOME)/Pictures

6
symlinks/profile.common
View File

@ -27,13 +27,9 @@ export LANG=en_US.UTF-8
export DEFAULT_USER="ensar" 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_DOTFILES_HOME=$HOME/.dotfiles
export MY_CONFIG_DIR=$HOME/.config export MY_CONFIG_DIR=$HOME/.config
export MY_THEMES_DIR=$HOME/.dotfiles/themes export MY_CONFIG_CACHE_DIR=$HOME/.local/share/script_cache
export MY_CONFIG_CACHE_DIR=$HOME/.script_cache
export MY_PROJECTS_HOME=$HOME/Projects export MY_PROJECTS_HOME=$HOME/Projects
export MY_DOCUMENTS_HOME=$HOME/Documents export MY_DOCUMENTS_HOME=$HOME/Documents

12
symlinks/vim/plugins.vim
View File

@ -13,19 +13,11 @@ if !has('win32') && !has('win64')
if empty(glob('$PLUGLOCATION')) if empty(glob('$PLUGLOCATION'))
silent !curl -fLo $PLUGLOCATION --create-dirs silent !curl -fLo $PLUGLOCATION --create-dirs
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
if empty($MYVIMRC) autocmd VimEnter * PlugInstall --sync | source $HOME . '.vimrc'
autocmd VimEnter * PlugInstall --sync | source $HOME . '.vimrc'
else
autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
endif
endif endif
endif endif
if empty($MY_VIM_HOME) call plug#begin($VIMHOME . '/plugged')
call plug#begin($VIMHOME . '/plugged')
else
call plug#begin($MY_VIM_HOME . '/plugged')
endif
" ----------------------------------------------------------------------------- " -----------------------------------------------------------------------------
" - General - " - General -

4
symlinks/vim/vimrc
View File

@ -8,15 +8,11 @@ else
let $NVIMHOME = $HOME."/.local/share/nvim" let $NVIMHOME = $HOME."/.local/share/nvim"
endif endif
let $VIMPLUGINS = expand($VIMHOME."/plugins.vim") let $VIMPLUGINS = expand($VIMHOME."/plugins.vim")
let $LOCAL_VIMRC = $HOME."/.vimrc.local"
" ----------------------------------------------------------------------------- " -----------------------------------------------------------------------------
" - Load up plugins - " - Load up plugins -
" ----------------------------------------------------------------------------- " -----------------------------------------------------------------------------
" Use local vimrc for overrides if available and desired " Use local vimrc for overrides if available and desired
if filereadable($LOCAL_VIMRC)
source $LOCAL_VIMRC
endif
source $VIMPLUGINS source $VIMPLUGINS
" ----------------------------------------------------------------------------- " -----------------------------------------------------------------------------