From ac175c332d2d549d6120af22e150ab9c8fde04c8 Mon Sep 17 00:00:00 2001
From: NiseVoid <nisevoid@gmail.com>
Date: Tue, 8 Dec 2020 11:51:34 +0100
Subject: [PATCH 1/4] Use jpg for screenshots

---
 bin/screenie | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/bin/screenie b/bin/screenie
index f44c111..21cf76b 100755
--- a/bin/screenie
+++ b/bin/screenie
@@ -2,25 +2,17 @@
 
 NAME="ss-$(cat /dev/urandom | tr -dc A-Za-z0-9 | head -c${1:-32};)"
 
-maim -m 1 -s /tmp/$NAME.png -c 1,0.25,0.25,0.6 --hidecursor
-if [ $? -ne 0 ]
-then
-	notify-send 'Screenshot canceled' -u low
+maim -m 10 -s /tmp/$NAME.jpg -c 1,0.25,0.25,0.6 --hidecursor
+if [ $? -ne 0 ]; then
 	exit
 fi
 
-if [ ! -e /tmp/$NAME.png ]
-then
-	notify-send 'Screenshot failed' 'File does <u>not</u> exist' -u critical
+if [ ! -e /tmp/$NAME.jpg ]; then
 	exit
 fi
 
-scp /tmp/$NAME.png ss:ss
-if [ $? -eq 0 ]
-then
-	echo -n 'https://ss.fuyu.moe/nisevoid/'$NAME'.png' | xclip -selection "clip-board"
-	notify-send 'Screenshot uploaded' -u low
-else
-	notify-send 'Screenshot failed' 'Could not upload image' -u critical
+scp /tmp/$NAME.jpg ss:ss
+if [ $? -eq 0 ]; then
+	echo -n 'https://ss.fuyu.moe/nisevoid/'$NAME'.jpg' | xclip -selection "clip-board"
 fi
-rm /tmp/$NAME.png
+rm /tmp/$NAME.jpg

From 9daed8c324f692eea96435096f8ff6eb3ec7de71 Mon Sep 17 00:00:00 2001
From: NiseVoid <nisevoid@gmail.com>
Date: Tue, 8 Dec 2020 11:51:55 +0100
Subject: [PATCH 2/4] Add config for fontconfig

---
 fonts.conf | 45 +++++++++++++++++++++++++++++++++++++++++++++
 install.sh |  5 ++++-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 fonts.conf

diff --git a/fonts.conf b/fonts.conf
new file mode 100644
index 0000000..77ec8e4
--- /dev/null
+++ b/fonts.conf
@@ -0,0 +1,45 @@
+<?xml version='1.0'?>
+<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+<fontconfig>
+	<alias>
+		<family>serif</family>
+		<prefer><family>Noto Serif</family></prefer>
+	</alias>
+	<alias>
+		<family>sans-serif</family>
+		<prefer><family>Noto Sans</family></prefer>
+	</alias>
+	<alias>
+		<family>sans</family>
+		<prefer><family>Noto Sans</family></prefer>
+	</alias>
+	<alias>
+		<family>monospace</family>
+		<prefer><family>Hack</family></prefer>
+	</alias>
+
+	<match>
+		<test name="family"><string>Arial</string></test>
+		<edit name="family" mode="assign" binding="strong">
+			<string>Noto Sans</string>
+		</edit>
+	</match>
+	<match>
+		<test name="family"><string>Verdana</string></test>
+		<edit name="family" mode="assign" binding="strong">
+			<string>Noto Sans</string>
+		</edit>
+	</match>
+	<match>
+		<test name="family"><string>Tahoma</string></test>
+		<edit name="family" mode="assign" binding="strong">
+			<string>Noto Sans</string>
+		</edit>
+	</match>
+	<match>
+		<test name="family"><string>Helvetica</string></test>
+		<edit name="family" mode="assign" binding="strong">
+			<string>Noto Sans</string>
+		</edit>
+	</match>
+</fontconfig>
diff --git a/install.sh b/install.sh
index ec6bf8d..d975a75 100755
--- a/install.sh
+++ b/install.sh
@@ -1,5 +1,5 @@
 #! /bin/bash
-# Dependancies: feh maim slop mpv youtube-dl i3lock xset imagemagick dmenu neovim (lo)ksh mpd mpc fzf xsetroot
+# Dependancies: feh maim slop mpv youtube-dl i3lock xset imagemagick dmenu neovim (lo)ksh mpd mpc fzf xsetroot NotoSans/Serif Hack
 # Build: dwm st
 
 ln -s ~/.LinuxConfig/profile ~/.profile
@@ -12,5 +12,8 @@ fi
 mkdir ~/.config/mpv
 ln -s ~/.LinuxConfig/mpv.conf ~/.config/mpv/
 
+mkdir ~/.config/fontconfig
+ln -s ~/.LinuxConfig/fonts.conf ~/.config/fontconfig/fonts.conf
+
 ln -s ~/.LinuxConfig/xinitrc ~/.xinitrc
 ln -s ~/.LinuxConfig/picom.conf ~/.config/picom.conf

From 192ba24829d2eaded9b1d3460a4d0e4bd1634193 Mon Sep 17 00:00:00 2001
From: NiseVoid <nisevoid@gmail.com>
Date: Tue, 8 Dec 2020 11:52:24 +0100
Subject: [PATCH 3/4] Add bin/uniqueString

---
 bin/uniqueString | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100755 bin/uniqueString

diff --git a/bin/uniqueString b/bin/uniqueString
new file mode 100755
index 0000000..fba6876
--- /dev/null
+++ b/bin/uniqueString
@@ -0,0 +1,2 @@
+#!/bin/sh
+cat /dev/urandom | tr -dc _A-Z-a-z-0-9 | head -c${1:-$1};echo;

From 678ec38e9ca55c9585486bd0bb61c974a4a3cef7 Mon Sep 17 00:00:00 2001
From: NiseVoid <nisevoid@gmail.com>
Date: Tue, 8 Dec 2020 11:52:57 +0100
Subject: [PATCH 4/4] Stop using word-diff with git aliasses

---
 kshrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kshrc b/kshrc
index 0bce918..3a31094 100755
--- a/kshrc
+++ b/kshrc
@@ -5,8 +5,8 @@ alias vim=nvim
 alias uwpass='PASSWORD_STORE_DIR=~/.pass/uw pass'
 alias gca='git commit --amend --no-edit'
 alias gpf='git push --force-with-lease'
-alias gs='git show --color-words'
-alias gd='git diff --color-words'
+alias gs='git show'
+alias gd='git diff'
 alias openvpn='sudo openvpn --config *.ovpn'
 
 if [ -e "$HOME/.kshrc_private" ]; then