From 049bd01474865a782b795b892577867a0d5a7756 Mon Sep 17 00:00:00 2001
From: Severin Kaderli <severin@kaderli.dev>
Date: Wed, 29 May 2019 13:42:25 +0200
Subject: [PATCH] Fix taskrc in work mode

Signed-off-by: Severin Kaderli <severin@kaderli.dev>
---
 install                          | 19 ++++++++++++-------
 system/.config/custom/env        |  8 +++++++-
 system/.config/gtk-3.0/bookmarks |  3 +--
 system/.config/task/taskrc       |  1 -
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/install b/install
index 468d3ba..eb2c246 100755
--- a/install
+++ b/install
@@ -31,8 +31,6 @@ DIRECTORIES=(
     "build"
     "documents"
     "downloads"
-    "music"
-    "pictures"
     "projects"
     "videos"
 )
@@ -41,8 +39,11 @@ WORK_DIRECTORIES=(
     ".local/keys"
     ".local/log"
     ".local/share/gnupg/"
+    "documents"
     "downloads"
+    "music"
     "pictures"
+    "videos"
     "work"
 )
 
@@ -353,10 +354,14 @@ chsh -s "/bin/zsh"
 print_log "Set default shell to zsh"
 
 ###############################################################################
-# Post installation information                                                #
+# Post installation information                                               #
 ###############################################################################
-print_section "Manual TODOs"
-print_log "Run ${YELLOW}~/.config/polybar/scripts/gmail/auth.py${RESET}"
+print_section "Post installation information"
+echo "${BOLD}Make sure you do the following after this installation:"
+echo " • Run ${YELLOW}~/.config/polybar/scripts/gmail/auth.py${RESET}"
+echo " • Download settings for Visual Studio Code"
+
 if [ "${IS_WORK}" = "0" ]; then
-    print_log "Add taskwarrior keys to ${YELLOW}~/.local/keys/taskwarrior/${RESET}"
-fi
\ No newline at end of file
+    echo " • Add taskwarrior keys to ${YELLOW}~/.local/keys/taskwarrior/${RESET}"
+fi
+echo ""
diff --git a/system/.config/custom/env b/system/.config/custom/env
index 422e4b7..903b0e8 100644
--- a/system/.config/custom/env
+++ b/system/.config/custom/env
@@ -50,7 +50,13 @@ export GEM_SPEC_CACHE="${XDG_CACHE_HOME}/gem/specs"
 mkdir -p "${XDG_DATA_HOME}/wine/prefixes"
 export WINEPREFIX="${XDG_DATA_HOME}/wine/prefixes/default"
 export SQLITE_HISTORY="${XDG_DATA_HOME}/sqlite_history"
-export TASKDATA="${HOME}/tasks"
+
+if [ "${IS_WORK}" = "1" ]; then
+    export TASKDATA="${HOME}/.local/share/tasks"
+else
+    export TASKDATA="${HOME}/tasks"
+fi
+
 export TASKRC="${XDG_CONFIG_HOME}/task/taskrc"
 export PARALLEL_HOME="$XDG_CONFIG_HOME/parallel"
 export CCACHE_CONFIGPATH="${XDG_CONFIG_HOME}/ccache.config"
diff --git a/system/.config/gtk-3.0/bookmarks b/system/.config/gtk-3.0/bookmarks
index 54a5a4b..4ec2c56 100644
--- a/system/.config/gtk-3.0/bookmarks
+++ b/system/.config/gtk-3.0/bookmarks
@@ -2,5 +2,4 @@ file:///home/severin/documents Documents
 file:///home/severin/downloads Downloads
 file:///home/severin/videos Videos
 file:///home/severin/projects Projects
-file:///home/severin/dotfiles dotfiles
-file:///home/severin/notes Notes
+file:///home/severin/dotfiles dotfiles
\ No newline at end of file
diff --git a/system/.config/task/taskrc b/system/.config/task/taskrc
index 9183c8e..8c458b5 100644
--- a/system/.config/task/taskrc
+++ b/system/.config/task/taskrc
@@ -11,7 +11,6 @@
 # Use the command 'task show' to see all defaults and overrides
 
 # Files
-data.location=/home/severin/tasks
 verbose=blank,footnote,label,new-id,affected,edit,special,project,sync,unwait
 
 report.todo.description=Tasks with now due date, overdue or due in the next 7 days