Update X configs

2 files changed, 80 insertions, 41 deletions

diff --git a/X/.Xresources b/X/.Xresources
index 77ee44d..35ded8f 100644
--- a/X/.Xresources
+++ b/X/.Xresources
@@ -1,8 +1,8 @@
-XTerm*faceName: Terminus
-UXTerm*faceName: Unifont
+XTerm*faceName: Inconsolata
+UXTerm*faceName: Inconsolata
 
-XTerm*faceSize: 10
-UXTerm*faceSize: 10
+XTerm*faceSize: 16
+UXTerm*faceSize: 16
 
 XTerm*allowBoldFont: false
 UXTerm*allowBoldFont: false
@@ -51,37 +51,73 @@ XTerm*on3Clicks: regex ([[:alpha:]]+://)?([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]]
 !*foreground: white
 
 
-*background:  rgb:00/00/00
-*foreground:  rgb:a8/a8/a8
-
-! Black
-*color0:      rgb:00/00/00
-*color8:      rgb:54/50/54
-
-! Red
-*color1:      rgb:a8/00/00
-*color9:      rgb:f8/54/50
-
-! Green
-*color2:      rgb:00/a8/00
-*color10:     rgb:50/fc/50
-
-! Yellow
-*color3:      rgb:a8/54/00
-*color11:     rgb:f8/fc/50
-
-! Blue
-*color4:      rgb:00/00/a8
-*color12:     rgb:50/54/f8
-
-! Magneta
-*color5:      rgb:a8/00/a8
-*color13:     rgb:f8/54/f8
-
-! Cyan
-*color6:      rgb:00/a8/a8
-*color14:     rgb:50/fc/f8
-
-! White
-*color7:      rgb:a8/a8/a8
-*color15:     rgb:f8/fc/f8
+!*background:  rgb:00/00/00
+!*foreground:  rgb:a8/a8/a8
+!
+!! Black
+!*color0:      rgb:00/00/00
+!*color8:      rgb:54/50/54
+!
+!! Red
+!*color1:      rgb:a8/00/00
+!*color9:      rgb:f8/54/50
+!
+!! Green
+!*color2:      rgb:00/a8/00
+!*color10:     rgb:50/fc/50
+!
+!! Yellow
+!*color3:      rgb:a8/54/00
+!*color11:     rgb:f8/fc/50
+!
+!! Blue
+!*color4:      rgb:00/00/a8
+!*color12:     rgb:50/54/f8
+!
+!! Magneta
+!*color5:      rgb:a8/00/a8
+!*color13:     rgb:f8/54/f8
+!
+!! Cyan
+!*color6:      rgb:00/a8/a8
+!*color14:     rgb:50/fc/f8
+!
+!! White
+!*color7:      rgb:a8/a8/a8
+!*color15:     rgb:f8/fc/f8
+
+! PaperColor Theme
+*.foreground: #4D4D4C
+*.background: #EEEEEE
+
+! black
+*.color0: #EDEDED
+*.color8: #969694
+
+! red
+*.color1: #D7005F
+*.color9: #D7005F
+
+! green
+*.color2: #718C00
+*.color10: #718C00
+
+! yellow / orange
+*.color3: #D75F00
+*.color11: #D75F00
+
+! blue
+*.color4: #4271AE
+*.color12: #4271AE
+
+! magenta
+*.color5: #8959A8
+*.color13: #8959A8
+
+! cyan
+*.color6: #3E999F
+*.color14: #3E999F
+
+! white
+*.color7: #4D4D4C
+*.color15: #F5F5F5
diff --git a/X/.xinitrc b/X/.xinitrc
index 3c81932..5d19ea8 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -1,9 +1,12 @@
 #Basic startx file uncomment lines for more functionality
 
-#feh --bg-fill !PATH_TO_WALLPAPER
-xrdb -merge /home/tje/.Xresources
+feh --bg-fill /home/tje/Pictures/Wallpapers/moon.png
+xrdb -load /home/tje/.Xresources
 start-pulseaudio-x11 &
+
+# Set reverse scrolling
+xinput set-button-map 13 1 2 3 5 4 
+
 ~/.screenSetup.sh
 [[ -f ~/.Xmodmap ]] && xmodmap ~/.Xmodmap
 exec i3
-exec twm