From 4499a7e02096b2512f546d0410df37e6f3bdeb13 Mon Sep 17 00:00:00 2001
From: foo-dogsquared <foo.dogsquared@gmail.com>
Date: Thu, 22 Aug 2019 20:26:10 +0800
Subject: [PATCH] Update i3, zsh, and Xinit

---
 i3/config     |  1 -
 xorg/.xinitrc | 18 +-----------------
 zsh/.zshrc    | 18 +++++++++++++++++-
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/i3/config b/i3/config
index d8d9a0d..e132a21 100644
--- a/i3/config
+++ b/i3/config
@@ -22,7 +22,6 @@ exec_always feh --bg-scale ~/wallpapers/sand.jpg
 # Startup applications
 exec firefox
 exec thunderbird
-exec thunar
 
 # i3 config file (v4)
 #
diff --git a/xorg/.xinitrc b/xorg/.xinitrc
index fdf7daa..11f9228 100644
--- a/xorg/.xinitrc
+++ b/xorg/.xinitrc
@@ -8,15 +8,7 @@ sysmodmap=/etc/X11/xinit/.Xmodmap
 # merge in defaults and keymaps
 
 if [ -f $sysresources ]; then
-
-
-
-
-
-
-
     xrdb -merge $sysresources
-
 fi
 
 if [ -f $sysmodmap ]; then
@@ -24,15 +16,7 @@ if [ -f $sysmodmap ]; then
 fi
 
 if [ -f "$userresources" ]; then
-
-
-
-
-
-
-
     xrdb -merge "$userresources"
-
 fi
 
 if [ -f "$usermodmap" ]; then
@@ -40,7 +24,7 @@ if [ -f "$usermodmap" ]; then
 fi
 
 /usr/bin/lxsession &
+compton &
 dunst &
 udiskie &
-flameshot &
 exec i3
diff --git a/zsh/.zshrc b/zsh/.zshrc
index b0e1b66..6887fa0 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -2,9 +2,10 @@
 PICTURES_DIRECTORY=$HOME/Pictures
 DOCUMENTS_DIRECTORY=$HOME/Documents
 BIN_DIRECTORY=$HOME/bin
+SCRIPTS_DIRECTORY=$HOME/.scripts/
 
 # If you come from bash you might have to change your $PATH.
-export PATH=$BIN_DIRECTORY:/usr/local/bin:.cargo/bin:$PATH
+export PATH=$BIN_DIRECTORY:$SCRIPTS_DIRECTORY:/usr/local/bin:$PATH
 
 # Path to your oh-my-zsh installation.
 export ZSH="/home/foo-dogsquared/.oh-my-zsh"
@@ -102,3 +103,18 @@ source $ZSH/oh-my-zsh.sh
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
+
+# >>> conda initialize >>>
+# !! Contents within this block are managed by 'conda init' !!
+__conda_setup="$('/home/foo-dogsquared/anaconda3/bin/conda' 'shell.bash' 'hook' 2> /dev/null)"
+if [ $? -eq 0 ]; then
+    eval "$__conda_setup"
+else
+    if [ -f "/home/foo-dogsquared/anaconda3/etc/profile.d/conda.sh" ]; then
+        . "/home/foo-dogsquared/anaconda3/etc/profile.d/conda.sh"
+    else
+        export PATH="/home/foo-dogsquared/anaconda3/bin:$PATH"
+    fi
+fi
+unset __conda_setup
+# <<< conda initialize <<<