commit 91de2878d2cfe89fd18b68aae655be88aa33efb9
parent b03f3c7c142eeec601fb8b680456b6912b04250e
Author: Vincent Demeester <vincent@sbr.pm>
Date: Thu, 4 Jul 2024 18:11:30 +0200
tools/emacs: update init
- Min version of emacs supported 29.1
- Start using `setopt` instead of `setq`
- Move some ui configuration from early-init to init
- Disable package (rely solely on nix) — might break some stuff
- Use explicit require for configs instead of `vde/el-load-dir`
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat:
2 files changed, 181 insertions(+), 167 deletions(-)
diff --git a/tools/emacs/early-init.el b/tools/emacs/early-init.el
@@ -5,7 +5,7 @@
;; Author: Vincent Demeester <vincent@sbr.pm>
;; URL: https://git.sr.ht/~vdemeester/home
;; Version: 0.1.0
-;; Package-Requires: ((emacs "27.1"))
+;; Package-Requires: ((emacs "29.1"))
;; This file is NOT part of GNU Emacs.
@@ -36,16 +36,17 @@
;;; Code:
;; Do not initialize installed packages
-(setq package-enable-at-startup nil)
+(setopt package-enable-at-startup nil)
+(setopt use-package-ensure-function 'ignore)
+;; (setopt package-archives nil)
;; Do not resize the frame at this early stage
-(setq frame-inhibit-implied-resize t)
+(setopt frame-inhibit-implied-resize t)
;; Disable GUI elements
(push '(menu-bar-lines . 0) default-frame-alist)
(push '(tool-bar-lines . 0) default-frame-alist)
(push '(vertical-scroll-bars) default-frame-alist)
-
(menu-bar-mode -1)
(tool-bar-mode -1)
(scroll-bar-mode -1)
@@ -57,90 +58,13 @@
(defvar file-name-handler-alist-original file-name-handler-alist)
(setq file-name-handler-alist nil)
-(defvar contrib/after-load-theme-hook nil
- "Hook run after a color theme is loaded using `load-theme'.")
-
-(defun contrib/run-after-load-theme-hook (&rest _)
- "Run `contrib/after-load-theme-hook'."
- (run-hooks 'contrib/after-load-theme-hook))
-
-(add-to-list 'load-path (concat user-emacs-directory "lisp/"))
-
-(advice-add #'load-theme :after #'contrib/run-after-load-theme-hook)
-
-(require 'modus-themes)
-(setq modus-themes-to-toggle '(modus-operandi modus-vivendi)
- modus-themes-slanted-constructs nil
- modus-themes-italic-constructs nil
- modus-themes-bold-constructs nil
- modus-themes-mixed-fonts t
- modus-themes-subtle-diffs t
- modus-themes-fringes 'subtle ; {nil,'subtle,'intense}
- modus-themes-headings '((0 . (variable-pitch semilight 1.5))
- (1 . (regular 1.4))
- (2 . (regular 1.3))
- (3 . (regular 1.2))
- (agenda-structure . (variable-pitch light 2.2))
- (agenda-date . (variable-pitch regular 1.3))
- (t . (regular 1.15)))
- modus-themes-intense-paren-match t
- modus-themes-completions '(opinionated) ; {nil,'moderate,'opinionated}
- modus-themes-diffs 'desaturated ; {nil,'desaturated,'fg-only}
- modus-themes-org-blocks 'gray-background
- modus-themes-paren-match '(subtle-bold)
- modus-themes-variable-pitch-headings nil
- modus-themes-rainbow-headings t
- modus-themes-section-headings nil
- modus-themes-scale-headings t
- )
-(define-key global-map (kbd "C-<f5>") #'modus-themes-toggle)
-
-(load-theme 'modus-operandi :no-confirm)
-
-
-(defconst font-height 130
- "Default font-height to use.")
-;; 2024-10-05: Switching from Ubuntu Mono to Cascadia Mono
-;; 2024-96-06: Switching from Cascadia Mono to JetBrains Mono
-(defconst font-family-mono "JetBrains Mono"
- "Default monospace font-family to use.")
-(defconst font-family-sans "Ubuntu Sans"
- "Default sans font-family to use.")
-;; Middle/Near East: שלום, السّلام عليكم
-(when (member "Noto Sans Arabic" (font-family-list))
- (set-fontset-font t 'arabic "Noto Sans Arabic"))
-(when (member "Noto Sans Hebrew" (font-family-list))
- (set-fontset-font t 'arabic "Noto Sans Hebrew"))
-;; Africa: ሠላም
-(when (member "Noto Sans Ethiopic" (font-family-list))
- (set-fontset-font t 'ethiopic "Noto Sans Ethiopic"))
-
-;; If font-family-mono or font-family-sans are not available, use the default Emacs face
-(when (member font-family-mono (font-family-list))
- (set-face-attribute 'default nil
- :family font-family-mono
- :height font-height
- :weight 'semi-light)
- (set-face-attribute 'fixed-pitch nil
- :family font-family-mono
- :weight 'medium
- :height 1.0))
-(when (member font-family-sans (font-family-list))
- (set-face-attribute 'variable-pitch nil
- :family font-family-sans
- :weight 'regular))
-
-(set-fontset-font t 'symbol "Apple Color Emoji")
-(set-fontset-font t 'symbol "Noto Color Emoji" nil 'append)
-(set-fontset-font t 'symbol "Segoe UI Emoji" nil 'append)
-(set-fontset-font t 'symbol "Symbola" nil 'append)
;; Ignore X resources; its settings would be redundant with the other settings
;; in this file and can conflict with later config (particularly where the
;; cursor color is concerned).
(advice-add #'x-apply-session-resources :override #'ignore)
-;; - Reseting garbage collection and file-name-handler values.
+;; - Resetting garbage collection and file-name-handler values.
(add-hook 'after-init-hook
`(lambda ()
(setq gc-cons-threshold 67108864 ; 64mb
diff --git a/tools/emacs/init.el b/tools/emacs/init.el
@@ -5,7 +5,7 @@
;; Author: Vincent Demeester <vincent@sbr.pm>
;; URL: https://git.sr.ht/~vdemeester/home
;; Version: 0.1.0
-;; Package-Requires: ((emacs "27.1"))
+;; Package-Requires: ((emacs "29.1"))
;; This file is NOT part of GNU Emacs.
@@ -31,15 +31,10 @@
(defconst emacs-start-time (current-time))
-(let ((minver 26))
+(let ((minver 28))
(unless (>= emacs-major-version minver)
(error "Your Emacs is too old -- this configuration requires v%s or higher" minver)))
-;; load early-init.el before Emacs 27.0
-(unless (>= emacs-major-version 27)
- (message "Early init: Emacs Version < 27.0")
- (load (expand-file-name "early-init.el" user-emacs-directory)))
-
(add-to-list 'load-path (concat user-emacs-directory "/lisp/"))
(setq inhibit-default-init t) ; Disable the site default settings
@@ -57,71 +52,82 @@
(set-selection-coding-system 'utf-8)
(set-terminal-coding-system 'utf-8)
-(require 'package)
-
-;; (setq package-archives nil) ;; To rely only on packages from nix
-(setq package-archives
- '(("melpa" . "http://melpa.org/packages/")
- ("org" . "https://orgmode.org/elpa/")
- ("gnu" . "https://elpa.gnu.org/packages/")
- ("nongnu" . "https://elpa.nongnu.org/nongnu/")))
-
-(setq package-archive-priorities
- '(("melpa" . 4)
- ("org" . 3)
- ("gnu" . 2)
- ("non-gnu" . 1)))
-
-(require 'tls)
-
-;; From https://github.com/hlissner/doom-emacs/blob/5dacbb7cb1c6ac246a9ccd15e6c4290def67757c/core/core-packages.el#L102
-(setq gnutls-verify-error (not (getenv "INSECURE")) ; you shouldn't use this
- tls-checktrust gnutls-verify-error
- tls-program (list "gnutls-cli --x509cafile %t -p %p %h"
- ;; compatibility fallbacks
- "gnutls-cli -p %p %h"
- "openssl s_client -connect %h:%p -no_ssl2 -no_ssl3 -ign_eof"))
-
-;; Initialise the packages, avoiding a re-initialisation.
-(unless (bound-and-true-p package--initialized)
- (setq package-enable-at-startup nil)
- (package-initialize))
-
-(setq load-prefer-newer t) ; Always load newer compiled files
-(setq ad-redefinition-action 'accept) ; Silence advice redefinition warnings
-
-;; Init `delight'
-(unless (package-installed-p 'delight)
- (package-refresh-contents)
- (package-install 'delight))
+(defconst font-height 130
+ "Default font-height to use.")
+;; 2024-10-05: Switching from Ubuntu Mono to Cascadia Mono
+;; 2024-96-06: Switching from Cascadia Mono to JetBrains Mono
+(defconst font-family-mono "JetBrains Mono"
+ "Default monospace font-family to use.")
+(defconst font-family-sans "Ubuntu Sans"
+ "Default sans font-family to use.")
+;; Middle/Near East: שלום, السّلام عليكم
+(when (member "Noto Sans Arabic" (font-family-list))
+ (set-fontset-font t 'arabic "Noto Sans Arabic"))
+(when (member "Noto Sans Hebrew" (font-family-list))
+ (set-fontset-font t 'arabic "Noto Sans Hebrew"))
+;; Africa: ሠላም
+(when (member "Noto Sans Ethiopic" (font-family-list))
+ (set-fontset-font t 'ethiopic "Noto Sans Ethiopic"))
-;; Configure `use-package' prior to loading it.
-(eval-and-compile
- (setq use-package-always-ensure nil)
- (setq use-package-always-defer nil)
- (setq use-package-always-demand nil)
- (setq use-package-expand-minimally nil)
- (setq use-package-enable-imenu-support t))
-
-(unless (package-installed-p 'use-package)
- (package-refresh-contents)
- (package-install 'use-package))
-
-(eval-when-compile
- (require 'use-package))
-
-(setenv "SSH_AUTH_SOCK" "/run/user/1000/gnupg/S.gpg-agent.ssh")
-
-(defconst vde/custom-file (locate-user-emacs-file "custom.el")
- "File used to store settings from Customization UI.")
+;; If font-family-mono or font-family-sans are not available, use the default Emacs face
+(when (member font-family-mono (font-family-list))
+ (set-face-attribute 'default nil
+ :family font-family-mono
+ :height font-height
+ :weight 'regular)
+ (set-face-attribute 'fixed-pitch nil
+ :family font-family-mono
+ :weight 'medium
+ :height font-height))
+(when (member font-family-sans (font-family-list))
+ (set-face-attribute 'variable-pitch nil
+ :family font-family-sans
+ :weight 'regular))
-;; Remove built-in org-mode
-(require 'cl-seq)
-(setq load-path
- (cl-remove-if
- (lambda (x)
- (string-match-p "org$" x))
- load-path))
+(set-fontset-font t 'symbol "Apple Color Emoji")
+(set-fontset-font t 'symbol "Noto Color Emoji" nil 'append)
+(set-fontset-font t 'symbol "Segoe UI Emoji" nil 'append)
+(set-fontset-font t 'symbol "Symbola" nil 'append)
+
+(defvar contrib/after-load-theme-hook nil
+ "Hook run after a color theme is loaded using `load-theme'.")
+
+(defun contrib/run-after-load-theme-hook (&rest _)
+ "Run `contrib/after-load-theme-hook'."
+ (run-hooks 'contrib/after-load-theme-hook))
+
+(add-to-list 'load-path (concat user-emacs-directory "lisp/"))
+
+(advice-add #'load-theme :after #'contrib/run-after-load-theme-hook)
+
+(require 'modus-themes)
+(setq modus-themes-to-toggle '(modus-operandi modus-vivendi)
+ modus-themes-slanted-constructs nil
+ modus-themes-italic-constructs nil
+ modus-themes-bold-constructs nil
+ modus-themes-mixed-fonts t
+ modus-themes-subtle-diffs t
+ modus-themes-fringes 'subtle ; {nil,'subtle,'intense}
+ modus-themes-headings '((0 . (variable-pitch semilight 1.5))
+ (1 . (regular 1.4))
+ (2 . (regular 1.3))
+ (3 . (regular 1.2))
+ (agenda-structure . (variable-pitch light 2.2))
+ (agenda-date . (variable-pitch regular 1.3))
+ (t . (regular 1.15)))
+ modus-themes-intense-paren-match t
+ modus-themes-completions '(opinionated) ; {nil,'moderate,'opinionated}
+ modus-themes-diffs 'desaturated ; {nil,'desaturated,'fg-only}
+ modus-themes-org-blocks 'gray-background
+ modus-themes-paren-match '(subtle-bold)
+ modus-themes-variable-pitch-headings nil
+ modus-themes-rainbow-headings t
+ modus-themes-section-headings nil
+ modus-themes-scale-headings t
+ )
+(define-key global-map (kbd "C-<f5>") #'modus-themes-toggle)
+
+(load-theme 'modus-operandi :no-confirm)
(require 'init-func)
@@ -157,25 +163,109 @@
(not *sys/full*)
"Is it a light system ?")
-;; If font-family-mono or font-family-sans are not available, use the default Emacs face
-(when (member font-family-mono (font-family-list))
- (set-face-attribute 'default nil
- :family font-family-mono
- :height font-height
- :weight 'semi-light)
- (set-face-attribute 'fixed-pitch nil
- :family font-family-mono
- :weight 'medium
- :height 1.0))
-(when (member font-family-sans (font-family-list))
- (set-face-attribute 'variable-pitch nil
- :family font-family-sans
- :weight 'regular))
+;; (require 'package)
+;; (setq package-archives nil) ;; To rely only on packages from nix
+;; (setq package-archives
+;; '(("melpa" . "http://melpa.org/packages/")
+;; ("org" . "https://orgmode.org/elpa/")
+;; ("gnu" . "https://elpa.gnu.org/packages/")
+;; ("nongnu" . "https://elpa.nongnu.org/nongnu/")))
+;;
+;; (setq package-archive-priorities
+;; '(("melpa" . 4)
+;; ("org" . 3)
+;; ("gnu" . 2)
+;; ("non-gnu" . 1)))
+
+;; (require 'tls)
+;;
+;; ;; From https://github.com/hlissner/doom-emacs/blob/5dacbb7cb1c6ac246a9ccd15e6c4290def67757c/core/core-packages.el#L102
+;; (setq gnutls-verify-error (not (getenv "INSECURE")) ; you shouldn't use this
+;; tls-checktrust gnutls-verify-error
+;; tls-program (list "gnutls-cli --x509cafile %t -p %p %h"
+;; ;; compatibility fallbacks
+;; "gnutls-cli -p %p %h"
+;; "openssl s_client -connect %h:%p -no_ssl2 -no_ssl3 -ign_eof"))
+
+;; Initialise the packages, avoiding a re-initialisation.
+;; (unless (bound-and-true-p package--initialized)
+;; (setq package-enable-at-startup nil)
+;; (package-initialize))
+
+(setq load-prefer-newer t) ; Always load newer compiled files
+(setq ad-redefinition-action 'accept) ; Silence advice redefinition warnings
+
+;; Init `delight'
+;; (unless (package-installed-p 'delight)
+;; (package-refresh-contents)
+;; (package-install 'delight))
+
+;; Configure `use-package' prior to loading it.
+(eval-and-compile
+ (setq use-package-always-ensure nil)
+ (setq use-package-always-defer nil)
+ (setq use-package-always-demand nil)
+ (setq use-package-expand-minimally nil)
+ (setq use-package-enable-imenu-support t))
+
+;; (unless (package-installed-p 'use-package)
+;; (package-refresh-contents)
+;; (package-install 'use-package))
+
+(eval-when-compile
+ (require 'use-package))
+
+(setenv "SSH_AUTH_SOCK" "/run/user/1000/gnupg/S.gpg-agent.ssh")
+
+(defconst vde/custom-file (locate-user-emacs-file "custom.el")
+ "File used to store settings from Customization UI.")
+
+;; Remove built-in org-mode
+(require 'cl-seq)
+(setq load-path
+ (cl-remove-if
+ (lambda (x)
+ (string-match-p "org$" x))
+ load-path))
;; 2024-07-12: I wonder if I should be explicit instead, as using
;; `require' explicitly. The benefit would be that I decide the order
;; they load instead of relying on file-system.
-(vde/el-load-dir (concat user-emacs-directory "/config/"))
+;; (vde/el-load-dir (concat user-emacs-directory "/config/"))
+(require 'org-func)
+(require 'project-func)
+(add-to-list 'load-path (concat user-emacs-directory "/config/"))
+
+(require '00-base)
+(require '00-clean) ;; Maybe refactor no-littering
+(require 'config-appearance)
+(require 'config-buffers)
+(require 'config-compile)
+(require 'config-completion)
+(require 'config-dired)
+(require 'config-editing)
+(require 'config-files)
+(require 'config-keybindings)
+(require 'config-misc)
+(require 'config-mouse)
+(require 'config-navigating)
+(require 'config-org)
+(require 'config-programming)
+(require 'config-projects)
+(require 'config-search)
+(require 'config-shells)
+(require 'config-vcs)
+(require 'config-web)
+(require 'config-windows)
+(require 'programming-config)
+(require 'programming-containers)
+(require 'programming-cue)
+(require 'programming-eglot)
+(require 'programming-go)
+(require 'programming-js)
+(require 'programming-nix)
+(require 'programming-treesitter)
+(require 'programming-web)
(if (file-exists-p (downcase (concat user-emacs-directory "/hosts/" (vde/short-hostname) ".el")))
(load-file (downcase (concat user-emacs-directory "/hosts/" (vde/short-hostname) ".el"))))
