From 0cf15ca367fd6f8260789f626e4bcb39a3771bf1 Mon Sep 17 00:00:00 2001
From: Johannes Löthberg <johannes@kyriasis.com>
Date: Thu, 14 May 2015 13:42:10 +0200
Subject: zsh: set figlet dir

---
 zsh/.zprofile | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'zsh/.zprofile')

diff --git a/zsh/.zprofile b/zsh/.zprofile
index b4a6a5a..81de54d 100644
--- a/zsh/.zprofile
+++ b/zsh/.zprofile
@@ -38,8 +38,11 @@ export SUDO_PROMPT=$'\e[31mSUDO\e[m password for \e[34m%p\e[m: '
 
 export SHORTHOST=$(hostname -s)
 
+# Don’t use the default venv prompt in favor of our custom one
 export VIRTUAL_ENV_DISABLE_PROMPT=1
 
+export FIGLET_FONTDIR="$HOME"/.local/share/figlet
+
 if [[ -f "$ZDOTDIR"/profile-"$SHORTHOST" ]]; then
 	source "$ZDOTDIR"/profile-"$SHORTHOST"
 fi
-- 
cgit v1.2.3-70-g09d2


From 771db2a8c4c48020da4f993eb23aeffef6c2a425 Mon Sep 17 00:00:00 2001
From: Johannes Löthberg <johannes@kyriasis.com>
Date: Fri, 10 Jul 2015 09:06:32 +0200
Subject: Move X11 config files to .config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
---
 X11/xorg.conf.d/20-intel.conf    | 5 +++++
 X11/xorg.conf.d/90-keyboard.conf | 6 ++++++
 zsh/.zprofile                    | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 X11/xorg.conf.d/20-intel.conf
 create mode 100644 X11/xorg.conf.d/90-keyboard.conf

(limited to 'zsh/.zprofile')

diff --git a/X11/xorg.conf.d/20-intel.conf b/X11/xorg.conf.d/20-intel.conf
new file mode 100644
index 0000000..0335cbe
--- /dev/null
+++ b/X11/xorg.conf.d/20-intel.conf
@@ -0,0 +1,5 @@
+Section "Device"
+   Identifier  "Intel Graphics"
+   Driver      "intel"
+   Option     "TearFree"    "true"
+EndSection
diff --git a/X11/xorg.conf.d/90-keyboard.conf b/X11/xorg.conf.d/90-keyboard.conf
new file mode 100644
index 0000000..c7c9b05
--- /dev/null
+++ b/X11/xorg.conf.d/90-keyboard.conf
@@ -0,0 +1,6 @@
+Section "InputClass"
+        Identifier      "Keyboard Defaults"
+        MatchIsKeyboard "on"
+        Option          "XkbLayout"     "dvorak,us"
+        Option          "XkbOptions"    "caps:escape,compose:ralt,grp_led:caps,grp:menu_toggle"
+EndSection
diff --git a/zsh/.zprofile b/zsh/.zprofile
index 81de54d..653b8ad 100644
--- a/zsh/.zprofile
+++ b/zsh/.zprofile
@@ -51,5 +51,5 @@ fi
 source <(dircolors -b "$XDG_CONFIG_HOME"/dircolors)
 
 if [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]]; then
-	exec startx "$XDG_CONFIG_HOME"/X11/xinitrc
+	exec startx "$XDG_CONFIG_HOME"/X11/xinitrc -- -configdir "$XDG_CONFIG_HOME"/X11/xorg.conf.d
 fi
-- 
cgit v1.2.3-70-g09d2