diff --git a/home/.config/doom/config.el b/home/.config/doom/config.el index 9d8015b..7ab1276 100644 --- a/home/.config/doom/config.el +++ b/home/.config/doom/config.el @@ -10,8 +10,25 @@ ;; Font settings (setq doom-font (font-spec :family "Iosevka" :size 16) + doom-serif-font (font-spec :family "Iosevka Slab" :size 16) doom-variable-pitch-font (font-spec :family "Iosevka Aile" :size 16) doom-big-font (font-spec :family "Iosevka" :size 24)) +(after! unicode-fonts + (setq doom-unicode-font doom-font) + (dolist (unicode-block '("CJK Compatibility" + "CJK Compatibility Forms" + "CJK Compatibility Ideographs" + "CJK Compatibility Ideographs Supplement" + "CJK Radicals Supplement" + "CJK Strokes" + "CJK Symbols and Punctuation" + "CJK Unified Ideographs" + "CJK Unified Ideographs Extension A" + "CJK Unified Ideographs Extension B" + "CJK Unified Ideographs Extension C" + "CJK Unified Ideographs Extension D" + "CJK Unified Ideographs Extension E")) + (push "Sarasa Mono J" (cadr (assoc unicode-block unicode-fonts-block-font-mapping))))) ;;(setq inhibit-compacting-font-caches t) (custom-set-faces! '(font-lock-comment-face :slant italic) @@ -138,7 +155,7 @@ org-ellipsis "▾" org-hide-emphasis-markers t) (defun follie/comfy-org-editing () - (setq visual-fill-column-width 120 + (setq visual-fill-column-width 100 visual-fill-column-center-text t) (visual-fill-column-mode 1) (display-line-numbers-mode -1)) diff --git a/home/.config/doom/exwm.el b/home/.config/doom/exwm.el index 2dbd3f2..fd8f4db 100644 --- a/home/.config/doom/exwm.el +++ b/home/.config/doom/exwm.el @@ -31,7 +31,6 @@ (follie/run-in-background "greenclip daemon") (defun follie/configure-window-by-class () - (interactive) (pcase exwm-class-name ("Komikku" (exwm-floating-toggle-floating) (exwm-layout-hide-mode-line)))) @@ -45,9 +44,8 @@ (string-trim (shell-command-to-string "xrandr | grep \" connected\" | awk '{print $1}' | sed '$!N;s/\\n/ /'")))) (defun follie/exwm-rename-buffer () - (interactive) (exwm-workspace-rename-buffer - (concat exwm-class-name ":" + (concat "[" exwm-class-name "] " (if (<= (length exwm-title) 30) exwm-title (concat (substring exwm-title 0 29)))))) diff --git a/home/.config/doom/init.el b/home/.config/doom/init.el index f2b4f6e..77de955 100644 --- a/home/.config/doom/init.el +++ b/home/.config/doom/init.el @@ -36,7 +36,7 @@ doom-quit ; DOOM quit-message prompts when you quit Emacs (emoji ; :) +unicode - ;;+ascii + +ascii +github) ;;fill-column ; a `fill-column' indicator hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW diff --git a/home/.config/dunst/dunstrc b/home/.config/dunst/dunstrc index e30c859..1791dff 100644 --- a/home/.config/dunst/dunstrc +++ b/home/.config/dunst/dunstrc @@ -108,7 +108,7 @@ ### Text ### - font = Sarasa Fixed J 12 + font = Sarasa Mono J 12 # The spacing between lines. If the height is smaller than the # font height, it will get raised to the font height. diff --git a/home/.config/foot/foot.ini b/home/.config/foot/foot.ini index d225cf1..d2849f6 100644 --- a/home/.config/foot/foot.ini +++ b/home/.config/foot/foot.ini @@ -1,9 +1,9 @@ # -*- conf -*- -font=Iosevka Nerd Font:style=Regular:size=12, Sarasa Fixed J:style=Regular:size=12 -font-bold=Iosevka Nerd Font:style=Bold:size=12, Sarasa Fixed J:style=Bold:size=12 -font-italic=Iosevka Nerd Font:style=Italic:size=12, Sarasa Fixed J:style=Italic:size=12 -font-bold-italic=Iosevka Nerd Font:style=Bold Italic:size=12, Sarasa Fixed J:style=Bold Italic:size=12 +font=Iosevka Nerd Font:style=Regular:size=12, Sarasa Mono J:style=Regular:size=12 +font-bold=Iosevka Nerd Font:style=Bold:size=12, Sarasa Mono J:style=Bold:size=12 +font-italic=Iosevka Nerd Font:style=Italic:size=12, Sarasa Mono J:style=Italic:size=12 +font-bold-italic=Iosevka Nerd Font:style=Bold Italic:size=12, Sarasa Mono J:style=Bold Italic:size=12 dpi-aware=no initial-window-size-pixels=800x600 # Or, # initial-window-size-chars= diff --git a/home/.config/hikari/hikari.conf b/home/.config/hikari/hikari.conf index f952157..07f5f29 100644 --- a/home/.config/hikari/hikari.conf +++ b/home/.config/hikari/hikari.conf @@ -2,7 +2,7 @@ ui { border = 2 gap = 5 step = 50 - font = "Sarasa Fixed J 12" + font = "Sarasa Mono J 12" colorscheme { background = 0x2E3440 diff --git a/home/.config/imv/config b/home/.config/imv/config index c3fb927..4b5a01e 100644 --- a/home/.config/imv/config +++ b/home/.config/imv/config @@ -19,7 +19,7 @@ overlay_background_alpha = c3 initial_pan = 0 0 scaling_mode = full overlay = true -overlay_font = Sarasa Fixed J:20 +overlay_font = Sarasa Mono J:20 overlay_text = [$imv_current_index/$imv_file_count] $imv_current_file [${imv_width}x${imv_height}] [$imv_scaling_mode - $imv_scale%] [aliases] diff --git a/home/.config/luakit/theme.lua b/home/.config/luakit/theme.lua index 46fa0c9..de702ba 100644 --- a/home/.config/luakit/theme.lua +++ b/home/.config/luakit/theme.lua @@ -120,8 +120,8 @@ theme.gopher_light = { bg = base06, fg = base00, link = base0D } theme.gopher_dark = { bg = base00, fg = base06, link = base0A } -- Font -theme.font = "13pt Sarasa Fixed J" -theme.hint_font = "12pt Sarasa Fixed J" +theme.font = "13pt Sarasa Mono J" +theme.hint_font = "12pt Sarasa Mono J" return theme @@ -247,8 +247,8 @@ return theme -- theme.gopher_dark = { bg = base00, fg = base06, link = base0A } -- -- Font --- theme.font = "13pt Sarasa Fixed J" --- theme.hint_font = "12pt Sarasa Fixed J" +-- theme.font = "13pt Sarasa Mono J" +-- theme.hint_font = "12pt Sarasa Mono J" -- return theme diff --git a/home/.config/mako/config b/home/.config/mako/config index dc892a6..aee3b74 100644 --- a/home/.config/mako/config +++ b/home/.config/mako/config @@ -1,4 +1,4 @@ -font=Sarasa Fixed J 12 +font=Sarasa Mono J 12 border-size=4 border-radius=10 margin=10,10,10 diff --git a/home/.config/nwg-launchers/nwgbar/style.css b/home/.config/nwg-launchers/nwgbar/style.css index 624ef57..8d88fba 100644 --- a/home/.config/nwg-launchers/nwgbar/style.css +++ b/home/.config/nwg-launchers/nwgbar/style.css @@ -1,6 +1,6 @@ #bar { margin: 30px; /* affects top/bottom & left/right alignment */ - font-family: Sarasa Fixed J; + font-family: Sarasa Mono J; font-size: 16pt } diff --git a/home/.config/nwg-launchers/nwggrid/style.css b/home/.config/nwg-launchers/nwggrid/style.css index 305a125..45a7d32 100644 --- a/home/.config/nwg-launchers/nwggrid/style.css +++ b/home/.config/nwg-launchers/nwggrid/style.css @@ -8,7 +8,7 @@ button, label, image { button { padding: 5px; margin: 5px; - font-family: Sarasa Fixed J; + font-family: Sarasa Mono J; font-size: 13pt } @@ -27,7 +27,7 @@ button:focus { margin-top: 20px; margin-bottom: 20px; min-width: 400px; - font-family: Sarasa Fixed J; + font-family: Sarasa Mono J; font-size: 13pt } @@ -41,6 +41,6 @@ button:focus { #description { margin-bottom: 20px; - font-family: Sarasa Fixed J; + font-family: Sarasa Mono J; font-size: 13pt } diff --git a/home/.config/polybar/nord/config.ini b/home/.config/polybar/nord/config.ini index 5dfae46..2dfe5df 100644 --- a/home/.config/polybar/nord/config.ini +++ b/home/.config/polybar/nord/config.ini @@ -8,7 +8,7 @@ [bar/mainbar] background = #2e3440 font-0 = "Iosevka Nerd Font:style=Regular:size=12:antialias=true;3" -font-1 = "Sarasa Fixed J:style=Regular:size=12:antialias=true;3" +font-1 = "Sarasa Mono J:style=Regular:size=12:antialias=true;3" height = 30 modules-left = date weather vpn keyboard modules-center = bsp diff --git a/home/.config/polybar/onedark/config.ini b/home/.config/polybar/onedark/config.ini index ec407fe..c0d592c 100644 --- a/home/.config/polybar/onedark/config.ini +++ b/home/.config/polybar/onedark/config.ini @@ -8,7 +8,7 @@ [bar/mainbar] background = #282c34 font-0 = "Iosevka Nerd Font:style=Regular:size=12:antialias=true;2" -font-1 = "Sarasa Fixed J:style=Regular:size=12:antialias=true;2" +font-1 = "Sarasa Mono J:style=Regular:size=12:antialias=true;2" height = 30 modules-left = date weather keyboard modules-center = bsp diff --git a/home/.config/qutebrowser/config.py b/home/.config/qutebrowser/config.py index 73fbb88..223f592 100644 --- a/home/.config/qutebrowser/config.py +++ b/home/.config/qutebrowser/config.py @@ -108,15 +108,15 @@ c.downloads.location.directory = '$HOME/Downloads' c.downloads.location.remember = False # Fonts -c.fonts.completion.category = '13pt Sarasa Fixed J' -c.fonts.completion.entry = '13pt Sarasa Fixed J' -c.fonts.contextmenu = '13pt Sarasa Fixed J' -c.fonts.default_family = ['Sarasa Fixed J', 'Iosevka Nerd Font'] +c.fonts.completion.category = '13pt Sarasa Mono J' +c.fonts.completion.entry = '13pt Sarasa Mono J' +c.fonts.contextmenu = '13pt Sarasa Mono J' +c.fonts.default_family = ['Sarasa Mono J', 'Iosevka'] c.fonts.default_size = '11pt' # c.fonts.prompts = 'default_size sans-serif' -c.fonts.statusbar = '11pt Sarasa Fixed J' -c.fonts.tabs.selected = 'bold 11pt Sarasa Fixed J' -c.fonts.tabs.unselected = 'italic 11pt Sarasa Fixed J' +c.fonts.statusbar = '11pt Sarasa Mono J' +c.fonts.tabs.selected = 'bold 11pt Sarasa Mono J' +c.fonts.tabs.unselected = 'italic 11pt Sarasa Mono J' # Hints c.hints.uppercase = True diff --git a/home/.config/spectrwm/spectrwm-nord.conf b/home/.config/spectrwm/spectrwm-nord.conf index 0566192..16297b8 100644 --- a/home/.config/spectrwm/spectrwm-nord.conf +++ b/home/.config/spectrwm/spectrwm-nord.conf @@ -57,7 +57,7 @@ bar_color[1] = rgb:2e/34/40, rgb:bf/61/6a, rgb:a3/be/8c, rgb:d0/87 bar_color_selected[1] = rgb:81/a1/c1 bar_font_color[1] = rgb:2e/34/40, rgb:bf/61/6a, rgb:eb/cb/8b, rgb:81/a1/c1, rgb:d8/de/e9 bar_font_color_selected = rgb:2e/34/40 -bar_font = Iosevka Nerd Font:style=Regular:size=12:antialias=true, Sarasa Fixed J:style=Regular:size=12:antialias=true +bar_font = Iosevka Nerd Font:style=Regular:size=12:antialias=true, Sarasa Mono J:style=Regular:size=12:antialias=true bar_action = ~/.config/spectrwm/baraction.sh bar_action_expand = 1 bar_justify = left diff --git a/home/.config/spectrwm/spectrwm-onedark.conf b/home/.config/spectrwm/spectrwm-onedark.conf index 2c1f349..d41a980 100644 --- a/home/.config/spectrwm/spectrwm-onedark.conf +++ b/home/.config/spectrwm/spectrwm-onedark.conf @@ -57,7 +57,7 @@ bar_color[1] = rgb:28/2c/34, rgb:be/50/46, rgb:98/c3/79, rgb:d1/9a bar_color_selected[1] = rgb:61/af/ef bar_font_color[1] = rgb:28/2c/34, rgb:be/50/46, rgb:d1/9a/66, rgb:61/af/ef, rgb:ab/b2/bf bar_font_color_selected = rgb:28/2c/34 -bar_font = Iosevka Nerd Font:style=Regular:size=12:antialias=true, Sarasa Fixed J:style=Regular:size=12:antialias=true +bar_font = Iosevka Nerd Font:style=Regular:size=12:antialias=true, Sarasa Mono J:style=Regular:size=12:antialias=true bar_action = ~/.config/spectrwm/baraction.sh bar_action_expand = 1 bar_justify = left diff --git a/home/.config/sway/config b/home/.config/sway/config index cd95d81..5e69306 100644 --- a/home/.config/sway/config +++ b/home/.config/sway/config @@ -108,7 +108,7 @@ gaps inner 5 # smart_gaps on # title bar -font Sarasa Fixed J 12 +font Sarasa Mono J 12 titlebar_border_thickness 0 titlebar_padding 11 1 @@ -126,9 +126,9 @@ seat seat0 xcursor_theme Breeze_Snow 24 exec_always { gsettings set org.gnome.desktop.interface gtk-theme 'Arc-Dark' gsettings set org.gnome.desktop.interface icon-theme 'Papirus-Dark' - # gsettings set org.gnome.desktop.interface document-font-name 'Fira Sans 10' - # gsettings set org.gnome.desktop.interface font-name 'DejaVu Sans 10' - # gsettings set org.gnome.desktop.interface monospace-font-name 'Sarasa Fixed J 10' + # gsettings set org.gnome.desktop.interface document-font-name 'Iosevka Aile 10' + # gsettings set org.gnome.desktop.interface font-name 'Iosevka Slab 10' + # gsettings set org.gnome.desktop.interface monospace-font-name 'Sarasa Mono J 10' gsettings set org.gnome.desktop.interface cursor-theme 'Breeze_Snow' gsettings set org.gnome.desktop.interface cursor-size '24' } diff --git a/home/.config/swaylock/config b/home/.config/swaylock/config index d547494..cbd12e2 100644 --- a/home/.config/swaylock/config +++ b/home/.config/swaylock/config @@ -2,5 +2,5 @@ daemonize ignore-empty-password color=000000 image=~/Pictures/Wallpapers/Elan3.png -font=Sarasa Fixed J +font=Sarasa Mono J font-size=14 diff --git a/home/.config/waybar/style-generic.css b/home/.config/waybar/style-generic.css index e711bb5..61018d3 100644 --- a/home/.config/waybar/style-generic.css +++ b/home/.config/waybar/style-generic.css @@ -76,7 +76,7 @@ #waybar { background: @background; color: @light; - font-family: Iosevka Nerd Font, Sarasa Fixed J; + font-family: Iosevka Nerd Font, Sarasa Mono J; font-size: 12pt; font-weight: bold; } diff --git a/home/.config/waybar/style.css b/home/.config/waybar/style.css index 73b50e9..bf3699b 100644 --- a/home/.config/waybar/style.css +++ b/home/.config/waybar/style.css @@ -88,7 +88,7 @@ #waybar { background: @background; color: @light; - font-family: Iosevka Nerd Font, Sarasa Fixed J; + font-family: Iosevka Nerd Font, Sarasa Mono J; font-size: 12pt; font-weight: bold; } diff --git a/home/.config/wofi/style.css b/home/.config/wofi/style.css index 634eccc..b352b49 100644 --- a/home/.config/wofi/style.css +++ b/home/.config/wofi/style.css @@ -1,5 +1,5 @@ #window { - font-family: Sarasa Fixed J; + font-family: Sarasa Mono J; font-size: 14pt; background-color: @background; border: 2px solid @blue; diff --git a/home/.config/zathura/zathurarc b/home/.config/zathura/zathurarc index 14e4b22..a7566ba 100644 --- a/home/.config/zathura/zathurarc +++ b/home/.config/zathura/zathurarc @@ -1,4 +1,4 @@ -set font "Sarasa Fixed J 12" +set font "Sarasa Mono J 12" # set recolor-reverse-video "true" # set recolor "true" diff --git a/setup/cbonsai.sh b/setup/cbonsai.sh new file mode 100755 index 0000000..519f92d --- /dev/null +++ b/setup/cbonsai.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +# You need ncurses-devel + +git clone https://gitlab.com/jallbrit/cbonsai +cd cbonsai || exit + +make PREFIX=$HOME/.local install + +cd ..