From 00295e33ae0c212e4dc6b7f369c4c000cfce7e6f Mon Sep 17 00:00:00 2001
From: Fabian Ising <f.ising@gmail.com>
Date: Tue, 25 Jul 2017 13:51:57 +0200
Subject: [PATCH 1/2] Squashed 'i3/' changes from 1903b20..bda0687

bda0687 Add Xresources

git-subtree-dir: i3
git-subtree-split: bda068794551c9c766e8d4029c92f1fac94e6892
---
 .Xresources    | 104 +++++++++++++++++++++++++++++++++++++++++++++++++
 link_config.sh |  13 ++++---
 2 files changed, 111 insertions(+), 6 deletions(-)
 create mode 100644 .Xresources

diff --git a/.Xresources b/.Xresources
new file mode 100644
index 0000000..8d04cfe
--- /dev/null
+++ b/.Xresources
@@ -0,0 +1,104 @@
+#if __has_include(".extend.Xresources")
+#include ".extend.Xresources"
+#endif
+
+! ^ The above lines are no comments!
+! Leave them as they are if a file ~/.extend.Xresources is being used on your system.
+! config can be added there or also here below.
+! For comments use "!"
+
+Xft.dpi: 96
+Xft.antialias: true
+Xft.hinting: true
+Xft.rgba: rgb
+Xft.autohint: false
+Xft.hintstyle: hintslight
+Xft.lcdfilter: lcddefault
+
+XTerm*background: #2b2b2b
+XTerm*foreground: #e7e7e7
+XTerm*pointerColor: #16A085
+XTerm*faceName: Input Mono:size=9:antialias=false
+XTerm*font: 7x13
+
+#define base00 #282936
+#define base01 #3a3c4e
+#define base02 #4d4f68
+#define base03 #626483
+#define base04 #62d6e8
+#define base05 #e9e9f4
+#define base06 #f1f2f8
+#define base07 #f7f7fb
+#define base08 #ea51b2
+#define base09 #b45bcf
+#define base0A #00f769
+#define base0B #ebff87
+#define base0C #a1efe4
+#define base0D #62d6e8
+#define base0E #b45bcf
+#define base0F #00f769
+
+! URxvt settings
+
+URxvt*font:              xft:Input\ Mono:pixelsize=11
+URxvt*boldFont:          xft:Input\ Mono:pixelsize=11
+URxvt*loginShell:        true
+URxvt*cursorUnderline:   false 
+URxvt*scrollBar:         false 
+URxvt*letterSpace:       1 
+URxvt*imLocale:          en_US.UTF-8
+!URxvt*scrollstyle:      plain 
+!URxvt*scrollBar_right:  true
+URxvt*termName:          rxvt
+URxvt.buffered:          true
+URxvt.perl-ext:          default,matcher
+URxvt.urlLauncher:       /bin/firefox
+URxvt.matcher.button:    1 
+URxvt.transparent:       False
+URxvt.shading:           5
+
+URxvt*foreground:   #1abc9c
+URxvt*background:   #1F2D3A
+URxvt*cursorColor:  #1abc9c
+
+URxvt*color0:       #2c3e50
+URxvt*color1:       #c0392b
+URxvt*color2:       #27ae60
+URxvt*color3:       #f39c12
+URxvt*color4:       #2980b9
+URxvt*color5:       #8e44ad
+URxvt*color6:       #16a085
+URxvt*color7:       #bdc3c7
+
+URxvt*color8:       #34495e
+URxvt*color9:       #e74c3c
+URxvt*color10:      #2ecc71
+URxvt*color11:      #f1c40f
+URxvt*color12:      #3498db
+URxvt*color13:      #9b59b6
+URxvt*color14:      #2AA198
+URxvt*color15:      #ecf0f1
+
+! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt),
+! use 'shell' template to set these if necessary
+URxvt*color16:      base09
+URxvt*color17:      base0F
+URxvt*color18:      base01
+URxvt*color19:      base02
+URxvt*color20:      base04
+URxvt*color21:      base06
+
+URxvt*keysym.Shift-Control-V: perl:clipboard:paste
+ 
+URxvt*iso14755: False
+ 
+URxvt*perl-ext-common: default,clipboard
+
+! ------------------------------------------------------------------------------
+! ROFI Color theme
+! ------------------------------------------------------------------------------
+rofi.color-enabled: true
+rofi.color-window: #273238, #273238, #1e2529
+rofi.color-normal: #273238, #c1c1c1, #273238, #394249, #ffffff
+rofi.color-active: #273238, #80cbc4, #273238, #394249, #80cbc4
+rofi.color-urgent: #273238, #ff1844, #273238, #394249, #ff1844
diff --git a/link_config.sh b/link_config.sh
index 4e22ac7..bc0eebd 100755
--- a/link_config.sh
+++ b/link_config.sh
@@ -8,9 +8,10 @@
 mkdir -p $HOME/.config/i3
 mkdir -p $HOME/.config/polybar
 
-ln -s $PWD/i3config ~/.config/i3/config
-ln -s $PWD/polybarconfig ~/.config/polybar/config
-ln -s $PWD/.xinitrc ~/.xinitrc
+ln -Ts $PWD/i3config ~/.config/i3/config
+ln -Ts $PWD/polybarconfig ~/.config/polybar/config
+ln -Ts $PWD/.xinitrc ~/.xinitrc
+ln -Ts $PWD/.Xresources ~/.Xresources
 while true; do
     read -p "Is this your laptop? [y/n]" yn
     case $yn in
@@ -19,6 +20,6 @@ while true; do
         * ) echo "Please answer yes or no.";;
     esac
 done
-sudo ln -s $PWD/auto_monitor.sh /usr/local/bin/auto_monitor.sh
-sudo ln -s $PWD/switch_monitors.sh /usr/local/bin/switch_monitors.sh
-sudo ln -s $PWD/98-monitor-hotplug.rules /etc/udev/rules.d/98-monitor-hotplug.rules
+sudo ln -Ts $PWD/auto_monitor.sh /usr/local/bin/auto_monitor.sh
+sudo ln -Ts $PWD/switch_monitors.sh /usr/local/bin/switch_monitors.sh
+sudo ln -Ts $PWD/98-monitor-hotplug.rules /etc/udev/rules.d/98-monitor-hotplug.rules

From 89b41ddcf590abfdaa31775352f5f14b2dadbcae Mon Sep 17 00:00:00 2001
From: Fabian Ising <f.ising@gmail.com>
Date: Tue, 28 Aug 2018 10:47:24 +0200
Subject: [PATCH 2/2] Fix antigen comment bug

---
 zsh/.zshrc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 9e70254..c6198bd 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -9,6 +9,7 @@
 
 POWERLEVEL9K_INSTALLATION_PATH=$ANTIGEN_BUNDLES/bhilburn/powerlevel9k
 # Load Antigen
+setopt interactivecomments
 source ~/.zsh/antigen/antigen.zsh
 
 # Clear screen by ctrl+q
@@ -17,14 +18,10 @@ bindkey '^q' clear-screen
 # Load various lib files
 antigen use oh-my-zsh
 
-#
 # Antigen Theme
-#
 antigen theme bhilburn/powerlevel9k powerlevel9k
 
-#
 # Antigen Bundles
-#
 
 antigen bundle git
 antigen bundle heroku