From 68298bf3f191506d9c8d6878a636ca2544e4f991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?= Date: Sun, 4 Jul 2021 09:52:16 +0200 Subject: [PATCH] Nerd fonts --- config/Xresources/urxvt | 2 +- config/Xresources/xterm | 2 +- config/alacritty/alacritty.yml.j2 | 24 +++++++++---------- .../roles/desktop_environment/tasks/main.yml | 19 +++++++++------ .../roles/vim/templates/pluginlist.j2 | 1 + config/lemonbar/display.py | 2 +- config/lemonbar/pip.py | 2 +- config/polybar/config | 2 +- 8 files changed, 30 insertions(+), 24 deletions(-) diff --git a/config/Xresources/urxvt b/config/Xresources/urxvt index 1792301..1ea3a06 100644 --- a/config/Xresources/urxvt +++ b/config/Xresources/urxvt @@ -22,7 +22,7 @@ URxvt*scrollBar: false ! Font declaration -URxvt.font: xft:DejaVu Sans Mono for Powerline:size=12:antialias=true,xft:Twemoji:size=12:antialias=true,xft:symbola:size=12:minspace=False +URxvt.font: xft:DejaVuSansMono Nerd Font Mono:size=12:antialias=true,xft:Twemoji:size=12:antialias=true,xft:symbola:size=12:minspace=False ! Font spacing URxvt.letterSpace: 0 diff --git a/config/Xresources/xterm b/config/Xresources/xterm index 40f323f..cb5531d 100644 --- a/config/Xresources/xterm +++ b/config/Xresources/xterm @@ -1,4 +1,4 @@ -xterm*faceName : DejaVu Sans Mono for Powerline:size=12:antialias=true +xterm*faceName : DejaVuSansMono Nerd Font Mono:size=12:antialias=true xterm*dynamicColors: true xterm*utf8: 2 xterm*eightBitInput: true diff --git a/config/alacritty/alacritty.yml.j2 b/config/alacritty/alacritty.yml.j2 index ea51ae0..c40e2ce 100644 --- a/config/alacritty/alacritty.yml.j2 +++ b/config/alacritty/alacritty.yml.j2 @@ -105,50 +105,50 @@ window: # Font configuration font: # Normal (roman) font face - #normal: + normal: # Font family # # Default: # - (macOS) Menlo # - (Linux/BSD) monospace # - (Windows) Consolas - #family: monospace + family: DejaVuSansMono Nerd Font Mono # The `style` can be specified to pick a specific face. - #style: Regular + style: Regular # Bold font face - #bold: + bold: # Font family # # If the bold family is not specified, it will fall back to the # value specified for the normal font. - #family: monospace + family: DejaVuSansMono Nerd Font Mono # The `style` can be specified to pick a specific face. - #style: Bold + style: Bold # Italic font face - #italic: + italic: # Font family # # If the italic family is not specified, it will fall back to the # value specified for the normal font. - #family: monospace + family: DejaVuSansMono Nerd Font Mono # The `style` can be specified to pick a specific face. - #style: Italic + style: Oblique # Bold italic font face - #bold_italic: + bold_italic: # Font family # # If the bold italic family is not specified, it will fall back to the # value specified for the normal font. - #family: monospace + family: DejaVuSansMono Nerd Font Mono # The `style` can be specified to pick a specific face. - #style: Bold Italic + style: Bold Oblique # Point size size: 12.0 diff --git a/config/automatrop/roles/desktop_environment/tasks/main.yml b/config/automatrop/roles/desktop_environment/tasks/main.yml index 3ebac68..54cf0b6 100644 --- a/config/automatrop/roles/desktop_environment/tasks/main.yml +++ b/config/automatrop/roles/desktop_environment/tasks/main.yml @@ -12,22 +12,27 @@ - ".config/tridactyl/themes" # Download fonts -- name: Download terminal fonts +- name: Download Nerd fonts get_url: - url: "http://raw.githubusercontent.com/powerline/fonts/master/DejaVuSansMono/{{ item | urlencode }}" - dest: "{{ ansible_user_dir }}/.local/share/fonts/{{ item }}" + url: "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/master/patched-fonts/DejaVuSansMono/{{ item.folder }}/complete/{{ item.filename | urlencode }}" + dest: "{{ ansible_user_dir }}/.local/share/fonts/{{ item.filename }}" mode: "u=rw,g=r,o=r" loop: - - DejaVu Sans Mono Bold for Powerline.ttf - - DejaVu Sans Mono Bold Oblique for Powerline.ttf - - DejaVu Sans Mono for Powerline.ttf - - DejaVu Sans Mono Oblique for Powerline.ttf + - filename: DejaVu Sans Mono Bold Nerd Font Complete Mono.ttf + folder: Bold + - filename: DejaVu Sans Mono Bold Oblique Nerd Font Complete Mono.ttf + folder: Bold-Italic + - filename: DejaVu Sans Mono Nerd Font Complete Mono.ttf + folder: Regular + - filename: DejaVu Sans Mono Oblique Nerd Font Complete Mono.ttf + folder: Italic - name: Download icon fonts get_url: url: "https://raw.githubusercontent.com/FortAwesome/Font-Awesome/a8386aae19e200ddb0f6845b5feeee5eb7013687/fonts/fontawesome-webfont.ttf" dest: "{{ ansible_user_dir }}/.local/share/fonts/fontawesome-webfont.ttf" mode: "u=rw,g=r,o=r" +# TODO Either replace with ForkAwesome or Nerd Fonts - name: Install python dependencies for lemonbar pip: diff --git a/config/automatrop/roles/vim/templates/pluginlist.j2 b/config/automatrop/roles/vim/templates/pluginlist.j2 index 5641012..1c50b41 100644 --- a/config/automatrop/roles/vim/templates/pluginlist.j2 +++ b/config/automatrop/roles/vim/templates/pluginlist.j2 @@ -10,6 +10,7 @@ " Theming {{ use_plugin('base16') }} {{ use_plugin('airline') }} +{{ use_plugin('devicons') }} " Goto utilities {{ use_plugin('fzf') }} diff --git a/config/lemonbar/display.py b/config/lemonbar/display.py index d30f273..fecdae1 100755 --- a/config/lemonbar/display.py +++ b/config/lemonbar/display.py @@ -54,7 +54,7 @@ class Bar: """ # Constants - FONTS = ["DejaVu Sans Mono for Powerline", "Font Awesome"] + FONTS = ["DejaVuSansMono Nerd Font Mono", "Font Awesome"] FONTSIZE = 10 @staticmethod diff --git a/config/lemonbar/pip.py b/config/lemonbar/pip.py index 7cabff3..a51dc82 100755 --- a/config/lemonbar/pip.py +++ b/config/lemonbar/pip.py @@ -13,7 +13,7 @@ import i3ipc import difflib # Constants -FONT = "DejaVu Sans Mono for Powerline" +FONT = "DejaVuSansMono Nerd Font Mono" # TODO Update to be in sync with base16 thm = [ diff --git a/config/polybar/config b/config/polybar/config index 60b6c6f..8927355 100644 --- a/config/polybar/config +++ b/config/polybar/config @@ -53,7 +53,7 @@ module-margin-right = 1 font-0 = "Font Awesome:size=10;0" font-1 = "DejaVu Sans:size=10;0" -font-2 = "DejaVu Sans Mono for Powerline:pixelsize=10;0" +font-2 = "DejaVuSansMono Nerd Font Mono:pixelsize=10;0" modules-left = i3