From 06c5de192df8b4ad34f82d8343026f2638334c71 Mon Sep 17 00:00:00 2001 From: Marc Marcos Date: Wed, 26 Aug 2026 08:31:56 +0800 Subject: [PATCH] restructure a bit and add font configuration --- emacs/init.el | 307 +++++++++++++++++++++++++++++--------------------- 1 file changed, 176 insertions(+), 131 deletions(-) diff --git a/emacs/init.el b/emacs/init.el index d032948..bf5d00b 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -1,21 +1,44 @@ -(setq inhibit-startup-message t) ; Disable startup message +;;; init.el --- Emacs Configuration -*- lexical-binding: t; -*- + +;; ------------------------------------------------------------------- +;; Basic UI and Defaults +;; ------------------------------------------------------------------- +(setq inhibit-startup-message t) (scroll-bar-mode -1) (tool-bar-mode -1) (tooltip-mode -1) (set-fringe-mode 10) - (menu-bar-mode -1) (setq visible-bell t) -; Maybe set some font like Fira Code +(column-number-mode 1) +(global-display-line-numbers-mode t) -(require 'package) ; Bring into scope all the package +;; Disable line numbers in specific modes +(dolist (mode '(org-mode-hook + term-mode-hook + eshell-mode-hook)) + (add-hook mode (lambda () (display-line-numbers-mode 0)))) + +;; Clipboard settings +(setq select-enable-clipboard t) +(setq select-enable-primary t) +(setq save-interprogram-paste-before-kill t) +(setq auth-sources '("~/.authinfo")) + +;; Global Escape binding +(global-set-key (kbd "") 'keyboard-escape-quit) + +;; ------------------------------------------------------------------- +;; Package Management +;; ------------------------------------------------------------------- +(require 'package) (setq package-archives '(("melpa" . "https://melpa.org/packages/") - ("org" . "https://orgmode.org/elpa/") - ("elpa" . "https://elpa.gnu.org/packages/"))) + ("org" . "https://orgmode.org/elpa/") + ("elpa" . "https://elpa.gnu.org/packages/"))) (package-initialize) @@ -28,117 +51,89 @@ (require 'use-package) (setq use-package-always-ensure t) -(use-package command-log-mode) - -(global-set-key (kbd "") 'keyboard-escape-quit) - -(use-package ivy -:diminish -:bind (("C-s" . swiper) - :map ivy-minibuffer-map - ("TAB" . ivy-alt-done) - ("C-l" . ivy-alt-done) - ("C-j" . ivy-next-line) - ("C-k" . ivy-previous-line) - :map ivy-switch-buffer-map - ("C-k" . ivy-previous-line) - ("C-l" . ivy-done) - :map ivy-reverse-i-search-map - ("C-k" . ivy-previous-line) - ("C-d" . ivy-reverse-i-search-kill)) -:config -(ivy-mode 1)) - -; define-key defines a keybinding but only for a certain keymap, for a certain mode. - ; (define-key emacs-lisp-mode-map (kbd "C-x M-t") 'counsel-load-theme) - -(use-package general - :config - ;(general-evil-setup t) - (general-create-definer rune/leader-keys - ;:keymaps '(normal insert visual emacs) - ;:prefix "SPC" - :prefix "C-SPC") - - (global-unset-key (kbd "C-SPC")) - - (rune/leader-keys - "t" '(:ignore t :which-key "toggles") - "tt" '(counsel-load-theme :which-key "choose theme") - "p" '(:ignore t :which-key "projectile") - "ps" '(counsel-projectile-rg :which-key "search project with rg") - "pf" '(counsel-projectile-find-file :which-key "find file in project") - "pp" '(counsel-projectile-switch-project :which-key "switch project") - "m" '(:ignore t :which-key "magit") - "mm" '(magit-status :which-key "magit status") - "." '(find-file :which-key "find file")) - -(general-define-key - "C-M-j" 'counsel-switch-buffer)) - -(use-package counsel - :bind (("M-x" . counsel-M-x) - ("C-x b" . counsel-ibuffer) - ("C-x C-f" . counsel-find-file) - :map minibuffer-local-map - ("C-r" . 'counsel-minibuffer-history)) - :config - (setq ivy-initial-inputs-alist nil)) - -(use-package doom-modeline - :ensure t - :init (doom-modeline-mode 1) - :custom (doom-modeline-height 15)) - -(column-number-mode) -(global-display-line-numbers-mode t) - -(dolist (mode '(org-mode-hook - term-mode-hook - eshell-mode-hook)) - (add-hook mode (lambda () (display-line-numbers-mode 0)))) - -(use-package rainbow-delimiters - :hook (prog-mode . rainbow-delimiters-mode)) - -(use-package which-key - :init (which-key-mode) ; init is done even if the package is not loaded - :diminish which-key-mode - :config (setq which-key-idle-delay 0.3)) ; config is done when the package is loaded - -(use-package ivy-rich - :init (ivy-rich-mode 1)) - -(use-package helpful - :ensure t - :custom - (counsel-describe-function-function #'helpful-callable) - (counsel-describe-variable-function #'helpful-variable) - :bind - ([remap describe-function] . counsel-describe-function) - ([remap describe-command] . helpful-command) - ([remap describe-variable] . counsel-describe-variable) - ([remap describe-key] . helpful-key)) - +;; ------------------------------------------------------------------- +;; Appearance & Theming +;; ------------------------------------------------------------------- (use-package doom-themes :init (load-theme 'doom-gruvbox t)) (use-package all-the-icons) -(setq select-enable-clipboard t) -(setq select-enable-primary t) -(setq save-interprogram-paste-before-kill t) +(use-package doom-modeline + :init (doom-modeline-mode 1) + :custom (doom-modeline-height 15)) +(use-package rainbow-delimiters + :hook (prog-mode . rainbow-delimiters-mode)) + +;; Fonts (scaled for 1080p laptop display) +(defvar runemacs/default-font-size 115) +(set-face-attribute 'default nil :font "Fira Code" :height runemacs/default-font-size) +(set-face-attribute 'fixed-pitch nil :font "Fira Code" :height 115) +(set-face-attribute 'variable-pitch nil :font "Cantarell" :height 125 :weight 'regular) + +;; ------------------------------------------------------------------- +;; Completion & Search (Ivy / Counsel / Swiper) +;; ------------------------------------------------------------------- +(use-package command-log-mode) + +(use-package ivy + :diminish + :bind (("C-s" . swiper) + :map ivy-minibuffer-map + ("TAB" . ivy-alt-done) + ("C-l" . ivy-alt-done) + ("C-j" . ivy-next-line) + ("C-k" . ivy-previous-line) + :map ivy-switch-buffer-map + ("C-k" . ivy-previous-line) + ("C-l" . ivy-done) + :map ivy-reverse-i-search-map + ("C-k" . ivy-previous-line) + ("C-d" . ivy-reverse-i-search-kill)) + :config + (ivy-mode 1)) + +(use-package ivy-rich + :init (ivy-rich-mode 1)) + +(use-package counsel + :bind (("M-x" . counsel-M-x) + ("C-x b" . counsel-ibuffer) + ("C-x C-f" . counsel-find-file) + :map minibuffer-local-map + ("C-r" . counsel-minibuffer-history)) + :config + (setq ivy-initial-inputs-alist nil)) + +(use-package which-key + :init (which-key-mode) + :diminish which-key-mode + :config (setq which-key-idle-delay 0.3)) + +(use-package helpful + :custom + (counsel-describe-function-function #'helpful-callable) + (counsel-describe-variable-function #'helpful-variable) + :bind + ([remap describe-function] . counsel-describe-function) + ([remap describe-command] . helpful-command) + ([remap describe-variable] . counsel-describe-variable) + ([remap describe-key] . helpful-key)) + +;; ------------------------------------------------------------------- +;; Evil Mode (Vim Emulation) & Keybindings +;; ------------------------------------------------------------------- (defun rune/evil-hook () (dolist (mode '(custom-mode - eshell-mode - git-rebase-mode - erc-mode - circe-server-mode - circe-chat-mode - circe-query-mode - sauron-mode - term-mode)) + eshell-mode + git-rebase-mode + erc-mode + circe-server-mode + circe-chat-mode + circe-query-mode + sauron-mode + term-mode)) (add-to-list 'evil-emacs-state-modes mode))) (use-package evil @@ -159,12 +154,38 @@ (evil-set-initial-state 'messages-buffer-mode 'normal) (evil-set-initial-state 'dashboard-mode 'normal)) - (use-package evil-collection :after evil :config (evil-collection-init)) +(use-package general + :config + (general-create-definer rune/leader-keys + :prefix "C-SPC") + + (global-unset-key (kbd "C-SPC")) + + (rune/leader-keys + "t" '(:ignore t :which-key "toggles") + "tt" '(counsel-load-theme :which-key "choose theme") + "p" '(:ignore t :which-key "projectile") + "ps" '(rune/counsel-rg-project :which-key "search project with rg") + "pf" '(counsel-projectile-find-file :which-key "find file in project") + "pp" '(counsel-projectile-switch-project :which-key "switch project") + "m" '(:ignore t :which-key "magit") + "mm" '(magit-status :which-key "magit status") + "." '(find-file :which-key "find file")) + + (general-define-key + "C-M-j" 'counsel-switch-buffer)) + +;; ------------------------------------------------------------------- +;; Projectile & Version Control +;; ------------------------------------------------------------------- +(use-package ripgrep) +(use-package rg) + (use-package projectile :diminish projectile-mode :config (projectile-mode) @@ -176,19 +197,13 @@ (setq projectile-project-search-path '("~/Projects"))) (setq projectile-switch-project-action #'projectile-dired)) -(use-package ripgrep - :ensure t) - -(use-package rg - :ensure t) - (use-package counsel-projectile :init (unless (fboundp 'projectile-ignored-files-rel) (defalias 'projectile-ignored-files-rel (if (fboundp 'projectile-ignored-files-relative) - #'projectile-ignored-files-relative - #'projectile-ignored-files))) + #'projectile-ignored-files-relative + #'projectile-ignored-files))) :after (projectile counsel) :config (counsel-projectile-mode 1)) @@ -197,22 +212,14 @@ (interactive) (counsel-rg nil (projectile-project-root))) -(rune/leader-keys - "p" '(:ignore t :which-key "projectile") - "ps" '(rune/counsel-rg-project :which-key "search project with rg") - "pf" '(counsel-projectile-find-file :which-key "find file in project") - "pp" '(counsel-projectile-switch-project :which-key "switch project")) - (use-package magit :commands (magit-status magit-get-current-branch) :custom - (magit-display-buffer-functioni #'magit-display-buffer-same-window-except-diff-v1)) - -(use-package evil-collection - :after magit evil) - -(setq auth-sources '("~/.authinfo")) + (magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1)) +;; ------------------------------------------------------------------- +;; Org Mode +;; ------------------------------------------------------------------- (defun marc/org-mode-setup () (org-indent-mode) (variable-pitch-mode 1) @@ -224,4 +231,42 @@ :hook (org-mode . marc/org-mode-setup) :config (setq org-ellipsis " ▼" - org-hide-emphasis-markers t)) + org-hide-emphasis-markers t)) + +(use-package org-bullets + :after org + :hook (org-mode . org-bullets-mode) + :custom + (org-bullets-bullet-list '("◉" "○" "●" "○" "●" "○" "●"))) + +(dolist (face '((org-level-1 . 1.25) + (org-level-2 . 1.15) + (org-level-3 . 1.08) + (org-level-4 . 1.0) + (org-level-5 . 1.0) + (org-level-6 . 1.0) + (org-level-7 . 1.0) + (org-level-8 . 1.0))) + (set-face-attribute (car face) nil :font "Cantarell" :weight 'regular :height (cdr face))) + + (dolist (face '(org-block + org-block-begin-line + org-block-end-line + org-code + org-table + org-table-row + org-table-header + org-verbatim + org-special-keyword + org-meta-line + org-checkbox + org-property-value + org-document-info-keyword)) + (set-face-attribute face nil :inherit 'fixed-pitch :font "Fira Code"))) + +(use-package org + :hook ((org-mode . marc/org-mode-setup) + (org-mode . marc/org-font-setup)) + :config + (setq org-ellipsis " ▼" + org-hide-emphasis-markers t))