Better font config

2 files changed, 46 insertions, 66 deletions

diff --git a/Xresources b/Xresources
index d575eaf..0653342 100644
--- a/Xresources
+++ b/Xresources
@@ -1,7 +1,7 @@
 *customization: -color
 ! urxvt*font: xft:dejavu sans mono:pixelsize=22:antialias=true
 !urxvt*font: xft:DejaVu Sans Mono:pixelsize=20:antialias=true:hinting=true
-urxvt*font: xft:fira code:pixelsize=16:antialias=true:hinting=true
+urxvt*font: xft:iosevka term:size=14,xft:dejavu sans mono:size=14
 !urxvt*letterSpace: -5
 !urxvt*font: xft:fira code:pixelsize=22:antialias=true
 !urxvt*font: xft:inconsolata:size=18:antialias=true
@@ -30,70 +30,42 @@ URxvt.iso14755_52: false
 URxvt.url-launcher: /usr/bin/xdg-open
 URxvt.matcher.button: 1
 
-urxvt*foreground: white
-urxvt*background: black
+#define nord0 #2E3440
+#define nord1 #3B4252
+#define nord2 #434C5E
+#define nord3 #4C566A
+#define nord4 #D8DEE9
+#define nord5 #E5E9F0
+#define nord6 #ECEFF4
+#define nord7 #8FBCBB
+#define nord8 #88C0D0
+#define nord9 #81A1C1
+#define nord10 #5E81AC
+#define nord11 #BF616A
+#define nord12 #D08770
+#define nord13 #EBCB8B
+#define nord14 #A3BE8C
+#define nord15 #B48EAD
 
-*color0:  #2E3436
-*color1:  #a40000
-*color2:  #4E9A06
-*color3:  #C4A000
-*color4:  #3465A4
-*color5:  #75507B
-*color6:  #ce5c00
-*color7:  #babdb9
-*color8:  #555753
-*color9:  #EF2929
-*color10: #8AE234
-*color11: #FCE94F
-*color12: #729FCF
-*color13: #AD7FA8
-*color14: #fcaf3e
-*color15: #EEEEEC
+*.foreground:   nord6
+*.background:   nord0
+*.cursorColor:  nord4
+*fading: 15
+*fadeColor: nord3
 
-! #define base00 #272822
-! #define base01 #383830
-! #define base02 #49483e
-! #define base03 #75715e
-! #define base04 #a59f85
-! #define base05 #f8f8f2
-! #define base06 #f5f4f1
-! #define base07 #f9f8f5
-! #define base08 #f92672
-! #define base09 #fd971f
-! #define base0A #f4bf75
-! #define base0B #a6e22e
-! #define base0C #a1efe4
-! #define base0D #66d9ef
-! #define base0E #ae81ff
-! #define base0F #cc6633
-! 
-! *.foreground:   base05
-! *.background:   base00
-! *.cursorColor:  base05
-! 
-! *.color0:       base00
-! *.color1:       base08
-! *.color2:       base0B
-! *.color3:       base0A
-! *.color4:       base0D
-! *.color5:       base0E
-! *.color6:       base0C
-! *.color7:       base05
-! 
-! *.color8:       base03
-! *.color9:       base08
-! *.color10:      base0B
-! *.color11:      base0A
-! *.color12:      base0D
-! *.color13:      base0E
-! *.color14:      base0C
-! *.color15:      base07
-! 
-! ! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt),
-! ! use 'shell' template to set these if necessary
-! *.color16:      base09
-! *.color17:      base0F
-! *.color18:      base01
-! *.color19:      base02
-! *.color20:      base04
-! *.color21:      base06
+*.color0: nord1
+*.color1: nord11
+*.color2: nord14
+*.color3: nord13
+*.color4: nord9
+*.color5: nord15
+*.color6: nord8
+*.color7: nord5
+*.color8: nord3
+*.color9: nord11
+*.color10: nord14
+*.color11: nord13
+*.color12: nord9
+*.color13: nord15
+*.color14: nord7
+*.color15: nord6
diff --git a/bin/kj-setup.sh b/bin/kj-setup.sh
index faa33f0..a7368be 100755
--- a/bin/kj-setup.sh
+++ b/bin/kj-setup.sh
@@ -43,6 +43,9 @@ create_symlink() {
   fi
 }
 
+mkdir -p .config
+
+create_symlink dotfiles/Xresources .Xresources
 create_symlink dotfiles/gitconfig .gitconfig
 create_symlink dotfiles/taskrc .taskrc
 create_symlink dotfiles/tmux.conf .tmux.conf
@@ -50,6 +53,11 @@ create_symlink dotfiles/spacemacs .spacemacs
 create_symlink /dev/null .vimrc.local
 create_symlink dotfiles/livestreamerrc .livestreamerrc
 
+if which fc-cache; then
+  create_symlink dotfiles/fonts .fonts
+  fc-cache -f -v
+fi
+
 mkdir -p .doom.d
 for f in dotfiles/doom.d/*; do
   f=$(basename "${f}")