From f55629e8b9d18fa1c5dc94f67dad1916072aee8e Mon Sep 17 00:00:00 2001
From: Ian Mancini <ianmethyst@gmail.com>
Date: Sun, 12 Apr 2020 05:03:42 -0300
Subject: [PATCH] Update Iosevka typography variables. Reflect changes in
 template

---
 template/alacritty/.config/alacritty/alacritty.yml | 13 +++++++++++++
 template/dunst/.config/dunst/dunstrc               |  2 +-
 template/polybar/.config/polybar/config            |  2 +-
 template/shell/.envrc                              |  1 +
 template/x/.Xdefaults                              |  9 +++++----
 template/x/.xinitrc                                |  2 +-
 template/zathura/.config/zathura/zathurarc         |  2 +-
 themes/iosevka                                     | 12 +++++++++++-
 8 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/template/alacritty/.config/alacritty/alacritty.yml b/template/alacritty/.config/alacritty/alacritty.yml
index b8d8947..be735a9 100644
--- a/template/alacritty/.config/alacritty/alacritty.yml
+++ b/template/alacritty/.config/alacritty/alacritty.yml
@@ -9,6 +9,19 @@ window:
 font:
   normal:
     family: {{FONT}}
+    style: {{FONTSTYLE}}
+
+  bold:
+    family: {{FONT}}
+    style: {{FONTBOLDSTYLE}}
+
+  italic:
+    family: {{FONT}}
+    style: {{FONTITALICSTYLE}}
+ 
+  bold_italic:
+    family: {{FONT}}
+    style: {{FONTBOLDITALICSTYLE}}
 
   size: {{FONTSIZE}}
 
diff --git a/template/dunst/.config/dunst/dunstrc b/template/dunst/.config/dunst/dunstrc
index b44e51b..b839d54 100755
--- a/template/dunst/.config/dunst/dunstrc
+++ b/template/dunst/.config/dunst/dunstrc
@@ -13,7 +13,7 @@
     frame_width = 3
     sort = yes
     idle_threshold = 120
-    font = {{FONT}} {{FONTSIZE}}
+    font = {{FONTNORMAL}} {{FONTSIZE}}
     line_height = 0
     markup = full
     format = "%s\n%b"
diff --git a/template/polybar/.config/polybar/config b/template/polybar/.config/polybar/config
index 8786829..94b5b88 100755
--- a/template/polybar/.config/polybar/config
+++ b/template/polybar/.config/polybar/config
@@ -28,7 +28,7 @@ padding-right = 1
 border-bottom-size = 0
 border-top-size = 0
 
-font-0 = {{FONT}}:size={{FONTSIZE}}:{{POLYBAR.antialias}};{{POLYBAR.textoffset}}
+font-0 = {{FONTNORMAL}}:size={{FONTSIZE}}:{{POLYBAR.antialias}};{{POLYBAR.textoffset}}
 font-1 = {{ICONFONT}}:size={{FONTSIZE}}:scale={{POLYBAR.iconfontscale}}:{{POLYBAR.antialias}};{{POLYBAR.textoffset}}
 
 modules-left = {{POLYBAR.modulesleft}}
diff --git a/template/shell/.envrc b/template/shell/.envrc
index a076c66..5819494 100644
--- a/template/shell/.envrc
+++ b/template/shell/.envrc
@@ -51,5 +51,6 @@ if command -v pyenv 1>/dev/null 2>&1; then;  eval "$(pyenv init -)"; fi
 
 # pipenv
 export PIPENV_VENV_IN_PROJECT=1
+export PIPENV_SKIP_LOCK=true
 export PIPENV_PYTHON=$PYENV_ROOT/shims/python
 eval "$(pipenv --completion)"
diff --git a/template/x/.Xdefaults b/template/x/.Xdefaults
index fbae4e5..4e1d42c 100755
--- a/template/x/.Xdefaults
+++ b/template/x/.Xdefaults
@@ -38,9 +38,10 @@ URxvt.geometry: 	102x22
 !URxvt.keysym.Shift-Control-V: perl:clipboard:paste
 
 ! Font
-URxvt.font        :xft:{{FONT}}:size={{FONTSIZE}}
-URxvt.boldFont    :xft:{{FONT}}:Bold:size={{FONTSIZE}}
-URxvt.italicFont  :xft:{{FONT}}:Bold:size={{FONTSIZE}}
+URxvt.font           :xft:{{FONT}}:{{FONTSTYLE}}:size={{FONTSIZE}}
+URxvt.boldFont       :xft:{{FONT}}:{{FONTBOLDSTYLE}}:size={{FONTSIZE}}
+URxvt.italicFont     :xft:{{FONT}}:{{FONTITALICSTYLE}}:size={{FONTSIZE}}
+URxvt.boldItalicFont :xft:{{FONT}}:{{FONTBOLDITALICSTYLE}}:size={{FONTSIZE}}
 URxvt.letterSpace: 0
 URxvt*lineSpace: 0
 
@@ -111,7 +112,7 @@ rofi.eh: 1
 rofi.width: 400
 rofi.bw: 0
 
-rofi.terminal:             urxvt 
+rofi.terminal:             {{TERMINAL}}
 rofi.ssh-client:           ssh
 rofi.ssh-command:          {terminal} -e {ssh-client} {host}
 rofi.run-command:          {cmd}
diff --git a/template/x/.xinitrc b/template/x/.xinitrc
index 24d9371..c243757 100755
--- a/template/x/.xinitrc
+++ b/template/x/.xinitrc
@@ -2,6 +2,6 @@
 
 export EDITOR="nvim"
 export BROWSER="chromium"
-export TERMINAL="alacritty"
+export TERMINAL={{TERMINAL}}
 
 exec i3
diff --git a/template/zathura/.config/zathura/zathurarc b/template/zathura/.config/zathura/zathurarc
index ad1a56a..aa3398c 100755
--- a/template/zathura/.config/zathura/zathurarc
+++ b/template/zathura/.config/zathura/zathurarc
@@ -17,7 +17,7 @@ set guioptions "s"
 
 # Colors and font
 
-set font "{{FONT}} {{FONTSIZE}}"
+set font "{{FONTNORMAL}} {{FONTSIZE}}"
 
 set default-bg                  "{{COLORS.background}}"
 set default-fg                  "{{COLORS.foreground}}"
diff --git a/themes/iosevka b/themes/iosevka
index 3bd10d0..b6ac2f9 100644
--- a/themes/iosevka
+++ b/themes/iosevka
@@ -1,9 +1,19 @@
 #!/bin/bash 
 
-FONT="Iosevka"
+FONT="Iosevka Term"
+FONTSTYLE="Medium"
+FONTBOLDSTYLE="Bold"
+FONTITALICSTYLE="Oblique"
+FONTBOLDITALICSTYLE="$FONTBOLDSTYLE $FONTITALICSTYLE"
+FONTNORMAL="$FONT $FONTSTYLE"
+FONTITALIC="$FONT $FONTSTYLE $FONTITALICSTYLE"
+FONTBOLD="$FONT $FONTSTYLE $FONTBOLDSTYLE"
+FONTBOLDITALIC="$FONT $FONTSTYLE $FONTBOLDSTYLE $FONTITALICSTYLE"
 ICONFONT="Noto Color Emoji"
 FONTSIZE="11"
 
+TERMINAL="alacritty"
+
 declare -A POLYBAR
 POLYBAR=(\
   [modulesleft]="i3" \