From 1872ea63f8fe4f5713f6d0e85df742d57128e76c Mon Sep 17 00:00:00 2001
From: Carolyn Saunders <gigavinyl@posteo.is>
Date: Thu, 3 May 2018 19:51:49 -0700
Subject: [PATCH] Updated Xresources and xinit

---
 .Xresources | 16 ++++++++--------
 .xinitrc    | 31 +++++++++++++++++++++----------
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/.Xresources b/.Xresources
index a726322..9e114f2 100644
--- a/.Xresources
+++ b/.Xresources
@@ -1,11 +1,11 @@
-!   __  __                                   
-!   \ \/ /_ _ ___ ___ ___ _  _ _ _ __ ___ ___
-!  _ >  <| '_/ -_|_-</ _ \ || | '_/ _/ -_|_-<
-! (_)_/\_\_| \___/__/\___/\_,_|_| \__\___/__/
-
+!  _  _ ____ ____ ____ ____ _  _ ____ ____ ____ ____ 
+!   \/  |__/ |___ [__  |  | |  | |__/ |    |___ [__  
+! ._/\_ |  \ |___ ___] |__| |__| |  \ |___ |___ ___] 
+                                                   
 #include ".cache/wal/colors.Xresources"
 
 URxvt.font: xft:scientifica:size=12
+URxvt.letterSpace: 1
 URxvt.scrollBar: False
 URxvt.internalBorder: 25
 URxvt.perl-ext-common: default,matcher
@@ -13,9 +13,9 @@ URxvt.url-launcher: surf
 URxvt.matcher.button: 1
 
 twobwm.enable_compton: true
-twobwm.border_width: 8
-twobwm.outer_border: 5
+twobwm.border_width: 12
+twobwm.outer_border: 8
 twobwm.inverted_colors: false
 
 rofi.font: scientifica 12
-rofi.theme: colors-rofi-dark
+rofi.theme: ~/.cache/wal/colors-rofi-dark.rasi
diff --git a/.xinitrc b/.xinitrc
index 160b778..093e6cb 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,17 +1,22 @@
 #!/bin/sh
-#  __ _(_)_ _ (_) |_ _ _ __ 
-# _\ \ / | ' \| |  _| '_/ _|
-#(_)_\_\_|_||_|_|\__|_| \__|
-                           
+#  __  __     __     __   __     __     ______     ______    
+# /\_\_\_\   /\ \   /\ "-.\ \   /\ \   /\  == \   /\  ___\   
+# \/_/\_\/_  \ \ \  \ \ \-.  \  \ \ \  \ \  __<   \ \ \____  
+#   /\_\/\_\  \ \_\  \ \_\\"\_\  \ \_\  \ \_\ \_\  \ \_____\ 
+#   \/_/\/_/   \/_/   \/_/ \/_/   \/_/   \/_/ /_/   \/_____/ 
+                                                           
+# Turn off that damn bell!
+xset -b
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
 sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap
 
-wallpaper=$(shuf -n1 -e $HOME/Wallpapers/*)
-wal -b 0f0f0f -i $wallpaper -n 
-$HOME/.scripts/wal.sh
+# pshuf and wal.sh can found in github.com/gigavinyl/.scripts
+wallpaper=$(find "$HOME"/Wallpapers/* | pshuf | head -n1)
+wal -b 0f0f0f -i "$wallpaper" -n --backend colorz
+wal.sh
 
 # merge in defaults and keymaps
 
@@ -31,6 +36,13 @@ if [ -f "$usermodmap" ]; then
     xmodmap "$usermodmap"
 fi
 
+# UTF8
+setxkbmap -option compose:ralt
+
+# Get fonts all setup
+xset +fp "$HOME/.fonts"
+xset fp rehash
+
 # start some nice programs
 
 if [ -d /etc/X11/xinit/xinitrc.d ] ; then
@@ -40,10 +52,9 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
  unset f
 fi
 
-feh --bg-fill $wallpaper
+feh --bg-fill "$wallpaper"
 
 compton &
 sxhkd &
 urxvtd &
-2bwm &
-exec xwait
+exec 2bwm