diff options
| -rw-r--r-- | bash/.bashrc | 2 | ||||
| -rw-r--r-- | doom/config.el | 52 | ||||
| -rw-r--r-- | doom/init.el | 2 | ||||
| -rw-r--r-- | ghostty/config | 4 | ||||
| -rw-r--r-- | sioyek/prefs_user.config | 1 | ||||
| -rw-r--r-- | zsh/.zshrc | 2 |
6 files changed, 54 insertions, 9 deletions
diff --git a/bash/.bashrc b/bash/.bashrc index 44ef126..c82d29c 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -6,7 +6,7 @@ PS1='[\u@\h \[\e[38;2;175;215;255m\]\w\[\e[0m\]]\$ ' # Aliases alias python=python3 alias ls='ls -larth' -alias em=emacs +alias e='emacsclient -nc -a ""' alias copy='xclip -selection clipboard' alias paste='xclip -o -selection clipboard' diff --git a/doom/config.el b/doom/config.el index 54d71ac..85e8772 100644 --- a/doom/config.el +++ b/doom/config.el @@ -37,6 +37,35 @@ (custom-set-faces! '(default :background "#131313" :foreground "#FCFCFC")) +(defvar my/syntax-comment "#6a6a6a") +(defvar my/syntax-string "#b5bd68") +(defvar my/syntax-keyword "#afd7ff") +(defvar my/syntax-type "#ffd787") +(defvar my/syntax-function "#d7afaf") + +(defun my/setup-syntax-highlighting (&rest _) + "Apply a 5-color scheme to font-lock faces." + (custom-set-faces! + `(font-lock-comment-face :foreground ,my/syntax-comment :slant italic) + `(font-lock-comment-delimiter-face :foreground ,my/syntax-comment :slant italic) + `(font-lock-doc-face :foreground ,my/syntax-comment :slant italic) + `(font-lock-string-face :foreground ,my/syntax-string) + `(font-lock-doc-markup-face :foreground ,my/syntax-string) + `(font-lock-keyword-face :foreground ,my/syntax-keyword :weight bold) + `(font-lock-builtin-face :foreground ,my/syntax-keyword) + `(font-lock-preprocessor-face :foreground ,my/syntax-keyword) + `(font-lock-negation-char-face :foreground ,my/syntax-keyword) + `(font-lock-type-face :foreground ,my/syntax-type) + `(font-lock-constant-face :foreground ,my/syntax-type) + `(font-lock-function-name-face :foreground ,my/syntax-function) + `(font-lock-variable-name-face :foreground "#FCFCFC") + `(font-lock-warning-face :foreground ,my/syntax-function :weight bold) + `(font-lock-regexp-grouping-backslash :foreground ,my/syntax-function) + `(font-lock-regexp-grouping-construct :foreground ,my/syntax-function))) + +(my/setup-syntax-highlighting) +(add-hook 'doom-load-theme-hook #'my/setup-syntax-highlighting 40) + ;; This determines the style of line numbers in effect. If set to `nil', line ;; numbers are disabled. For relative line numbers, set this to `relative'. (setq display-line-numbers-type 'relative) @@ -46,15 +75,15 @@ (setq org-directory "~/org/") ;; Keep terminal and editor typography aligned and ensure Nerd Font glyphs render. -(setq doom-font (font-spec :family "JetBrainsMono Nerd Font Mono" :size 15) - doom-variable-pitch-font (font-spec :family "JetBrainsMono Nerd Font" :size 15) - doom-symbol-font (font-spec :family "JetBrainsMono Nerd Font Mono" :size 15)) +(setq doom-font (font-spec :family "FiraCode Nerd Font Mono" :size 15) + doom-variable-pitch-font (font-spec :family "FiraCode Nerd Font" :size 15) + doom-symbol-font (font-spec :family "FiraCode Nerd Font Mono" :size 15)) (defun my/setup-icon-font-fallback (&optional frame) "Ensure Nerd Font glyphs are available in FRAME." (with-selected-frame (or frame (selected-frame)) (when (display-graphic-p) - (set-fontset-font t 'unicode "JetBrainsMono Nerd Font Mono" nil 'append)))) + (set-fontset-font t 'unicode "FiraCode Nerd Font Mono" nil 'append)))) (add-hook 'after-make-frame-functions #'my/setup-icon-font-fallback) (my/setup-icon-font-fallback) @@ -245,3 +274,18 @@ (lambda () (unless (frame-focus-state) (save-some-buffers t)))) + +(defun my/dashboard-widget-loaded-centered () + (when doom-init-time + (let* ((msg (doom-display-benchmark-h 'return)) + (width (with-current-buffer (doom-fallback-buffer) + (window-width (get-buffer-window (current-buffer))))) + (pad (max 0 (/ (- width (length msg)) 2)))) + (insert "\n" + (make-string pad ?\s) + (propertize msg 'face '+dashboard-loaded) + "\n")))) + +(setq +dashboard-functions + '(+dashboard-widget-banner + my/dashboard-widget-loaded-centered)) diff --git a/doom/init.el b/doom/init.el index b57d64e..b4d3e7f 100644 --- a/doom/init.el +++ b/doom/init.el @@ -78,7 +78,7 @@ ;;eshell ; the elisp shell that works everywhere ;;shell ; simple shell REPL for Emacs ;;term ; basic terminal emulator for Emacs - ;;vterm ; the best terminal emulation in Emacs + vterm ; the best terminal emulation in Emacs :checkers syntax ; tasing you for every semicolon you forget diff --git a/ghostty/config b/ghostty/config index 6494a64..b45cb39 100644 --- a/ghostty/config +++ b/ghostty/config @@ -1,12 +1,12 @@ background=#131313 -font-family = JetBrainsMono Nerd Font Mono +font-family = FiraCode Nerd Font Mono font-size = 15 background-blur-radius = 20 mouse-hide-while-typing = true window-decoration = true macos-option-as-alt = true -background-opacity = 0.95 +background-opacity = 1 background-blur-radius = 20 foreground = #FCFCFC diff --git a/sioyek/prefs_user.config b/sioyek/prefs_user.config index 410129c..1abae22 100644 --- a/sioyek/prefs_user.config +++ b/sioyek/prefs_user.config @@ -1,6 +1,7 @@ super_fast_search 1 prerender_page_count 4 prerender_next_page_presentation 1 +ui_font FiraCode Nerd Font font_size 16 status_bar_font_size 14 @@ -3,7 +3,7 @@ eval "$(/opt/homebrew/bin/brew shellenv)" PROMPT='[%n@%m %F{#afd7ff}%~%f]%# ' alias python=python3 alias ls='ls -larth' -alias em=emacs +alias e='emacsclient -nc -a ""' alias copy=pbcopy alias paste=pbpaste |