2 files changed, 30 insertions, 11 deletions

diff --git a/x/.Xresources b/x/.Xresources
index 63035d7..d58b278 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -57,14 +57,14 @@ URxvt*inheritPixmap: False
 *color15:       #e0dede
 
 ! Perls
-!URxvt.perl-ext-common : default,matcher,keyboard-select,url-select
-!URxvt.resize-font.step: 1
-!URxvt.keysym.M-Escape                  : perl:keyboard-select:activate
-!URxvt.keysym.M-u               : perl:url-select:select_next
-!URxvt.keysym.M-s               : perl:keyboard-select:search
+URxvt.perl-ext-common : default,matcher,keyboard-select,url-select
+URxvt.resize-font.step: 1
+URxvt.keysym.M-Escape           : perl:keyboard-select:activate
+URxvt.keysym.M-u                : perl:url-select:select_next
+URxvt.keysym.M-s                : perl:keyboard-select:search
 !URxvt.perl-ext-common          : tabbed,default,matcher
 !Urxvt.perl-lib                 : /usr/lib/urxvt/perl/
-!URxvt.url-select.launcher      : firefox
-!URxvt.url-select.autocopy      : true
-!URxvt.url-select.underline     : true
-!URxvt.url-select.button:   1
+URxvt.url-select.launcher       : firefox
+URxvt.url-select.autocopy       : true
+URxvt.url-select.underline      : true
+URxvt.url-select.button:   1
diff --git a/x/.xinitrc b/x/.xinitrc
index 79d2232..8626b1b 100644
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -40,6 +40,25 @@ if [ -n "$DISPLAY" ]; then
         xset b off
 fi
 
-xsetroot -cursor_name left_ptr
-xset +fp /usr/share/fonts/liberation-fonts
+# load additional configs
+if [ "$2" = "nvidia" ]; then
+        XINIT_D="/etc/X11/nvidia/xinit/xinitrc.d"
+else
+        XINIT_D="/etc/X11/xinit/xinitrc.d"
+fi
+
+if [ -d "$XINIT_D" ]; then
+        for f in "$XINIT_D/?*.sh" ; do
+                [ -x "$f" ] && . "$f"
+        done
+        unset f
+fi
+unset XINIT_D
+
+# additional nvidia specific settings
+if [ "$2" = "nvidia" ]; then    
+        xrandr --setprovideroutputsource modesetting NVIDIA-0
+        xrandr --auto
+fi
+
 exec bspwm