restructure a bit and add font configuration

emacs/init.el

@@ -1,17 +1,40 @@
-(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 "<escape>") 'keyboard-escape-quit)
+
+;; -------------------------------------------------------------------
+;; Package Management
+;; -------------------------------------------------------------------
+(require 'package)
 
 (setq package-archives '(("melpa" . "https://melpa.org/packages/")
                          ("org"   . "https://orgmode.org/elpa/")
@@ -28,13 +51,35 @@
 (require 'use-package)
 (setq use-package-always-ensure t)
 
+;; -------------------------------------------------------------------
+;; Appearance & Theming
+;; -------------------------------------------------------------------
+(use-package doom-themes
+  :init (load-theme 'doom-gruvbox t))
+
+(use-package all-the-icons)
+
+(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)
 
-(global-set-key (kbd "<escape>") 'keyboard-escape-quit)
-
 (use-package ivy
-:diminish
+  :diminish
-:bind (("C-s" . swiper)
+  :bind (("C-s" . swiper)
          :map ivy-minibuffer-map
          ("TAB" . ivy-alt-done)
          ("C-l" . ivy-alt-done)
@@ -46,71 +91,27 @@
          :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)
+  (ivy-mode 1))
-  (general-create-definer rune/leader-keys
-			  ;:keymaps '(normal insert visual emacs)
-			  ;:prefix "SPC"
-			  :prefix "C-SPC")
 
-  (global-unset-key (kbd "C-SPC"))
+(use-package ivy-rich
-
+  :init (ivy-rich-mode 1))
-  (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))
+         ("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
+  :init (which-key-mode)
   :diminish which-key-mode
-  :config (setq which-key-idle-delay 0.3)) ; config is done when the package is loaded
+  :config (setq which-key-idle-delay 0.3))
-
-(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)
@@ -120,15 +121,9 @@
   ([remap describe-variable] . counsel-describe-variable)
   ([remap describe-key]      . helpful-key))
 
-(use-package doom-themes
+;; -------------------------------------------------------------------
-  :init (load-theme 'doom-gruvbox t))
+;; Evil Mode (Vim Emulation) & Keybindings
-
+;; -------------------------------------------------------------------
-(use-package all-the-icons)
-
-(setq select-enable-clipboard t)
-(setq select-enable-primary t)
-(setq save-interprogram-paste-before-kill t)
-
 (defun rune/evil-hook ()
   (dolist (mode '(custom-mode
                   eshell-mode
@@ -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,12 +197,6 @@
     (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)
@@ -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))
+  (magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1))
-
-(use-package evil-collection
-  :after magit evil)
-
-(setq auth-sources '("~/.authinfo"))
 
+;; -------------------------------------------------------------------
+;; Org Mode
+;; -------------------------------------------------------------------
 (defun marc/org-mode-setup ()
   (org-indent-mode)
   (variable-pitch-mode 1)
@@ -225,3 +232,41 @@
   :config
   (setq org-ellipsis " ▼"
         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))