From c26f0990829d7859bf45b9bab3248fe007095f71 Mon Sep 17 00:00:00 2001
From: Yann Herklotz <git@yannherklotz.com>
Date: Mon, 14 Oct 2019 15:31:58 +0100
Subject: Add necessary changes for uni comp

---
 X/.xinitrc            |  2 ++
 bspwm/bspwmrc         |  4 ++--
 polybar/config        | 27 +++++++++++++++------------
 zsh/.zsh/function.zsh |  4 ++--
 zsh/.zshrc            |  2 +-
 5 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/X/.xinitrc b/X/.xinitrc
index d709724..b30015e 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -33,11 +33,13 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
 fi
 
 # Startup programs
+eval $(ssh-agent)
 dropbox &
 sxhkd -m 1 &
 compton &
 redshift &
 wal -R
+xrandr --output DP1 --left-of DP2 --auto
 feh --bg-fill "$(< "${HOME}/.cache/wal/wal")"
 xinput set-prop 'DLL075B:01 06CB:76AF Touchpad' 'libinput Natural Scrolling Enabled' 1
 xsetroot -cursor_name left_ptr
diff --git a/bspwm/bspwmrc b/bspwm/bspwmrc
index 1b2d67a..222100b 100755
--- a/bspwm/bspwmrc
+++ b/bspwm/bspwmrc
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-bspc monitor eDP-1 -d term web code music 5 6
-bspc monitor DP-1  -d 7 8 9 0
+bspc monitor DP1 -d term web code music 5 6
+bspc monitor DP2  -d 7 8 9 0
 
 bspc config border_width 0
 bspc config window_gap   5
diff --git a/polybar/config b/polybar/config
index fbf09e0..b932659 100644
--- a/polybar/config
+++ b/polybar/config
@@ -17,7 +17,7 @@ secondary = ${xrdb:color5:#e60053}
 alert = ${xrdb:color1:#bd2c40}
 
 [bar/main]
-monitor = ${env:MONITOR:eDP-1}
+monitor = DP1
 width = 100%
 height = 27
 ;offset-x = 1%
@@ -40,10 +40,11 @@ padding-right = 1
 module-margin-left = 1
 module-margin-right = 2
 
-font-0 = scientifica:style=Regular:pixelsize=12
-font-1 = Unifont:fontformat=truetype:size=8:antialias=false;0
-font-2 = FontAwesome:style=Regular
-font-4 = Wuncon Siji:style=Regular:pixelsize=10;1
+font-0 = Iosevka:style=Regular:pixelsize=10
+font-1 = Font Awesome 5 Free:style=Solid:pixelsize=9
+font-2 = Font Awesome 5 Brands:style=Regular
+font-3 = Siji:style=Regular:pixelsize=10
+font-4 = Unifont:fontformat=truetype:size=8:antialias=false
 
 modules-left = bspwm
 modules-center = date
@@ -69,7 +70,7 @@ cursor-click = pointer
 cursor-scroll = ns-resize
 
 [bar/second]
-monitor = DP-1
+monitor = DP2
 width = 100%
 height = 27
 ;offset-x = 1%
@@ -92,12 +93,14 @@ padding-right = 1
 module-margin-left = 1
 module-margin-right = 2
 
-font-0 = scientifica:style=Regular:pixelsize=12
-font-1 = Unifont:fontformat=truetype:size=8:antialias=false;0
-font-2 = FontAwesome:style=Regular
-font-4 = Wuncon Siji:style=Regular:pixelsize=10;1
+font-0 = Iosevka:style=Regular:pixelsize=10
+font-1 = Font Awesome 5 Free:style=Solid:pixelsize=9
+font-2 = Font Awesome 5 Brands:style=Regular
+font-3 = Siji:style=Regular:pixelsize=10
+font-4 = Unifont:fontformat=truetype:size=8:antialias=false
 
 modules-left = bspwm
+modules-center = date
 
 tray-position = right
 tray-padding = 2
@@ -288,7 +291,7 @@ ramp-signal-foreground = ${colors.foreground}
 
 [module/eth]
 type = internal/network
-interface = net0
+interface = eno1
 interval = 3.0
 
 format-connected-underline = ${colors.primary}
@@ -319,7 +322,7 @@ format-underline = ${colors.primary}
 label = %date% %time%
 
 [module/volume]
-type = internal/volume
+type = internal/alsa
 
 format-volume = <label-volume> <bar-volume>
 label-volume = VOL
diff --git a/zsh/.zsh/function.zsh b/zsh/.zsh/function.zsh
index fdd6980..b4cc40a 100644
--- a/zsh/.zsh/function.zsh
+++ b/zsh/.zsh/function.zsh
@@ -24,11 +24,11 @@ fdd() {
 wal-tile() {
     wal -n -i "$@"
     feh --bg-fill "$(< "${HOME}/.cache/wal/wal")"
-    /home/yannherklotz/.local/bin/betterlock -u "$(< "${HOME}/.cache/wal/wal")"
+    $HOME/.local/bin/betterlock -u "$(< "${HOME}/.cache/wal/wal")"
 }
 
 wal-tile-l() {
     wal -l -n -i "$@"
     feh --bg-fill "$(< "${HOME}/.cache/wal/wal")"
-    /home/yannherklotz/.local/bin/betterlock -u "$(< "${HOME}/.cache/wal/wal")"
+    $HOME/.local/bin/betterlock -u "$(< "${HOME}/.cache/wal/wal")"
 }
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 9c02e6a..08aef70 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -23,7 +23,7 @@ setopt HIST_IGNORE_DUPS
 setopt HIST_IGNORE_SPACE
 setopt HIST_FIND_NO_DUPS
 
-(cat ~/.cache/wal/sequences &)
+(cat ~/.cache/wal/sequences &) >/dev/null 2>&1
 
 # Sourcing everything
 source /usr/share/fzf/key-bindings.zsh
-- 
cgit