From db211c7f310a5de18c7803a1ebfbb7ab2b1e3f0d Mon Sep 17 00:00:00 2001
From: Florian Fischer <florian.fl.fischer@fau.de>
Date: Fri, 29 Jul 2016 20:06:28 +0200
Subject: make my dotfiles location independent

This is achieved by storing the absolute path to the dotfile directory in the
variable $DOTFILES_LOCATION. And change every hardcoded location into the
dotfiles with this var.
The Variable $DOTFILES_LOCATION populated with the output of
get_dotfiles_location.sh at 3 places:   1) config.fish | zshrc
                                        2) xinitrc (should be allready exported)

get_dotfiles_location uses the assumption that it is symlinked into the dotfiles
directory.

offlineimap:    * include patch for offlineimap
                * change config to the small one
                * include environment file in systemd unit

setup.py:       * handle offlineimap situation
                    * print a warning and prompt for proceeding
                    * write the environment file for the systemd unit
                * add pseudo dependency (get_dotfiles_location)
                    to [fish-config, offlineimap, i3]
                * print errors on stderr
                * don't exit if a function fails

config.fish:    * export $DOTFILES_LOCATION
                * change hardcoded links
                * add perl tools to path
                * export some yaourt specific vars if yaourt is available

zshrc: export $DOTFILES_LOCATION

xinitrc: export $DOTFILES_LOCATION

i3/*: change hardcoded links

scripts/* change hardcoded links

README.md: mention $DOTFILES_LOCATION
---
 config/fish/config.fish | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

(limited to 'config/fish')

diff --git a/config/fish/config.fish b/config/fish/config.fish
index 322df54..bcc608c 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -1,10 +1,16 @@
+# export the path to our dotfiles
+if not set -q $DOTFILES_LOCATION
+    set -Ux DOTFILES_LOCATION (get_dotfiles_location)
+end
+
+
 # autoload functions and completions in .dotfiles 
-set fish_function_path $HOME/.dotfiles/config/fish/functions $fish_function_path
-set fish_complete_path $HOME/.dotfiles/config/fish/completions $fish_complete_path
+set fish_function_path $DOTFILES_LOCATION/config/fish/functions $fish_function_path
+set fish_complete_path $DOTFILES_LOCATION/config/fish/completions $fish_complete_path
 
 
 # add git-alias subdirectory to functions path
-set fish_function_path $HOME/.dotfiles/config/fish/functions/git-alias $fish_function_path
+set fish_function_path $DOTFILES_LOCATION/config/fish/functions/git-alias $fish_function_path
 
 
 if not set -q __fish_git_prompt_show_informative_status
@@ -27,6 +33,16 @@ if not set -q SSH_KEY_PATH
     set -Ux SSH_KEY_PATH $HOME/.ssh/rsa_id
 end
 
+# set yaourt specific VARS
+if type -q yaourt
+    if not set -q AURUSEGIT
+        set -Ux AURUSEGIT 1
+    end
+    if not set -q AURSHOWDIFF
+        set -Ux AURSHOWDIFF 1
+    end
+end
+
 # PATH Stuff
 
 # include cargo binaries
@@ -38,6 +54,10 @@ if type -q multirust
     end
 end
 
+if not contains /bin/core_perl $PATH
+    set PATH /bin/core_perl $PATH
+end
+
 if not contains ~/.local/bin $PATH
     set PATH ~/.local/bin $PATH 
 end
-- 
cgit v1.2.3