2 files changed, 20 insertions, 72 deletions
diff --git a/x/.Xresources b/x/.Xresources
index 569a360..54e7237 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -35,56 +35,25 @@ URxvt*fading: 0
 URxvt*tintColor: #ffffff
 URxvt*shading: 0
 URxvt*inheritPixmap: False
-!Tomorrow
-#define t_background        #ffffff
-#define t_current_line      #efefef
-#define t_selection             #d6d6d6
-#define t_foreground            #4d4d4c
-#define t_comment               #8e908c
-#define t_red                   #c82829
-#define t_orange                #f5871f
-#define t_yellow                #eab700
-#define t_green                 #718c00
-#define t_aqua                  #3e999f
-#define t_blue                  #4271ae
-#define t_purple                #8959a8
+*.foreground: #F8F8F2
-*.foreground:   t_foreground
+*.background: #121212
-*.background:   t_background
+*.color0:     #000000
-*.cursorColor:  #aeafad
+*.color8:     #4D4D4D
+*.color1:     #FF5555
-! Black / Grey
+*.color9:     #FF6E67
-*.color0:       #000000
+*.color2:     #50FA7B
-*.color8:       #666666
+*.color10:    #5AF78E
+*.color3:     #F1FA8C
-! Red / Bright Red
+*.color11:    #F4F99D
-*.color1:       t_red
+*.color4:     #BD93F9
-*.color9:       #FF3334
+*.color12:    #CAA9FA
+*.color5:     #FF79C6
-! Green + Bright Green
+*.color13:    #FF92D0
-*.color2:       t_green
+*.color6:     #8BE9FD
-*.color10:      #9ec400
+*.color14:    #9AEDFE
+*.color7:     #BFBFBF
-! Yellow (Orange) + Bright Yellow (Yellow)
+*.color15:    #E6E6E6
-*.color3:       t_orange
-*.color11:      t_yellow
-! Blue + Bright Blue
-*.color4:       t_blue
-*.color12:      t_blue
-! Magenta (Purple) + Bright Magenta
-*.color5:       t_purple
-*.color13:      #b777e0
-! Cyan (Aqua) + Bright Cyan
-*.color6:       t_aqua
-*.color14:      #54ced6
-! Light Grey (Selection) + White (Current Line)
-*.color7:       t_selection
-*.color15:      t_current_line
 ! Perls
 URxvt.perl-ext-common : default,matcher,keyboard-select,url-select,resize-font
@@ -98,4 +67,3 @@ 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 8626b1b..b32d4c8 100644
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -40,25 +40,5 @@ if [ -n "$DISPLAY" ]; then
        xset b off
 fi
-# load additional configs
+xsetroot -cursor_name left_ptr
-if [ "$2" = "nvidia" ]; then
+exec dbus-launch --sh-syntax --exit-with-x11 bspwm
-        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

diff --git a/x/.Xresources b/x/.Xresources index 569a360..54e7237 100644 --- a/x/.Xresources +++ b/x/.Xresources
@@ -35,56 +35,25 @@ URxvt*fading: 0
35	URxvt*tintColor: #ffffff	35	URxvt*tintColor: #ffffff
36	URxvt*shading: 0	36	URxvt*shading: 0
37	URxvt*inheritPixmap: False	37	URxvt*inheritPixmap: False
38	!Tomorrow
39	#define t_background #ffffff
40	#define t_current_line #efefef
41	#define t_selection #d6d6d6
42	#define t_foreground #4d4d4c
43	#define t_comment #8e908c
44	#define t_red #c82829
45	#define t_orange #f5871f
46	#define t_yellow #eab700
47	#define t_green #718c00
48	#define t_aqua #3e999f
49	#define t_blue #4271ae
50	#define t_purple #8959a8
51		38
52		39	*.foreground: #F8F8F2
53	*.foreground: t_foreground	40	*.background: #121212
54	*.background: t_background	41	*.color0: #000000
55	*.cursorColor: #aeafad	42	*.color8: #4D4D4D
56		43	*.color1: #FF5555
57	! Black / Grey	44	*.color9: #FF6E67
58	*.color0: #000000	45	*.color2: #50FA7B
59	*.color8: #666666	46	*.color10: #5AF78E
60		47	*.color3: #F1FA8C
61	! Red / Bright Red	48	*.color11: #F4F99D
62	*.color1: t_red	49	*.color4: #BD93F9
63	*.color9: #FF3334	50	*.color12: #CAA9FA
64		51	*.color5: #FF79C6
65	! Green + Bright Green	52	*.color13: #FF92D0
66	*.color2: t_green	53	*.color6: #8BE9FD
67	*.color10: #9ec400	54	*.color14: #9AEDFE
68		55	*.color7: #BFBFBF
69	! Yellow (Orange) + Bright Yellow (Yellow)	56	*.color15: #E6E6E6
70	*.color3: t_orange
71	*.color11: t_yellow
72
73	! Blue + Bright Blue
74	*.color4: t_blue
75	*.color12: t_blue
76
77	! Magenta (Purple) + Bright Magenta
78	*.color5: t_purple
79	*.color13: #b777e0
80
81	! Cyan (Aqua) + Bright Cyan
82	*.color6: t_aqua
83	*.color14: #54ced6
84
85	! Light Grey (Selection) + White (Current Line)
86	*.color7: t_selection
87	*.color15: t_current_line
88		57
89	! Perls	58	! Perls
90	URxvt.perl-ext-common : default,matcher,keyboard-select,url-select,resize-font	59	URxvt.perl-ext-common : default,matcher,keyboard-select,url-select,resize-font
@@ -98,4 +67,3 @@ URxvt.url-select.launcher : firefox
98	URxvt.url-select.autocopy : true	67	URxvt.url-select.autocopy : true
99	URxvt.url-select.underline : true	68	URxvt.url-select.underline : true
100	URxvt.url-select.button: 1	69	URxvt.url-select.button: 1
101


diff --git a/x/.xinitrc b/x/.xinitrc index 8626b1b..b32d4c8 100644 --- a/x/.xinitrc +++ b/x/.xinitrc
@@ -40,25 +40,5 @@ if [ -n "$DISPLAY" ]; then
40	xset b off	40	xset b off
41	fi	41	fi
42		42
43	# load additional configs	43	xsetroot -cursor_name left_ptr
44	if [ "$2" = "nvidia" ]; then	44	exec dbus-launch --sh-syntax --exit-with-x11 bspwm
45	XINIT_D="/etc/X11/nvidia/xinit/xinitrc.d"
46	else
47	XINIT_D="/etc/X11/xinit/xinitrc.d"
48	fi
49
50	if [ -d "$XINIT_D" ]; then
51	for f in "$XINIT_D/?*.sh" ; do
52	[ -x "$f" ] && . "$f"
53	done
54	unset f
55	fi
56	unset XINIT_D
57
58	# additional nvidia specific settings
59	if [ "$2" = "nvidia" ]; then
60	xrandr --setprovideroutputsource modesetting NVIDIA-0
61	xrandr --auto
62	fi
63
64	exec bspwm