From f74a21df78e9d6a40f7efd15b2b40a160a6bfb25 Mon Sep 17 00:00:00 2001 From: Joachim Nielandt Date: Tue, 28 Jun 2022 17:34:57 +0200 Subject: [PATCH] Moving to alacritty, cleaning up font/size --- dot_Xresources.tmpl | 10 +++++-- dot_config/alacritty/alacritty.yml | 19 ++++++------ dot_config/i3/config.tmpl | 4 +-- dot_doom.d/config.el | 9 ++---- ...executable_install.chezmoi.dependencies.sh | 29 +++++++++---------- dot_xinitrc | 3 ++ 6 files changed, 39 insertions(+), 35 deletions(-) diff --git a/dot_Xresources.tmpl b/dot_Xresources.tmpl index 3cf81d1..9bca9c3 100644 --- a/dot_Xresources.tmpl +++ b/dot_Xresources.tmpl @@ -26,9 +26,15 @@ URxvt*saveLines: 65500 URxvt*loginShell: false !URxvt*termName: screen-256color +! Warning! For some font sizes, nerd fonts don't render particular glyphs correctly (✘, for example) {{- if (or (eq .chezmoi.hostname "nielanjo") (eq .chezmoi.hostname "jnielandt") (eq .chezmoi.hostname "zaptorjezus")) }} -URxvt.font: xft:Hasklug Nerd Font Mono:size=10:antialias=true -URxvt.boldfont: xft:Hasklug Nerd Font Mono:bold:size=10 +URxvt.font: xft:Hasklug Nerd Font Mono:size=11:antialias=true +URxvt.boldfont: xft:Hasklug Nerd Font Mono:bold:size=11:antialias=true +!URxvt.font: xft:OverpassMono Nerd Font:size=10:antialias=true +!URxvt.font: xft:OverpassMono Nerd Font:size=10:antialias=true +!URxvt.font: xft:Fura Code Nerd Font Mono:size=10:antialias=true +!URxvt.font: xft:Hasklug Nerd Font Mono:size=10:antialias=true +!URxvt.boldfont: xft:Hasklug Nerd Font Mono:bold:size=10 {{- else }} URxvt.font: xft:Hasklug Nerd Font Mono:size=8:antialias=true URxvt.boldfont: xft:Hasklug Nerd Font Mono:bold:size=8 diff --git a/dot_config/alacritty/alacritty.yml b/dot_config/alacritty/alacritty.yml index 697194e..4004008 100644 --- a/dot_config/alacritty/alacritty.yml +++ b/dot_config/alacritty/alacritty.yml @@ -45,9 +45,9 @@ window: # # Blank space added around the window in pixels. This padding is scaled # by DPI and the specified value is always added at both opposing sides. - #padding: - # x: 0 - # y: 0 + padding: + x: 10 + y: 10 # Spread additional padding evenly around the terminal content. #dynamic_padding: false @@ -61,13 +61,13 @@ window: # Values for `decorations` (macOS only): # - transparent: Title bar, transparent background and title bar buttons # - buttonless: Title bar, transparent background and no title bar buttons - decorations: "None" + decorations: "Full" # Background opacity # # Window opacity as a floating point number from `0.0` to `1.0`. # The value `0.0` is completely transparent and `1.0` is opaque. - opacity: 1.0 + opacity: 0.9 # Startup Mode (changes require restart) # @@ -118,7 +118,8 @@ font: # - (Linux/BSD) monospace # - (Windows) Consolas #family: monospace - family: FiraCode Nerd Font Mono + #family: FiraCode Nerd Font Mono + family: Hasklug Nerd Font Mono # The `style` can be specified to pick a specific face. style: Regular @@ -130,7 +131,7 @@ font: # If the bold family is not specified, it will fall back to the # value specified for the normal font. #family: monospace - family: FiraCode Nerd Font Mono + family: Hasklug Nerd Font Mono # The `style` can be specified to pick a specific face. style: Bold @@ -142,7 +143,7 @@ font: # If the italic family is not specified, it will fall back to the # value specified for the normal font. #family: monospace - family: FiraCode Nerd Font Mono + family: Hasklug Nerd Font Mono # The `style` can be specified to pick a specific face. style: Italic @@ -154,7 +155,7 @@ font: # If the bold italic family is not specified, it will fall back to the # value specified for the normal font. #family: monospace - family: FiraCode Nerd Font Mono + family: Hasklug Nerd Font Mono # The `style` can be specified to pick a specific face. style: Bold Italic diff --git a/dot_config/i3/config.tmpl b/dot_config/i3/config.tmpl index a95ec2a..bbbc6f9 100644 --- a/dot_config/i3/config.tmpl +++ b/dot_config/i3/config.tmpl @@ -80,8 +80,8 @@ font xft:Hasklug Nerd Font 8 floating_modifier $mod # start a terminal -bindsym $mod+Return exec urxvt -bindsym $mod+Shift+Return exec kitty +bindsym $mod+Shift+Return exec urxvt +bindsym $mod+Return exec alacritty # TODO make this help window a bit fancier bindsym $mod+F1 exec urxvt -e chezmoi edit ~/.dotfiles/README.md diff --git a/dot_doom.d/config.el b/dot_doom.d/config.el index 13cc2ee..f1b84e6 100644 --- a/dot_doom.d/config.el +++ b/dot_doom.d/config.el @@ -101,19 +101,16 @@ (setq org-roam-capture-templates `(("n" "default note" plain (file "~/org-roam/templates/default.org") :if-new - (file+head "%<%Y%m%d%H%M%S>-${slug}.org" - "#+title: ${title}\n#+filetags:\n\n") + (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "") :unnarrowed t) ("p" "person" plain (file "~/org-roam/templates/person.org") :if-new - (file+head "%<%Y%m%d%H%M%S>-${slug}.org" - "#+title: ${title}\n#+created: %U\n#+filetags: person\n\n") + (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "") :immediate-finish t :unnarrowed t) ("m" "meeting" plain (file "~/org-roam/templates/meeting.org") :if-new - (file+head "%<%Y%m%d%H%M%S>-${slug}.org" - "#+title: ${title}\n#+created: %U\n#+filetags: meeting\n\n") + (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "") :unnarrowed t) )) diff --git a/dot_dotfiles/scripts/executable_install.chezmoi.dependencies.sh b/dot_dotfiles/scripts/executable_install.chezmoi.dependencies.sh index 1b168e7..76ca48c 100644 --- a/dot_dotfiles/scripts/executable_install.chezmoi.dependencies.sh +++ b/dot_dotfiles/scripts/executable_install.chezmoi.dependencies.sh @@ -3,21 +3,22 @@ # especially useful when setting up a new system # list is incomplete at the moment sudo pacman -Sy \ - pacman-contrib \ - qutebrowser \ - reflector \ - xsel \ - xclip \ - eid-mw \ - redshift \ + alacritty \ brightnessctl \ - inetutils \ - # steam font dependency - ttf-liberation \ - picom \ + dunst \ + eid-mw \ htop \ + inetutils \ + pacman-contrib \ + picom \ + qutebrowser \ + redshift \ + reflector \ scrot \ - dunst + ttf-liberation \ + xclip \ + xsel \ + tree \ # these are doom (emacs) dependencies sudo pacman -Sy \ @@ -25,10 +26,6 @@ sudo pacman -Sy \ fd \ pandoc -# install nice tools -sudo pacman -Sy \ - tree - yay -Sy \ # siji font for glyphs (polybar) siji-git diff --git a/dot_xinitrc b/dot_xinitrc index 2d0fd5a..a316202 100644 --- a/dot_xinitrc +++ b/dot_xinitrc @@ -31,6 +31,9 @@ fi # make sure we get the hwmon variable right for CPU temperatures export CPU_TEMP_PATH=$(ls /sys/devices/platform/coretemp*/hwmon/hwmon*/temp*_input | grep -m 1 '') +# this disable auto scaling on X11, alacritty was displaying large font on laptop screen, tiny font on hdmi +export WINIT_X11_SCALE_FACTOR=1 + # start the ssh agent, we're lazy, don't want to type passwords all day eval $(ssh-agent)