diff --git a/files/.config/alacritty/alacritty.yml b/files/.config/alacritty/alacritty.yml index 4afa1db..c2af47f 100644 --- a/files/.config/alacritty/alacritty.yml +++ b/files/.config/alacritty/alacritty.yml @@ -34,7 +34,7 @@ window: font: normal: - family: FiraCode Nerd Font Mono + family: SFMono Nerd Font Mono style: Regular background_opacity: 1 diff --git a/files/init.el b/files/init.el index e89e258..0f06448 100644 --- a/files/init.el +++ b/files/init.el @@ -25,7 +25,8 @@ (setq show-paren-style 'paranthesis) ;; Font -(set-face-attribute 'default nil :font "FiraCode Nerd Font Mono" :height 100) +(set-face-attribute 'default nil :font "SFMono Nerd Font Mono" :height 100) +(add-to-list 'default-frame-alist '(font . "SFMono Nerd Font Mono")) ;; Make ESC quit prompts (global-set-key (kbd "") 'keyboard-escape-quit) @@ -45,8 +46,10 @@ (add-hook 'evil-insert-state-entry-hook #'noct:absolute) (add-hook 'evil-insert-state-exit-hook #'noct:relative) -;; Show trailing whitespaces -(setq-default show-trailing-whitespace t) +;; whitespaces +(whitespace-mode) +(setq whitespace-style '(face trailing tabs tab-mark)) + (require 'package) (setq package-enable-at-startup nil) @@ -81,7 +84,8 @@ :config (setq doom-gruvbox-light-variant "soft") (load-theme 'doom-gruvbox-light t) - (doom-themes-org-config)) + (doom-themes-org-config) + (doom-themes-treemacs-config)) (use-package doom-modeline :ensure t diff --git a/fonts/copyfonts.sh b/fonts/copyfonts.sh deleted file mode 100755 index 3b41e14..0000000 --- a/fonts/copyfonts.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# Make sure the paths are correct -path=$(pwd) -fontpattern="*.*tf" - -cp $path/$fontpattern $HOME/.local/share/fonts/. - -echo "Fonts copied, reloading cache..." - -fc-cache -v -echo "Done!" diff --git a/fonts/materialdesignicons-webfont.ttf b/fonts/icons/materialdesignicons-webfont.ttf similarity index 100% rename from fonts/materialdesignicons-webfont.ttf rename to fonts/icons/materialdesignicons-webfont.ttf diff --git a/fonts/NotoSansCJKjp-Regular.otf b/fonts/japanese/NotoSansCJKjp-Regular.otf similarity index 100% rename from fonts/NotoSansCJKjp-Regular.otf rename to fonts/japanese/NotoSansCJKjp-Regular.otf diff --git a/fonts/Stick-Regular.ttf b/fonts/japanese/Stick-Regular.ttf similarity index 100% rename from fonts/Stick-Regular.ttf rename to fonts/japanese/Stick-Regular.ttf diff --git a/fonts/Fira Code Regular Nerd Font Complete Mono.ttf b/fonts/mono/Fira Code Regular Nerd Font Complete Mono.ttf similarity index 100% rename from fonts/Fira Code Regular Nerd Font Complete Mono.ttf rename to fonts/mono/Fira Code Regular Nerd Font Complete Mono.ttf diff --git a/fonts/mono/SFMono/SFMono Bold Italic Nerd Font Complete Mono.otf b/fonts/mono/SFMono/SFMono Bold Italic Nerd Font Complete Mono.otf new file mode 100644 index 0000000..486075f Binary files /dev/null and b/fonts/mono/SFMono/SFMono Bold Italic Nerd Font Complete Mono.otf differ diff --git a/fonts/mono/SFMono/SFMono Bold Nerd Font Complete Mono.otf b/fonts/mono/SFMono/SFMono Bold Nerd Font Complete Mono.otf new file mode 100644 index 0000000..222528d Binary files /dev/null and b/fonts/mono/SFMono/SFMono Bold Nerd Font Complete Mono.otf differ diff --git a/fonts/mono/SFMono/SFMono Heavy Italic Nerd Font Complete Mono.otf b/fonts/mono/SFMono/SFMono Heavy Italic Nerd Font Complete Mono.otf new file mode 100644 index 0000000..639ef0b Binary files /dev/null and b/fonts/mono/SFMono/SFMono Heavy Italic Nerd Font Complete Mono.otf differ diff --git a/fonts/mono/SFMono/SFMono Heavy Nerd Font Complete Mono.otf b/fonts/mono/SFMono/SFMono Heavy Nerd Font Complete Mono.otf new file mode 100644 index 0000000..1baa017 Binary files /dev/null and b/fonts/mono/SFMono/SFMono Heavy Nerd Font Complete Mono.otf differ diff --git a/fonts/mono/SFMono/SFMono Light Italic Nerd Font Complete Mono.otf b/fonts/mono/SFMono/SFMono Light Italic Nerd Font Complete Mono.otf new file mode 100644 index 0000000..8eb5c7c Binary files /dev/null and b/fonts/mono/SFMono/SFMono Light Italic Nerd Font Complete Mono.otf differ diff --git a/fonts/mono/SFMono/SFMono Light Nerd Font Complete Mono.otf b/fonts/mono/SFMono/SFMono Light Nerd Font Complete Mono.otf new file mode 100644 index 0000000..bfede33 Binary files /dev/null and b/fonts/mono/SFMono/SFMono Light Nerd Font Complete Mono.otf differ diff --git a/fonts/mono/SFMono/SFMono Medium Italic Nerd Font Complete Mono.otf b/fonts/mono/SFMono/SFMono Medium Italic Nerd Font Complete Mono.otf new file mode 100644 index 0000000..1cd1c5d Binary files /dev/null and b/fonts/mono/SFMono/SFMono Medium Italic Nerd Font Complete Mono.otf differ diff --git a/fonts/mono/SFMono/SFMono Medium Nerd Font Complete Mono.otf b/fonts/mono/SFMono/SFMono Medium Nerd Font Complete Mono.otf new file mode 100644 index 0000000..7532ace Binary files /dev/null and b/fonts/mono/SFMono/SFMono Medium Nerd Font Complete Mono.otf differ diff --git a/fonts/mono/SFMono/SFMono Regular Italic Nerd Font Complete Mono.otf b/fonts/mono/SFMono/SFMono Regular Italic Nerd Font Complete Mono.otf new file mode 100644 index 0000000..c3c720a Binary files /dev/null and b/fonts/mono/SFMono/SFMono Regular Italic Nerd Font Complete Mono.otf differ diff --git a/fonts/mono/SFMono/SFMono Regular Nerd Font Complete Mono.otf b/fonts/mono/SFMono/SFMono Regular Nerd Font Complete Mono.otf new file mode 100644 index 0000000..d1a2130 Binary files /dev/null and b/fonts/mono/SFMono/SFMono Regular Nerd Font Complete Mono.otf differ diff --git a/fonts/mono/SFMono/SFMono Semibold Italic Nerd Font Complete Mono.otf b/fonts/mono/SFMono/SFMono Semibold Italic Nerd Font Complete Mono.otf new file mode 100644 index 0000000..9a3d1fb Binary files /dev/null and b/fonts/mono/SFMono/SFMono Semibold Italic Nerd Font Complete Mono.otf differ diff --git a/fonts/mono/SFMono/SFMono Semibold Nerd Font Complete Mono.otf b/fonts/mono/SFMono/SFMono Semibold Nerd Font Complete Mono.otf new file mode 100644 index 0000000..119367e Binary files /dev/null and b/fonts/mono/SFMono/SFMono Semibold Nerd Font Complete Mono.otf differ diff --git a/fonts/Product Sans Bold.ttf b/fonts/non-mono/Product Sans Bold.ttf similarity index 100% rename from fonts/Product Sans Bold.ttf rename to fonts/non-mono/Product Sans Bold.ttf diff --git a/fonts/Product Sans Regular.ttf b/fonts/non-mono/Product Sans Regular.ttf similarity index 100% rename from fonts/Product Sans Regular.ttf rename to fonts/non-mono/Product Sans Regular.ttf