From baad568ee565d1b970d5751003ebdd337bb031a5 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lytedev.io>
Date: Tue, 25 Oct 2016 20:01:42 -0500
Subject: [PATCH] lots of changes

---
 .Xresources.env                              | 5 +++++
 env/x/xresources                             | 3 ++-
 os/arch_linux/0-adduser.bash                 | 8 ++++++++
 os/arch_linux/{git.bash => 1-git.bash}       | 0
 os/arch_linux/{pacaur.bash => 2-pacaur.bash} | 2 +-
 os/arch_linux/{utils.bash => 3-utils.bash}   | 3 +++
 os/arch_linux/bar.bash                       | 2 +-
 os/arch_linux/fonts.bash                     | 4 ++--
 os/arch_linux/todo.bash                      | 3 ++-
 os/arch_linux/wm.bash                        | 2 +-
 10 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 .Xresources.env
 create mode 100755 os/arch_linux/0-adduser.bash
 rename os/arch_linux/{git.bash => 1-git.bash} (100%)
 rename os/arch_linux/{pacaur.bash => 2-pacaur.bash} (92%)
 rename os/arch_linux/{utils.bash => 3-utils.bash} (94%)

diff --git a/.Xresources.env b/.Xresources.env
new file mode 100644
index 0000000..de25273
--- /dev/null
+++ b/.Xresources.env
@@ -0,0 +1,5 @@
+#define primaryfont xft:Terminus-12
+
+*font: primaryfont
+*faceName: primaryfont
+*boldFont: primaryfont
diff --git a/env/x/xresources b/env/x/xresources
index 9914248..65f7104 100755
--- a/env/x/xresources
+++ b/env/x/xresources
@@ -1,4 +1,4 @@
-#define primaryfont xft:Terminus-16
+#define primaryfont xft:Terminus-12
 #define secondaryfont xft:Open Sans-9
 #define iconfont xft:stlarch-9
 #define primaryletterspace 0
@@ -15,6 +15,7 @@
 *termName: rxvt-unicode
 *intensityStyles: true
 *utf8: 2
+*scaleHeight: 1
 
 emacs.font: emacspfont
 
diff --git a/os/arch_linux/0-adduser.bash b/os/arch_linux/0-adduser.bash
new file mode 100755
index 0000000..9fc8efa
--- /dev/null
+++ b/os/arch_linux/0-adduser.bash
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+groupadd admin 2>/dev/null
+mkdir -p /home/daniel
+useradd -m -d /home/daniel/usr -G admin,users -s /usr/bin/bash daniel
+chown -R daniel:daniel /home/daniel
+echo "Setting password for user 'daniel'"
+passwd daniel
diff --git a/os/arch_linux/git.bash b/os/arch_linux/1-git.bash
similarity index 100%
rename from os/arch_linux/git.bash
rename to os/arch_linux/1-git.bash
diff --git a/os/arch_linux/pacaur.bash b/os/arch_linux/2-pacaur.bash
similarity index 92%
rename from os/arch_linux/pacaur.bash
rename to os/arch_linux/2-pacaur.bash
index 041f6b6..b538338 100755
--- a/os/arch_linux/pacaur.bash
+++ b/os/arch_linux/2-pacaur.bash
@@ -21,5 +21,5 @@ cd "$REPOSITORY_PATH/pacaur"
 makepkg -i --noconfirm
 cd -
 
-pacuar -S cower pacaur
+pacaur -S cower pacaur --noconfirm --noedit
 
diff --git a/os/arch_linux/utils.bash b/os/arch_linux/3-utils.bash
similarity index 94%
rename from os/arch_linux/utils.bash
rename to os/arch_linux/3-utils.bash
index fa3acb2..d274713 100755
--- a/os/arch_linux/utils.bash
+++ b/os/arch_linux/3-utils.bash
@@ -16,6 +16,8 @@ sudo pacman -S \
 	wpa_actiond \
 	ifplugd \
 	htop \
+	openssh \
+	openssl \
 	--noconfirm
 
 pacaur -S \
@@ -40,6 +42,7 @@ pacaur -S \
 	thunar-shares-plugin \
 	nmap \
 	pulseaudio-ctl \
+	pavucontrol \
 	--noconfirm --noedit
 
 # sudo ln -s /usr/bin/google-chrome-unstable /usr/bin/chrome
diff --git a/os/arch_linux/bar.bash b/os/arch_linux/bar.bash
index 61b05e3..41823bb 100755
--- a/os/arch_linux/bar.bash
+++ b/os/arch_linux/bar.bash
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-pacaur -S lemonbar-xft-git
+pacaur -S lemonbar-xft-git --noconfirm --noedit
 
diff --git a/os/arch_linux/fonts.bash b/os/arch_linux/fonts.bash
index f6f6c42..7bbff4b 100755
--- a/os/arch_linux/fonts.bash
+++ b/os/arch_linux/fonts.bash
@@ -13,8 +13,8 @@ sudo sh -c 'sed -i -e "/\[infinality-bundle\]/,+6d" /etc/pacman.conf'
 sudo sh -c 'echo -e "[infinality-bundle]\nServer = http://bohoomil.com/repo/\$arch\n\n[infinality-bundle-fonts]\nServer = http://bohoomil.com/repo/fonts\n" >> /etc/pacman.conf'
 
 sudo pacman -Syy --noconfirm
-sudo pacman -S infinality-bundle
+sudo pacman -S infinality-bundle terminus-font
 
-pacaur -S ttf-monaco --noconfirm --noedit
+pacaur -S ttf-monaco gohufont artwiz-fonts phallus-fonts-git --noconfirm --noedit
 sudo pacman -S ttf-opensans ttf-dejavu --noconfirm
 
diff --git a/os/arch_linux/todo.bash b/os/arch_linux/todo.bash
index 369e79a..6da557c 100755
--- a/os/arch_linux/todo.bash
+++ b/os/arch_linux/todo.bash
@@ -8,7 +8,8 @@ pacaur -S \
 	--noconfirm --noedit
 
 if [ ! -f "$HOME/.todo/config" ]; then
-	cp /usr/share/todotxt/todo.cfg ~/.todo/config
+	mkdir -p "$HOME/.todo"
+	cp /usr/share/todotxt/todo.cfg "$HOME/.todo/config"
 	vim "$HOME/.todo/config"
 fi
 
diff --git a/os/arch_linux/wm.bash b/os/arch_linux/wm.bash
index 2755e41..1c3cb5c 100755
--- a/os/arch_linux/wm.bash
+++ b/os/arch_linux/wm.bash
@@ -4,5 +4,5 @@ DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/../.." && pwd)
 source "$DIR/variables.bash"
 
 sudo pacman -S xcb-util xcb-util-keysyms xcb-util-wm xorg-xrandr xdotool feh --noconfirm
-pacaur -S bspwm-git sxhkd-git xdo-git
+pacaur -S bspwm-git sxhkd-git xdo-git --noconfirm --noedit