diff --git a/init.el b/init.el index af82ad5..8f2e13a 100644 --- a/init.el +++ b/init.el @@ -45,17 +45,6 @@ (when (fboundp 'menu-bar-mode) (menu-bar-mode -1)) (blink-cursor-mode 0) -;; install icons -(use-package all-the-icons - :if (display-graphic-p) - :config (let* ((old all-the-icons-mode-icon-alist) - (elem '(uxntal-mode all-the-icons-alltheicon "perl" :face all-the-icons-blue)) - (new (cons elem old))) - (setq all-the-icons-mode-icon-alist new))) - -;; show function names in modeline -(which-function-mode t) - ;; use utf-8 (prefer-coding-system 'utf-8) @@ -66,7 +55,7 @@ mac-command-modifier 'meta mac-option-modifier nil x-select-request-type '(UTF8_STRING COMPOUND_TEXT TEXT STRING)) - (set-frame-font "PragmataPro Liga 28" nil t) + (set-frame-font "PragmataPro Liga 24" nil t) (set-foreground-color "#c7c7c7") (set-background-color "#000000")) @@ -77,6 +66,31 @@ :repo "lumiknit/emacs-pragmatapro-ligatures") :config (add-hook 'prog-mode-hook 'pragmatapro-lig-mode)) +;; use doom themes +(use-package doom-themes + :straight (doom-themes :type git + :host github + :repo "doomemacs/themes") + :config (load-theme 'doom-badger t) + (setq doom-badger-brighter-comments t + doom-themes-treemacs-theme "doom-colors") +; (set-face-foreground-color 'font-lock-constant-face #635770) + (set-face-foreground 'font-lock-constant-face "#834980") + (doom-themes-neotree-config) + (doom-themes-treemacs-config) + (doom-themes-org-config)) + +;; try using a fancier mode line +(use-package doom-modeline + :ensure t + :init (doom-modeline-mode 1) + :config + (setq doom-modeline-height 1 + doom-modeline-buffer-file-name-style 'truncate-with-project + ;doom-modeline-buffer-file-name-style 'relative-to-project + doom-modeline-buffer-encoding nil) + (display-battery-mode 1)) + ;; line numbers ;(global-display-line-numbers-mode t) (add-hook 'prog-mode-hook 'display-line-numbers-mode) @@ -89,6 +103,18 @@ (bind-key "C-x p" 'pop-to-mark-command) (setq set-mark-command-repeat-pop t) +;; install icons +(use-package all-the-icons + :if (display-graphic-p) + :config (let ((icon '(all-the-icons-faicon "recycle" :face all-the-icons-dcyan))) + (setq all-the-icons-mode-icon-alist + (cons (cons 'uxntal-mode icon) all-the-icons-mode-icon-alist)) + (setq all-the-icons-extension-icon-alist + (cons (cons "tal" icon) all-the-icons-extension-icon-alist)))) + +;; show function names in modeline +(which-function-mode t) + ;; work with multiple files not in same directory (require 'find-dired) (setq find-ls-option '("-print0 | xargs -0 ls -ld" . "-ld")) @@ -270,31 +296,6 @@ :repo "davidmiller/thrift-mode") :config (add-to-list 'auto-mode-alist '("\\.thrift\\'" . thrift-mode))) -;; use doom themes -(use-package doom-themes - :straight (doom-themes :type git - :host github - :repo "doomemacs/themes") - :config (load-theme 'doom-badger t) - (setq doom-badger-brighter-comments t - doom-themes-treemacs-theme "doom-colors") -; (set-face-foreground-color 'font-lock-constant-face #635770) - (set-face-foreground 'font-lock-constant-face "#834980") - (doom-themes-neotree-config) - (doom-themes-treemacs-config) - (doom-themes-org-config)) - -;; try using a fancier mode line -(use-package doom-modeline - :ensure t - :init (doom-modeline-mode 1) - :config - (setq doom-modeline-height 1 - doom-modeline-buffer-file-name-style 'truncate-with-project - ;doom-modeline-buffer-file-name-style 'relative-to-project - doom-modeline-buffer-encoding nil) - (display-battery-mode 1)) - ;;; turn off branch in mode line for now ;(setq vc-handled-backends nil)