From 287154f425fae2fd908a11b7688457845efc9fa7 Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Thu, 12 Jun 2025 14:40:10 -0700
Subject: move emacs configuration at the top level

---
 configs/users/fcuny/emacs/early-init.el            |  45 +++++
 configs/users/fcuny/emacs/init.el                  |  42 +++++
 configs/users/fcuny/emacs/site-lisp/init-base.el   | 173 ++++++++++++++++++
 .../users/fcuny/emacs/site-lisp/init-completion.el |  54 ++++++
 configs/users/fcuny/emacs/site-lisp/init-llm.el    |  33 ++++
 .../fcuny/emacs/site-lisp/init-programming.el      | 198 +++++++++++++++++++++
 configs/users/fcuny/emacs/site-lisp/init-text.el   | 128 +++++++++++++
 configs/users/fcuny/emacs/site-lisp/init-ui.el     |  50 ++++++
 nix/users/fcuny/configs/emacs/early-init.el        |  45 -----
 nix/users/fcuny/configs/emacs/init.el              |  42 -----
 .../fcuny/configs/emacs/site-lisp/init-base.el     | 173 ------------------
 .../configs/emacs/site-lisp/init-completion.el     |  54 ------
 .../fcuny/configs/emacs/site-lisp/init-llm.el      |  33 ----
 .../configs/emacs/site-lisp/init-programming.el    | 198 ---------------------
 .../fcuny/configs/emacs/site-lisp/init-text.el     | 128 -------------
 nix/users/fcuny/configs/emacs/site-lisp/init-ui.el |  50 ------
 nix/users/fcuny/emacs.nix                          |   9 +-
 17 files changed, 730 insertions(+), 725 deletions(-)
 create mode 100644 configs/users/fcuny/emacs/early-init.el
 create mode 100644 configs/users/fcuny/emacs/init.el
 create mode 100644 configs/users/fcuny/emacs/site-lisp/init-base.el
 create mode 100644 configs/users/fcuny/emacs/site-lisp/init-completion.el
 create mode 100644 configs/users/fcuny/emacs/site-lisp/init-llm.el
 create mode 100644 configs/users/fcuny/emacs/site-lisp/init-programming.el
 create mode 100644 configs/users/fcuny/emacs/site-lisp/init-text.el
 create mode 100644 configs/users/fcuny/emacs/site-lisp/init-ui.el
 delete mode 100644 nix/users/fcuny/configs/emacs/early-init.el
 delete mode 100644 nix/users/fcuny/configs/emacs/init.el
 delete mode 100644 nix/users/fcuny/configs/emacs/site-lisp/init-base.el
 delete mode 100644 nix/users/fcuny/configs/emacs/site-lisp/init-completion.el
 delete mode 100644 nix/users/fcuny/configs/emacs/site-lisp/init-llm.el
 delete mode 100644 nix/users/fcuny/configs/emacs/site-lisp/init-programming.el
 delete mode 100644 nix/users/fcuny/configs/emacs/site-lisp/init-text.el
 delete mode 100644 nix/users/fcuny/configs/emacs/site-lisp/init-ui.el

diff --git a/configs/users/fcuny/emacs/early-init.el b/configs/users/fcuny/emacs/early-init.el
new file mode 100644
index 0000000..3953c90
--- /dev/null
+++ b/configs/users/fcuny/emacs/early-init.el
@@ -0,0 +1,45 @@
+;;; early-init.el --- Early initialization -*- lexical-binding: t -*-
+
+;;; Commentary:
+
+;;; Code:
+
+;; Startup speed, annoyance suppression
+(setq gc-cons-threshold 10000000)
+(setq byte-compile-warnings '(not obsolete))
+(setq warning-suppress-log-types '((comp) (bytecomp)))
+(setq native-comp-async-report-warnings-errors 'silent)
+
+;; Silence startup message
+(setq inhibit-startup-echo-area-message (user-login-name))
+
+;; Default frame configuration: full screen, good-looking title bar on macOS
+(setq frame-resize-pixelwise t)
+(setq default-frame-alist '((fullscreen . maximized)
+			    ;; Setting the face in here prevents flashes of
+			    ;; color as the theme gets activated
+			    (ns-appearance . light)
+			    (ns-transparent-titlebar . t)))
+
+;; disable GUI elements
+(scroll-bar-mode -1)      ; hide the scroll bar
+(tool-bar-mode -1)        ; hide the tool bar
+(menu-bar-mode +1)        ; show the menu
+(blink-cursor-mode -1)    ; don't blink the cursor
+
+(setq make-pointer-invisible t)  ;; hide cursor while typing
+(setq use-dialog-box nil)        ;; do not show GUI dialogs
+(setq inhibit-startup-screen t)  ;; hide the startup screen
+
+;; use utf-8 everywhere
+(set-default-coding-systems 'utf-8)
+
+;; `use-package' is builtin since 29.
+;; These variables must be set before loading `use-package'.
+(setq use-package-always-ensure nil
+      use-package-always-defer t
+      use-package-enable-imenu-support t)
+
+(set-face-attribute 'default nil :family "Source Code Pro" :height 150)
+
+;;; early-init.el ends here
diff --git a/configs/users/fcuny/emacs/init.el b/configs/users/fcuny/emacs/init.el
new file mode 100644
index 0000000..973e4ad
--- /dev/null
+++ b/configs/users/fcuny/emacs/init.el
@@ -0,0 +1,42 @@
+;;; init.el --- This is where all emacs start. -*- lexical-binding: t -*-
+
+;;; Commentary:
+
+;;; Code:
+
+(add-to-list 'load-path (concat user-emacs-directory (convert-standard-filename "site-lisp/")))
+
+(use-package exec-path-from-shell
+  :custom
+  (exec-path-from-shell-variables '("PATH" "MANPATH" "GOPATH" "GOBIN" "ASPELL_CONF"))
+  :init (exec-path-from-shell-initialize))
+
+(require 'init-base)
+(require 'init-ui)
+(require 'init-completion)
+(require 'init-text)
+(require 'init-programming)
+(require 'init-llm)
+
+(use-package server
+  :config
+  (setq server-client-instructions nil)
+  (unless (server-running-p)
+    (server-start)))
+
+(use-package eshell
+  :commands (eshell eshell-command)
+  :bind (("C-r" . consult-history))
+  :custom
+  (eshell-hist-ignoredups t)
+  (eshell-history-size 50000)
+  (eshell-ls-dired-initial-args '("-h"))
+  (eshell-ls-initial-args "-h")
+  (eshell-ls-exclude-regexp "~\\'")
+  (eshell-save-history-on-exit t)
+  (eshell-stringify-t nil)
+  (eshell-term-name "ansi"))
+
+;;; init.el ends here
+;; byte-compile-warnings: (not docstrings lexical noruntime)
+;; End:
diff --git a/configs/users/fcuny/emacs/site-lisp/init-base.el b/configs/users/fcuny/emacs/site-lisp/init-base.el
new file mode 100644
index 0000000..7c884ab
--- /dev/null
+++ b/configs/users/fcuny/emacs/site-lisp/init-base.el
@@ -0,0 +1,173 @@
+;;; init-base.el --- base configuration -*- lexical-binding: t -*-
+;; Author: Franck Cuny <franck@fcuny.net>
+
+;;; Commentary:
+
+;; commentary
+
+;;; Code:
+
+(setq backup-inhibited t)   ;; no backups
+(setq create-lockfiles nil) ;; don't use a lock file
+
+(setq auto-save-default nil)                            ;; no auto save
+(setq confirm-kill-emacs #'yes-or-no-p)                 ;; ask before killing emacs
+(setq cursor-in-non-selected-windows nil)               ;; keep cursors and highlights in current window only
+(setq delete-by-moving-to-trash t)                      ;; delete files by moving them to the trash
+(setq highlight-nonselected-windows nil)                ;; don't highlight inactive windows
+(setq history-delete-duplicates t)                      ;; delete duplicate from history
+(setq initial-major-mode 'fundamental-mode)             ;; default mode for the scratch buffer
+(setq initial-scratch-message "")                       ;; makes the scratch buffer empty
+(setq midnight-period (* 3600 6))                       ;; clear buffer every 6 hours
+(setq mode-line-default-help-echo nil)                  ;; don't say anything on mode-line mouseover
+(setq require-final-newline t)                          ;; ensure a new line is present at the bottom of files
+(setq ring-bell-function 'ignore)                       ;; really no bell
+(setq sentence-end-double-space nil)                    ;; it matters for filling
+(setq use-short-answers t)                              ;; use y-or-n
+(setq visible-bell nil)                                 ;; no bell
+(setq bidi-display-reordering nil)                      ;; disable bidirectional text support for slight performance bonus
+(setq column-number-mode t)                             ;; show column number in the mode line
+
+(global-set-key (kbd "M-j") 'join-line)
+
+(use-package recentf
+  :hook (after-init . recentf-mode)
+  :custom
+  (recentf-max-saved-items 1000)
+  (recentf-max-menu-items 25)
+  (recentf-save-file-modes nil)
+  (recentf-keep nil)
+  (recentf-auto-cleanup nil)
+  (recentf-initialize-file-name-history nil)
+  (recentf-filename-handlers nil)
+  (recentf-show-file-shortcuts-flag nil))
+
+(use-package midnight
+  :custom
+  ;; every 6 hours
+  (midnight-period (* 3600 6)))
+
+(use-package imenu
+  :config
+  (setq imenu-auto-rescan t))
+
+(use-package autorevert
+  :hook (after-init . global-auto-revert-mode)
+  :custom
+  (auto-revert-use-notify nil))
+
+(use-package time
+  :commands (world-clock)
+  :hook (after-init . display-time-mode)
+  :config
+  (setq display-time-format " %a %e %b, %H:%M ")
+  (setq display-time-24hr-format t)
+  (setq display-time-interval 60)
+  (setq display-time-default-load-average nil)
+  (setq display-time-world-list t)
+
+  ;; M-x shell RET timedatectl list-timezones
+  (setq zoneinfo-style-world-list '(("America/Los_Angeles" "Berkeley")
+				    ("America/Chicago" "Chicago")
+				    ("UTC" "UTC")
+				    ("Europe/Paris" "Paris")))
+
+  ;; M-x world-clock
+  (setq world-clock-list t)
+  (setq world-clock-time-format "%z %R	%a %d %b (%Z)")
+  (setq world-clock-buffer-name "*world-clock*") ; Placement handled by `display-buffer-alist'
+  (setq world-clock-timer-enable t)
+  (setq world-clock-timer-second 60))
+
+(use-package ibuffer
+  :bind ("C-x C-b" . ibuffer)
+  :custom
+  (ibuffer-expert t)
+  (ibuffer-show-empty-filter-groups nil)
+  (ibuffer-jump-offer-only-visible-buffers t)
+  (ibuffer-never-show-predicates '("^ "))
+  (ibuffer-use-other-window t)
+  (ibuffer-filter-group-name-face '(:inherit (font-lock-string-face bold))))
+
+(use-package which-key
+  :diminish
+  :hook (after-init . which-key-mode))
+
+(use-package saveplace
+  :config
+  (save-place-mode t))
+
+(use-package savehist
+  :hook (after-init . savehist-mode)
+  :custom
+  (savehist-file (locate-user-emacs-file "savehist"))
+  (history-length 100)
+  (history-delete-duplicates t)
+  (savehist-save-minibuffer-history t))
+
+(use-package project
+  :bind
+  (("C-x p ." . project-dired)
+   ("C-x p <return>" . project-dired))
+  :custom
+  (project-switch-commands
+   '(
+     (consult-project-buffer "buffer" ?b)
+     (project-dired "dired" ?d)
+     (magit-project-status "magit status" ?g)
+     (project-find-file "find file" ?p)
+     (consult-ripgrep "rigprep" ?r)))
+  (setq project-mode-line t)
+  (setq project-key-prompt-style t))
+
+ ; Emacs 30
+
+(use-package rg
+  :custom
+  (rg-group-result t)
+  (rg-show-columns t)
+  (rg-align-line-number-field-length 3)
+  (rg-align-column-number-field-length 3)
+  (rg-align-line-column-separator "#")
+  (rg-align-position-content-separator "|")
+  (rg-hide-command nil)
+  (rg-align-position-numbers t)
+  (rg-command-line-flags '("--follow")))
+
+(use-package dired
+  :hook (dired-mode . dired-omit-mode)
+  :bind (:map dired-mode-map
+              ( "."     . dired-omit-mode))
+  :custom
+  (dired-omit-files (rx (seq bol ".")))
+  (dired-use-ls-dired t)
+  (dired-clean-up-buffers-too nil)
+  (dired-dwim-target t)
+  (dired-hide-details-hide-information-lines nil)
+  (dired-hide-details-hide-symlink-targets nil)
+  (dired-recursive-copies 'always)
+  (dired-recursive-deletes 'always)
+  (dired-no-confirm
+   '(byte-compile chgrp chmod chown copy hardlink symlink touch)))
+
+(defun my/rename-this-buffer-and-file ()
+  "Renames current buffer and file it is visiting."
+  (interactive)
+  (let ((name (buffer-name))
+        (filename (buffer-file-name))
+        (read-file-name-function 'read-file-name-default))
+    (if (not (and filename (file-exists-p filename)))
+        (error "Buffer '%s' is not visiting a file!" name)
+      (let ((new-name (read-file-name "New name: " filename)))
+        (cond ((get-buffer new-name)
+               (error "A buffer named '%s' already exists!" new-name))
+              (t
+               (rename-file filename new-name 1)
+               (rename-buffer new-name)
+               (set-visited-file-name new-name)
+               (set-buffer-modified-p nil)
+               (message "File '%s' successfully renamed to '%s'" name (file-name-nondirectory new-name))))))))
+
+(provide 'init-base)
+
+;;; init-base.el ends here
diff --git a/configs/users/fcuny/emacs/site-lisp/init-completion.el b/configs/users/fcuny/emacs/site-lisp/init-completion.el
new file mode 100644
index 0000000..fc01a39
--- /dev/null
+++ b/configs/users/fcuny/emacs/site-lisp/init-completion.el
@@ -0,0 +1,54 @@
+;;; init-completion.el --- Configure completion -*- lexical-binding: t -*-
+;; Author: Franck Cuny <franck@fcuny.net>
+
+;;; Commentary:
+
+;; Configure completions
+
+;;; Code:
+
+(use-package consult
+  :commands (consult-ripgrep consult-buffer consult-imenu)
+  :bind (("C-c m"   . consult-mode-command)
+	 ("C-x b"   . consult-buffer)
+	 ("C-x r b" . consult-bookmark)
+	 ("C-x p b" . consult-project-buffer)
+	 ("C-c i"   . consult-imenu)
+	 ("M-g e"   . consult-compile-error)
+	 ("M-g M-g" . consult-goto-line)
+	 ("M-g m"   . consult-mark)
+	 ("M-g k"   . consult-global-mark)))
+
+(use-package corfu
+  :custom
+  (corfu-auto t)
+  :bind ("M-/" . completion-at-point)
+  :hook ((after-init . global-corfu-mode)
+         (global-corfu-mode . corfu-popupinfo-mode)))
+
+(use-package cape)
+
+(use-package marginalia
+  :hook (after-init . marginalia-mode))
+
+(use-package orderless
+  :custom
+  (completion-styles '(orderless basic))
+  (completion-category-defaults nil))
+
+(use-package vertico
+  :hook ((after-init . vertico-mode)))
+
+(use-package consult-imenu
+  :after (consult))
+
+(use-package corfu-popupinfo
+  :after corfu
+  :hook (corfu-mode . corfu-popupinfo-mode)
+  :custom
+  (corfu-popupinfo-delay '(0.25 . 0.1))
+  (corfu-popupinfo-hide nil))
+
+(provide 'init-completion)
+
+;;; init-completion.el ends here
diff --git a/configs/users/fcuny/emacs/site-lisp/init-llm.el b/configs/users/fcuny/emacs/site-lisp/init-llm.el
new file mode 100644
index 0000000..48346e6
--- /dev/null
+++ b/configs/users/fcuny/emacs/site-lisp/init-llm.el
@@ -0,0 +1,33 @@
+;;; init-llm.el --- Configure LLMs -*- lexical-binding: t -*-
+;; Author: Franck Cuny <franck@fcuny.net>
+
+;;; Commentary:
+
+;; Configure completions
+
+;;; Code:
+(require 's)
+
+(defun fcuny/read-anthropic-key ()
+  "Read and return the API key for anthropic."
+  (with-temp-buffer
+    (insert-file-contents "~/.local/share/agenix/anthropic-api-key")
+    (s-trim (buffer-string))))
+
+(use-package gptel
+  :custom
+  (gptel-default-mode 'org-mode)
+  :config
+  (gptel-make-anthropic "Claude" :stream t :key (lambda () (fcuny/read-anthropic-key))))
+
+(use-package aidermacs
+  :bind ("C-c a" . aidermacs-transient-menu)
+  :custom
+  (aider-args '("--no-check-update" "--no-show-model-warnings"))
+  (aidermacs-default-model "claude-3-7-sonnet-latest")
+  :config
+  (setenv "ANTHROPIC_API_KEY" (fcuny/read-anthropic-key)))
+
+(provide 'init-llm)
+
+;;; init-llm.el ends here
diff --git a/configs/users/fcuny/emacs/site-lisp/init-programming.el b/configs/users/fcuny/emacs/site-lisp/init-programming.el
new file mode 100644
index 0000000..b3712e7
--- /dev/null
+++ b/configs/users/fcuny/emacs/site-lisp/init-programming.el
@@ -0,0 +1,198 @@
+;;; init-programming.el --- Configure things related to programming -*- lexical-binding: t -*-
+;; Author: Franck Cuny <franck@fcuny.net>
+
+;;; Commentary:
+
+;; Configure things related to programming
+
+;;; Code:
+
+(use-package magit
+  :bind ("C-x g" . magit-status)
+  :custom
+  (magit-diff-refine-hunk t)
+  (magit-repository-directories '(("~/workspace" . 1)))
+  (magit-repolist-column-flag-alist '((magit-untracked-files . "N")
+				      (magit-unstaged-files . "U")
+				      (magit-staged-files . "S")))
+  (magit-repolist-columns '(("Name" 25 magit-repolist-column-ident nil)
+			    ("" 3 magit-repolist-column-flag)
+			    ("Version" 25 magit-repolist-column-version
+			     ((:sort magit-repolist-version<)))
+			    ("B<U" 3 magit-repolist-column-unpulled-from-upstream
+			     ((:right-align t)
+			      (:sort <)))
+			    ("B>U" 3 magit-repolist-column-unpushed-to-upstream
+			     ((:right-align t)
+			      (:sort <)))
+			    ("Path" 99 magit-repolist-column-path nil)))
+  (magit-clone-default-directory "~/workspace/")
+  :config
+  ;; show ANSI colors in the process buffer, so it's easier to read what's going on
+  ;; for some reasons if it's in the `:custom' section it does not get set
+  (setq magit-process-finish-apply-ansi-colors t))
+
+(use-package git-link
+  :defines git-link-remote-alist
+  :bind ("C-c Y" . git-link)
+  :commands (git-link git-link-commit git-link-homepage)
+  :custom
+  (git-link-open-in-browser t)
+  :config
+  ;; sets up roblox git enterprise as a git-link handler
+  (add-to-list 'git-link-remote-alist '("github\\.rblx\\.com" git-link-github))
+  (add-to-list 'git-link-commit-remote-alist '("github\\.rblx\\.com" git-link-commit-github)))
+
+(use-package elec-pair
+  :hook (prog-mode . electric-pair-mode))
+
+(use-package eldoc
+  :diminish
+  :hook ((emacs-lisp-mode) . eldoc-mode)
+  :custom
+  (eldoc-idle-delay 1)
+  (eldoc-documentation-strategy #'eldoc-documentation-default)
+  ;; Don't resize the echo area if the documentation is longer. This is very
+  ;; distracting when combined with Eglot's highlight functionality.
+  (eldoc-echo-area-use-multiline-p nil))
+
+(use-package compile
+  :hook (compilation-filter . ansi-color-compilation-filter)
+  :custom
+  (compilation-always-kill t)
+  (compilation-context-lines 10)
+  (compilation-disable-input t)
+  (compilation-scroll-output 'first-error)
+  (compilation-scroll-output t)
+  (compilation-skip-threshold 2)
+  ;; Save all buffers on M-x `compile'
+  (compilation-ask-about-save nil))
+
+(use-package direnv
+  :custom
+  (direnv-always-show-summary nil)
+  :config
+  (direnv-mode))
+
+(use-package flymake
+  :bind (:prefix "C-c !"
+		 :prefix-map flymake-prefix-map
+		 ("l" . consult-flymake)
+		 ("d" . flymake-show-buffer-diagnostics)
+		 ("D" . flymake-show-project-diagnostics)
+		 ("n" . flymake-goto-next-error)
+		 ("p" . flymake-goto-prev-error))
+  :hook
+  (prog-mode . flymake-mode)
+  :custom
+  (flymake-start-on-save-buffer t)
+  (flymake-fringe-indicator-position 'left-fringe)
+  (flymake-suppress-zero-counters t)
+  (flymake-proc-compilation-prevents-syntax-check t)
+  (flymake-no-changes-timeout 9999)
+  (elisp-flymake-byte-compile-load-path load-path))
+
+(use-package eglot
+  :bind (:map eglot-mode-map
+	      ("C-c l a" . eglot-code-actions)
+	      ("C-c l r" . eglot-rename)
+	      ("C-c l f" . eglot-format-buffer))
+  :hook ((go-mode     . eglot-ensure)
+	 (python-mode . eglot-ensure)
+	 (nix-mode    . eglot-ensure))
+  :custom
+  (eglot-send-changes-idle-time 0.1)
+  :config
+  (setq eglot-autoshutdown t
+	;; Disable logging of events.
+	eglot-events-buffer-size 0)
+  (setq-default eglot-workspace-configuration
+                '(:pylsp (:plugins (:ruff (:enabled t)))
+                  :nil (:formatting (:command ["nixfmt"]))
+                  :gopls (:usePlaceholders t
+					   :staticcheck t
+					   :completeUnimported t
+					   :matcher "CaseSensitive")))
+  ;; uses https://github.com/nix-community/nixd for the LSP server instead of rnix
+  (add-to-list 'eglot-server-programs '(nix-mode . ("nil"))))
+
+(use-package emacs-lisp-mode
+  :bind (:map emacs-lisp-mode-map
+              ("C-c C-r" . eval-region)
+              ("C-c C-d" . eval-defun)
+              ("C-c C-b" . eval-buffer))
+  :hook ((emacs-lisp-mode . flymake-mode)))
+
+(use-package go-mode
+  :hook ((go-mode . (lambda () (setq tab-width 4)))
+         (go-mode . (lambda () (add-hook 'before-save-hook 'eglot-format-buffer nil t))))
+  :bind (:map go-mode-map
+              ("C-c C-c" . compile))
+  :config
+  (with-eval-after-load 'exec-path-from-shell
+    (exec-path-from-shell-copy-envs '("GOPATH" "GOBIN"))))
+
+(use-package gotest
+  :after go-mode
+  :custom
+  (go-test-verbose t))
+
+(use-package nix-mode
+  :hook ((nix-mode . (lambda () (add-hook 'before-save-hook 'eglot-format-buffer nil t))))
+  :custom
+  (nix-indent-function 'nix-indent-line))
+
+(use-package python-mode)
+
+(use-package ruby-mode)
+
+(use-package json-mode)
+
+(use-package json-reformat
+  :after json-mode)
+
+(use-package jq-mode
+  :mode "\\.jq\\'")
+
+(use-package terraform-mode
+  :mode "\.tf\\'")
+
+(use-package hcl-mode
+  :mode "\.nomad\\'")
+
+(use-package toml-mode)
+
+(use-package yaml-mode)
+
+(use-package docker
+  :bind ("C-c d" . docker)
+  :diminish
+  :init
+  (use-package docker-image   :commands docker-images)
+  (use-package docker-volume  :commands docker-volumes)
+  (use-package docker-network :commands docker-containers)
+  (use-package docker-compose :commands docker-compose)
+
+  (use-package docker-container
+    :commands docker-containers
+    :custom
+    (docker-containers-shell-file-name "/bin/bash")
+    (docker-containers-show-all nil)))
+
+(use-package docker-compose-mode
+  :mode "docker-compose.*\.yml\\'")
+
+(use-package dockerfile-mode
+  :mode "Dockerfile[a-zA-Z.-]*\\'")
+
+(use-package protobuf-mode
+  :mode "\\.proto\\'")
+
+(use-package css-mode
+  :custom
+  (css-indent-offset 2)
+  (cssm-indent-level 1))
+
+(provide 'init-programming)
+
+;;; init-programming.el ends here
diff --git a/configs/users/fcuny/emacs/site-lisp/init-text.el b/configs/users/fcuny/emacs/site-lisp/init-text.el
new file mode 100644
index 0000000..aee8889
--- /dev/null
+++ b/configs/users/fcuny/emacs/site-lisp/init-text.el
@@ -0,0 +1,128 @@
+;;; init-text.el --- Configure text modes -*- lexical-binding: t -*-
+;; Author: Franck Cuny <franck@fcuny.net>
+
+;;; Commentary:
+
+;; Configure completions
+
+;;; Code:
+
+(use-package flyspell
+  :hook ((text-mode       . flyspell-mode)
+         (org-mode        . flyspell-mode)
+         (git-commit-mode . flyspell-mode)
+         (prog-mode       . flyspell-prog-mode))
+  :diminish flyspell-mode
+  :custom
+  (ispell-program-name "aspell")
+  (ispell-silently-savep t)
+  (ispell-dictionary "en_US")
+  (ispell-local-dictionary "en_US")
+  (ispell-extra-args '("--camel-case")))
+
+(use-package markdown-mode
+  :mode (("\\`README\\.md\\'" . gfm-mode)
+         ("\\.md\\'"          . markdown-mode)
+         ("\\.markdown\\'"    . markdown-mode))
+  :custom
+  (markdown-command "pandoc -f markdown_github+smart")
+  (markdown-command-needs-filename t)
+  (markdown-enable-math t)
+  (markdown-open-command "marked")
+  :init
+  (setq markdown-command "multimarkdown"))
+
+(use-package org
+  :hook
+  (org-mode . turn-on-flyspell)
+  (org-mode . visual-line-mode)
+  (org-mode . org-indent-mode)
+
+  :config
+  (font-lock-add-keywords 'org-mode
+                          '(("^ *\\(-\\) "
+                             (0 (ignore (compose-region (match-beginning 1) (match-end 1) "•"))))))
+
+  :custom
+  (org-directory "~/Documents/org")
+  (org-default-notes-file (expand-file-name "notes.org" org-directory))
+
+  (org-startup-folded t)
+  (org-startup-indented t)
+  (org-startup-with-inline-images t)
+
+  ;; enable todo and checkbox dependencies
+  (org-enforce-todo-dependencies t)
+  (org-enforce-todo-checkbox-dependencies t)
+
+  ;; quick access for todo states
+  (org-todo-keywords
+   '((sequence "TODO(t)" "NEXT(n)" "WAITING(w!)" "SOMEDAY(S!)" "|" "DONE(d)")
+     (sequence "|" "CANCELLED(c)")))
+
+  (org-log-done 'time)
+  (org-log-into-drawer t)
+
+  ;; no empty lines between items
+  (org-blank-before-new-entry '((heading . nil) (plain-list-item . nil)))
+
+  (org-hide-emphasis-markers t)
+  (org-hide-leading-stars t)
+  (org-pretty-entities t)
+
+  (org-return-follows-link t)
+
+  (org-export-backends '(html md))
+
+  (org-imenu-depth 4)
+
+  (org-insert-heading-respect-content t)
+
+  (org-outline-path-complete-in-steps nil)
+
+  (org-src-fontify-natively t)
+  (org-src-preserve-indentation t)
+  (org-src-tab-acts-natively t)
+  (org-src-window-setup 'current-window)
+
+  (org-yank-adjusted-subtrees t)
+
+  (org-structure-template-alist
+   '(("s" . "src")
+     ("E" . "src emacs-lisp")
+     ("p" . "src python")
+     ("e" . "example")
+     ("q" . "quote"))))
+
+(use-package org-agenda
+  :ensure nil
+  :after org
+  :bind
+  ("C-c a" . org-agenda)
+  :custom
+  (org-agenda-start-on-weekday 1))
+
+(use-package denote
+  :defer t
+  :custom
+  (denote-sort-keywords t)
+  :hook
+  (dired-mode . denote-dired-mode)
+  :custom-face
+  (denote-faces-link ((t (:slant italic))))
+  :init
+  (require 'denote-org)
+  :bind
+  (("C-c w d b" . denote-find-backlink)
+   ("C-c w d d" . denote-date)
+   ("C-c w d l" . denote-find-link)
+   ("C-c w d h" . denote-org-link-to-heading)
+   ("C-c w d i" . denote-link-or-create)
+   ("C-c w d k" . denote-rename-file-keywords)
+   ("C-c w d n" . denote)
+   ("C-c w d r" . denote-rename-file)
+   ("C-c w d R" . denote-rename-file-using-front-matter)))
+
+(provide 'init-text)
+
+;;; init-text.el ends here
diff --git a/configs/users/fcuny/emacs/site-lisp/init-ui.el b/configs/users/fcuny/emacs/site-lisp/init-ui.el
new file mode 100644
index 0000000..51ec598
--- /dev/null
+++ b/configs/users/fcuny/emacs/site-lisp/init-ui.el
@@ -0,0 +1,50 @@
+;;; init-ui.el --- User interface config. -*- lexical-binding: t -*-
+
+;;; Commentary:
+
+;; User interface settings.
+
+;;; Code:
+
+(use-package whitespace
+  :init
+  (global-whitespace-mode t)
+  :custom
+  (whitespace-style '(face
+		      tabs
+		      tab-mark
+		      trailing
+		      missing-newline-at-eof)))
+
+(use-package fringe
+  :custom (fringe-mode '(8 . 0)))
+
+;; | 数字 | アルファベット | 日本語 | 絵文字 |
+;; | 0123 | abcdefghijklmn | あいう | 🍎🍎🍎 |
+(set-face-attribute 'default nil :family "Source Code Pro" :height 140)
+
+(use-package modus-themes
+  :custom
+  (modus-themes-italic-constructs t)
+  (modus-themes-syntax '(alt-syntax green-strings))
+  (modus-themes-mode-line '(moody accented borderless))
+  (modus-themes-tabs-accented t)
+
+  (modus-themes-completions
+      '((matches . (extrabold background))
+        (selection . (semibold accented))
+        (popup . (accented))))
+
+  (modus-themes-fringe 'subtle)
+  (modus-themes-lang-checkers '(text-also straight-underline))
+  (modus-themes-hl-line '(accented))
+  (modus-themes-subtle-line-numbers t)
+  (modus-themes-markup '(bold italic))
+  (modus-themes-paren-match '(bold))
+  (modus-themes-region '())
+
+  :init
+  (load-theme 'modus-operandi-tinted t))
+
+(provide 'init-ui)
+;;; init-ui.el ends here
diff --git a/nix/users/fcuny/configs/emacs/early-init.el b/nix/users/fcuny/configs/emacs/early-init.el
deleted file mode 100644
index 3953c90..0000000
--- a/nix/users/fcuny/configs/emacs/early-init.el
+++ /dev/null
@@ -1,45 +0,0 @@
-;;; early-init.el --- Early initialization -*- lexical-binding: t -*-
-
-;;; Commentary:
-
-;;; Code:
-
-;; Startup speed, annoyance suppression
-(setq gc-cons-threshold 10000000)
-(setq byte-compile-warnings '(not obsolete))
-(setq warning-suppress-log-types '((comp) (bytecomp)))
-(setq native-comp-async-report-warnings-errors 'silent)
-
-;; Silence startup message
-(setq inhibit-startup-echo-area-message (user-login-name))
-
-;; Default frame configuration: full screen, good-looking title bar on macOS
-(setq frame-resize-pixelwise t)
-(setq default-frame-alist '((fullscreen . maximized)
-			    ;; Setting the face in here prevents flashes of
-			    ;; color as the theme gets activated
-			    (ns-appearance . light)
-			    (ns-transparent-titlebar . t)))
-
-;; disable GUI elements
-(scroll-bar-mode -1)      ; hide the scroll bar
-(tool-bar-mode -1)        ; hide the tool bar
-(menu-bar-mode +1)        ; show the menu
-(blink-cursor-mode -1)    ; don't blink the cursor
-
-(setq make-pointer-invisible t)  ;; hide cursor while typing
-(setq use-dialog-box nil)        ;; do not show GUI dialogs
-(setq inhibit-startup-screen t)  ;; hide the startup screen
-
-;; use utf-8 everywhere
-(set-default-coding-systems 'utf-8)
-
-;; `use-package' is builtin since 29.
-;; These variables must be set before loading `use-package'.
-(setq use-package-always-ensure nil
-      use-package-always-defer t
-      use-package-enable-imenu-support t)
-
-(set-face-attribute 'default nil :family "Source Code Pro" :height 150)
-
-;;; early-init.el ends here
diff --git a/nix/users/fcuny/configs/emacs/init.el b/nix/users/fcuny/configs/emacs/init.el
deleted file mode 100644
index 973e4ad..0000000
--- a/nix/users/fcuny/configs/emacs/init.el
+++ /dev/null
@@ -1,42 +0,0 @@
-;;; init.el --- This is where all emacs start. -*- lexical-binding: t -*-
-
-;;; Commentary:
-
-;;; Code:
-
-(add-to-list 'load-path (concat user-emacs-directory (convert-standard-filename "site-lisp/")))
-
-(use-package exec-path-from-shell
-  :custom
-  (exec-path-from-shell-variables '("PATH" "MANPATH" "GOPATH" "GOBIN" "ASPELL_CONF"))
-  :init (exec-path-from-shell-initialize))
-
-(require 'init-base)
-(require 'init-ui)
-(require 'init-completion)
-(require 'init-text)
-(require 'init-programming)
-(require 'init-llm)
-
-(use-package server
-  :config
-  (setq server-client-instructions nil)
-  (unless (server-running-p)
-    (server-start)))
-
-(use-package eshell
-  :commands (eshell eshell-command)
-  :bind (("C-r" . consult-history))
-  :custom
-  (eshell-hist-ignoredups t)
-  (eshell-history-size 50000)
-  (eshell-ls-dired-initial-args '("-h"))
-  (eshell-ls-initial-args "-h")
-  (eshell-ls-exclude-regexp "~\\'")
-  (eshell-save-history-on-exit t)
-  (eshell-stringify-t nil)
-  (eshell-term-name "ansi"))
-
-;;; init.el ends here
-;; byte-compile-warnings: (not docstrings lexical noruntime)
-;; End:
diff --git a/nix/users/fcuny/configs/emacs/site-lisp/init-base.el b/nix/users/fcuny/configs/emacs/site-lisp/init-base.el
deleted file mode 100644
index 7c884ab..0000000
--- a/nix/users/fcuny/configs/emacs/site-lisp/init-base.el
+++ /dev/null
@@ -1,173 +0,0 @@
-;;; init-base.el --- base configuration -*- lexical-binding: t -*-
-;; Author: Franck Cuny <franck@fcuny.net>
-
-;;; Commentary:
-
-;; commentary
-
-;;; Code:
-
-(setq backup-inhibited t)   ;; no backups
-(setq create-lockfiles nil) ;; don't use a lock file
-
-(setq auto-save-default nil)                            ;; no auto save
-(setq confirm-kill-emacs #'yes-or-no-p)                 ;; ask before killing emacs
-(setq cursor-in-non-selected-windows nil)               ;; keep cursors and highlights in current window only
-(setq delete-by-moving-to-trash t)                      ;; delete files by moving them to the trash
-(setq highlight-nonselected-windows nil)                ;; don't highlight inactive windows
-(setq history-delete-duplicates t)                      ;; delete duplicate from history
-(setq initial-major-mode 'fundamental-mode)             ;; default mode for the scratch buffer
-(setq initial-scratch-message "")                       ;; makes the scratch buffer empty
-(setq midnight-period (* 3600 6))                       ;; clear buffer every 6 hours
-(setq mode-line-default-help-echo nil)                  ;; don't say anything on mode-line mouseover
-(setq require-final-newline t)                          ;; ensure a new line is present at the bottom of files
-(setq ring-bell-function 'ignore)                       ;; really no bell
-(setq sentence-end-double-space nil)                    ;; it matters for filling
-(setq use-short-answers t)                              ;; use y-or-n
-(setq visible-bell nil)                                 ;; no bell
-(setq bidi-display-reordering nil)                      ;; disable bidirectional text support for slight performance bonus
-(setq column-number-mode t)                             ;; show column number in the mode line
-
-(global-set-key (kbd "M-j") 'join-line)
-
-(use-package recentf
-  :hook (after-init . recentf-mode)
-  :custom
-  (recentf-max-saved-items 1000)
-  (recentf-max-menu-items 25)
-  (recentf-save-file-modes nil)
-  (recentf-keep nil)
-  (recentf-auto-cleanup nil)
-  (recentf-initialize-file-name-history nil)
-  (recentf-filename-handlers nil)
-  (recentf-show-file-shortcuts-flag nil))
-
-(use-package midnight
-  :custom
-  ;; every 6 hours
-  (midnight-period (* 3600 6)))
-
-(use-package imenu
-  :config
-  (setq imenu-auto-rescan t))
-
-(use-package autorevert
-  :hook (after-init . global-auto-revert-mode)
-  :custom
-  (auto-revert-use-notify nil))
-
-(use-package time
-  :commands (world-clock)
-  :hook (after-init . display-time-mode)
-  :config
-  (setq display-time-format " %a %e %b, %H:%M ")
-  (setq display-time-24hr-format t)
-  (setq display-time-interval 60)
-  (setq display-time-default-load-average nil)
-  (setq display-time-world-list t)
-
-  ;; M-x shell RET timedatectl list-timezones
-  (setq zoneinfo-style-world-list '(("America/Los_Angeles" "Berkeley")
-				    ("America/Chicago" "Chicago")
-				    ("UTC" "UTC")
-				    ("Europe/Paris" "Paris")))
-
-  ;; M-x world-clock
-  (setq world-clock-list t)
-  (setq world-clock-time-format "%z %R	%a %d %b (%Z)")
-  (setq world-clock-buffer-name "*world-clock*") ; Placement handled by `display-buffer-alist'
-  (setq world-clock-timer-enable t)
-  (setq world-clock-timer-second 60))
-
-(use-package ibuffer
-  :bind ("C-x C-b" . ibuffer)
-  :custom
-  (ibuffer-expert t)
-  (ibuffer-show-empty-filter-groups nil)
-  (ibuffer-jump-offer-only-visible-buffers t)
-  (ibuffer-never-show-predicates '("^ "))
-  (ibuffer-use-other-window t)
-  (ibuffer-filter-group-name-face '(:inherit (font-lock-string-face bold))))
-
-(use-package which-key
-  :diminish
-  :hook (after-init . which-key-mode))
-
-(use-package saveplace
-  :config
-  (save-place-mode t))
-
-(use-package savehist
-  :hook (after-init . savehist-mode)
-  :custom
-  (savehist-file (locate-user-emacs-file "savehist"))
-  (history-length 100)
-  (history-delete-duplicates t)
-  (savehist-save-minibuffer-history t))
-
-(use-package project
-  :bind
-  (("C-x p ." . project-dired)
-   ("C-x p <return>" . project-dired))
-  :custom
-  (project-switch-commands
-   '(
-     (consult-project-buffer "buffer" ?b)
-     (project-dired "dired" ?d)
-     (magit-project-status "magit status" ?g)
-     (project-find-file "find file" ?p)
-     (consult-ripgrep "rigprep" ?r)))
-  (setq project-mode-line t)
-  (setq project-key-prompt-style t))
-
- ; Emacs 30
-
-(use-package rg
-  :custom
-  (rg-group-result t)
-  (rg-show-columns t)
-  (rg-align-line-number-field-length 3)
-  (rg-align-column-number-field-length 3)
-  (rg-align-line-column-separator "#")
-  (rg-align-position-content-separator "|")
-  (rg-hide-command nil)
-  (rg-align-position-numbers t)
-  (rg-command-line-flags '("--follow")))
-
-(use-package dired
-  :hook (dired-mode . dired-omit-mode)
-  :bind (:map dired-mode-map
-              ( "."     . dired-omit-mode))
-  :custom
-  (dired-omit-files (rx (seq bol ".")))
-  (dired-use-ls-dired t)
-  (dired-clean-up-buffers-too nil)
-  (dired-dwim-target t)
-  (dired-hide-details-hide-information-lines nil)
-  (dired-hide-details-hide-symlink-targets nil)
-  (dired-recursive-copies 'always)
-  (dired-recursive-deletes 'always)
-  (dired-no-confirm
-   '(byte-compile chgrp chmod chown copy hardlink symlink touch)))
-
-(defun my/rename-this-buffer-and-file ()
-  "Renames current buffer and file it is visiting."
-  (interactive)
-  (let ((name (buffer-name))
-        (filename (buffer-file-name))
-        (read-file-name-function 'read-file-name-default))
-    (if (not (and filename (file-exists-p filename)))
-        (error "Buffer '%s' is not visiting a file!" name)
-      (let ((new-name (read-file-name "New name: " filename)))
-        (cond ((get-buffer new-name)
-               (error "A buffer named '%s' already exists!" new-name))
-              (t
-               (rename-file filename new-name 1)
-               (rename-buffer new-name)
-               (set-visited-file-name new-name)
-               (set-buffer-modified-p nil)
-               (message "File '%s' successfully renamed to '%s'" name (file-name-nondirectory new-name))))))))
-
-(provide 'init-base)
-
-;;; init-base.el ends here
diff --git a/nix/users/fcuny/configs/emacs/site-lisp/init-completion.el b/nix/users/fcuny/configs/emacs/site-lisp/init-completion.el
deleted file mode 100644
index fc01a39..0000000
--- a/nix/users/fcuny/configs/emacs/site-lisp/init-completion.el
+++ /dev/null
@@ -1,54 +0,0 @@
-;;; init-completion.el --- Configure completion -*- lexical-binding: t -*-
-;; Author: Franck Cuny <franck@fcuny.net>
-
-;;; Commentary:
-
-;; Configure completions
-
-;;; Code:
-
-(use-package consult
-  :commands (consult-ripgrep consult-buffer consult-imenu)
-  :bind (("C-c m"   . consult-mode-command)
-	 ("C-x b"   . consult-buffer)
-	 ("C-x r b" . consult-bookmark)
-	 ("C-x p b" . consult-project-buffer)
-	 ("C-c i"   . consult-imenu)
-	 ("M-g e"   . consult-compile-error)
-	 ("M-g M-g" . consult-goto-line)
-	 ("M-g m"   . consult-mark)
-	 ("M-g k"   . consult-global-mark)))
-
-(use-package corfu
-  :custom
-  (corfu-auto t)
-  :bind ("M-/" . completion-at-point)
-  :hook ((after-init . global-corfu-mode)
-         (global-corfu-mode . corfu-popupinfo-mode)))
-
-(use-package cape)
-
-(use-package marginalia
-  :hook (after-init . marginalia-mode))
-
-(use-package orderless
-  :custom
-  (completion-styles '(orderless basic))
-  (completion-category-defaults nil))
-
-(use-package vertico
-  :hook ((after-init . vertico-mode)))
-
-(use-package consult-imenu
-  :after (consult))
-
-(use-package corfu-popupinfo
-  :after corfu
-  :hook (corfu-mode . corfu-popupinfo-mode)
-  :custom
-  (corfu-popupinfo-delay '(0.25 . 0.1))
-  (corfu-popupinfo-hide nil))
-
-(provide 'init-completion)
-
-;;; init-completion.el ends here
diff --git a/nix/users/fcuny/configs/emacs/site-lisp/init-llm.el b/nix/users/fcuny/configs/emacs/site-lisp/init-llm.el
deleted file mode 100644
index 48346e6..0000000
--- a/nix/users/fcuny/configs/emacs/site-lisp/init-llm.el
+++ /dev/null
@@ -1,33 +0,0 @@
-;;; init-llm.el --- Configure LLMs -*- lexical-binding: t -*-
-;; Author: Franck Cuny <franck@fcuny.net>
-
-;;; Commentary:
-
-;; Configure completions
-
-;;; Code:
-(require 's)
-
-(defun fcuny/read-anthropic-key ()
-  "Read and return the API key for anthropic."
-  (with-temp-buffer
-    (insert-file-contents "~/.local/share/agenix/anthropic-api-key")
-    (s-trim (buffer-string))))
-
-(use-package gptel
-  :custom
-  (gptel-default-mode 'org-mode)
-  :config
-  (gptel-make-anthropic "Claude" :stream t :key (lambda () (fcuny/read-anthropic-key))))
-
-(use-package aidermacs
-  :bind ("C-c a" . aidermacs-transient-menu)
-  :custom
-  (aider-args '("--no-check-update" "--no-show-model-warnings"))
-  (aidermacs-default-model "claude-3-7-sonnet-latest")
-  :config
-  (setenv "ANTHROPIC_API_KEY" (fcuny/read-anthropic-key)))
-
-(provide 'init-llm)
-
-;;; init-llm.el ends here
diff --git a/nix/users/fcuny/configs/emacs/site-lisp/init-programming.el b/nix/users/fcuny/configs/emacs/site-lisp/init-programming.el
deleted file mode 100644
index b3712e7..0000000
--- a/nix/users/fcuny/configs/emacs/site-lisp/init-programming.el
+++ /dev/null
@@ -1,198 +0,0 @@
-;;; init-programming.el --- Configure things related to programming -*- lexical-binding: t -*-
-;; Author: Franck Cuny <franck@fcuny.net>
-
-;;; Commentary:
-
-;; Configure things related to programming
-
-;;; Code:
-
-(use-package magit
-  :bind ("C-x g" . magit-status)
-  :custom
-  (magit-diff-refine-hunk t)
-  (magit-repository-directories '(("~/workspace" . 1)))
-  (magit-repolist-column-flag-alist '((magit-untracked-files . "N")
-				      (magit-unstaged-files . "U")
-				      (magit-staged-files . "S")))
-  (magit-repolist-columns '(("Name" 25 magit-repolist-column-ident nil)
-			    ("" 3 magit-repolist-column-flag)
-			    ("Version" 25 magit-repolist-column-version
-			     ((:sort magit-repolist-version<)))
-			    ("B<U" 3 magit-repolist-column-unpulled-from-upstream
-			     ((:right-align t)
-			      (:sort <)))
-			    ("B>U" 3 magit-repolist-column-unpushed-to-upstream
-			     ((:right-align t)
-			      (:sort <)))
-			    ("Path" 99 magit-repolist-column-path nil)))
-  (magit-clone-default-directory "~/workspace/")
-  :config
-  ;; show ANSI colors in the process buffer, so it's easier to read what's going on
-  ;; for some reasons if it's in the `:custom' section it does not get set
-  (setq magit-process-finish-apply-ansi-colors t))
-
-(use-package git-link
-  :defines git-link-remote-alist
-  :bind ("C-c Y" . git-link)
-  :commands (git-link git-link-commit git-link-homepage)
-  :custom
-  (git-link-open-in-browser t)
-  :config
-  ;; sets up roblox git enterprise as a git-link handler
-  (add-to-list 'git-link-remote-alist '("github\\.rblx\\.com" git-link-github))
-  (add-to-list 'git-link-commit-remote-alist '("github\\.rblx\\.com" git-link-commit-github)))
-
-(use-package elec-pair
-  :hook (prog-mode . electric-pair-mode))
-
-(use-package eldoc
-  :diminish
-  :hook ((emacs-lisp-mode) . eldoc-mode)
-  :custom
-  (eldoc-idle-delay 1)
-  (eldoc-documentation-strategy #'eldoc-documentation-default)
-  ;; Don't resize the echo area if the documentation is longer. This is very
-  ;; distracting when combined with Eglot's highlight functionality.
-  (eldoc-echo-area-use-multiline-p nil))
-
-(use-package compile
-  :hook (compilation-filter . ansi-color-compilation-filter)
-  :custom
-  (compilation-always-kill t)
-  (compilation-context-lines 10)
-  (compilation-disable-input t)
-  (compilation-scroll-output 'first-error)
-  (compilation-scroll-output t)
-  (compilation-skip-threshold 2)
-  ;; Save all buffers on M-x `compile'
-  (compilation-ask-about-save nil))
-
-(use-package direnv
-  :custom
-  (direnv-always-show-summary nil)
-  :config
-  (direnv-mode))
-
-(use-package flymake
-  :bind (:prefix "C-c !"
-		 :prefix-map flymake-prefix-map
-		 ("l" . consult-flymake)
-		 ("d" . flymake-show-buffer-diagnostics)
-		 ("D" . flymake-show-project-diagnostics)
-		 ("n" . flymake-goto-next-error)
-		 ("p" . flymake-goto-prev-error))
-  :hook
-  (prog-mode . flymake-mode)
-  :custom
-  (flymake-start-on-save-buffer t)
-  (flymake-fringe-indicator-position 'left-fringe)
-  (flymake-suppress-zero-counters t)
-  (flymake-proc-compilation-prevents-syntax-check t)
-  (flymake-no-changes-timeout 9999)
-  (elisp-flymake-byte-compile-load-path load-path))
-
-(use-package eglot
-  :bind (:map eglot-mode-map
-	      ("C-c l a" . eglot-code-actions)
-	      ("C-c l r" . eglot-rename)
-	      ("C-c l f" . eglot-format-buffer))
-  :hook ((go-mode     . eglot-ensure)
-	 (python-mode . eglot-ensure)
-	 (nix-mode    . eglot-ensure))
-  :custom
-  (eglot-send-changes-idle-time 0.1)
-  :config
-  (setq eglot-autoshutdown t
-	;; Disable logging of events.
-	eglot-events-buffer-size 0)
-  (setq-default eglot-workspace-configuration
-                '(:pylsp (:plugins (:ruff (:enabled t)))
-                  :nil (:formatting (:command ["nixfmt"]))
-                  :gopls (:usePlaceholders t
-					   :staticcheck t
-					   :completeUnimported t
-					   :matcher "CaseSensitive")))
-  ;; uses https://github.com/nix-community/nixd for the LSP server instead of rnix
-  (add-to-list 'eglot-server-programs '(nix-mode . ("nil"))))
-
-(use-package emacs-lisp-mode
-  :bind (:map emacs-lisp-mode-map
-              ("C-c C-r" . eval-region)
-              ("C-c C-d" . eval-defun)
-              ("C-c C-b" . eval-buffer))
-  :hook ((emacs-lisp-mode . flymake-mode)))
-
-(use-package go-mode
-  :hook ((go-mode . (lambda () (setq tab-width 4)))
-         (go-mode . (lambda () (add-hook 'before-save-hook 'eglot-format-buffer nil t))))
-  :bind (:map go-mode-map
-              ("C-c C-c" . compile))
-  :config
-  (with-eval-after-load 'exec-path-from-shell
-    (exec-path-from-shell-copy-envs '("GOPATH" "GOBIN"))))
-
-(use-package gotest
-  :after go-mode
-  :custom
-  (go-test-verbose t))
-
-(use-package nix-mode
-  :hook ((nix-mode . (lambda () (add-hook 'before-save-hook 'eglot-format-buffer nil t))))
-  :custom
-  (nix-indent-function 'nix-indent-line))
-
-(use-package python-mode)
-
-(use-package ruby-mode)
-
-(use-package json-mode)
-
-(use-package json-reformat
-  :after json-mode)
-
-(use-package jq-mode
-  :mode "\\.jq\\'")
-
-(use-package terraform-mode
-  :mode "\.tf\\'")
-
-(use-package hcl-mode
-  :mode "\.nomad\\'")
-
-(use-package toml-mode)
-
-(use-package yaml-mode)
-
-(use-package docker
-  :bind ("C-c d" . docker)
-  :diminish
-  :init
-  (use-package docker-image   :commands docker-images)
-  (use-package docker-volume  :commands docker-volumes)
-  (use-package docker-network :commands docker-containers)
-  (use-package docker-compose :commands docker-compose)
-
-  (use-package docker-container
-    :commands docker-containers
-    :custom
-    (docker-containers-shell-file-name "/bin/bash")
-    (docker-containers-show-all nil)))
-
-(use-package docker-compose-mode
-  :mode "docker-compose.*\.yml\\'")
-
-(use-package dockerfile-mode
-  :mode "Dockerfile[a-zA-Z.-]*\\'")
-
-(use-package protobuf-mode
-  :mode "\\.proto\\'")
-
-(use-package css-mode
-  :custom
-  (css-indent-offset 2)
-  (cssm-indent-level 1))
-
-(provide 'init-programming)
-
-;;; init-programming.el ends here
diff --git a/nix/users/fcuny/configs/emacs/site-lisp/init-text.el b/nix/users/fcuny/configs/emacs/site-lisp/init-text.el
deleted file mode 100644
index aee8889..0000000
--- a/nix/users/fcuny/configs/emacs/site-lisp/init-text.el
+++ /dev/null
@@ -1,128 +0,0 @@
-;;; init-text.el --- Configure text modes -*- lexical-binding: t -*-
-;; Author: Franck Cuny <franck@fcuny.net>
-
-;;; Commentary:
-
-;; Configure completions
-
-;;; Code:
-
-(use-package flyspell
-  :hook ((text-mode       . flyspell-mode)
-         (org-mode        . flyspell-mode)
-         (git-commit-mode . flyspell-mode)
-         (prog-mode       . flyspell-prog-mode))
-  :diminish flyspell-mode
-  :custom
-  (ispell-program-name "aspell")
-  (ispell-silently-savep t)
-  (ispell-dictionary "en_US")
-  (ispell-local-dictionary "en_US")
-  (ispell-extra-args '("--camel-case")))
-
-(use-package markdown-mode
-  :mode (("\\`README\\.md\\'" . gfm-mode)
-         ("\\.md\\'"          . markdown-mode)
-         ("\\.markdown\\'"    . markdown-mode))
-  :custom
-  (markdown-command "pandoc -f markdown_github+smart")
-  (markdown-command-needs-filename t)
-  (markdown-enable-math t)
-  (markdown-open-command "marked")
-  :init
-  (setq markdown-command "multimarkdown"))
-
-(use-package org
-  :hook
-  (org-mode . turn-on-flyspell)
-  (org-mode . visual-line-mode)
-  (org-mode . org-indent-mode)
-
-  :config
-  (font-lock-add-keywords 'org-mode
-                          '(("^ *\\(-\\) "
-                             (0 (ignore (compose-region (match-beginning 1) (match-end 1) "•"))))))
-
-  :custom
-  (org-directory "~/Documents/org")
-  (org-default-notes-file (expand-file-name "notes.org" org-directory))
-
-  (org-startup-folded t)
-  (org-startup-indented t)
-  (org-startup-with-inline-images t)
-
-  ;; enable todo and checkbox dependencies
-  (org-enforce-todo-dependencies t)
-  (org-enforce-todo-checkbox-dependencies t)
-
-  ;; quick access for todo states
-  (org-todo-keywords
-   '((sequence "TODO(t)" "NEXT(n)" "WAITING(w!)" "SOMEDAY(S!)" "|" "DONE(d)")
-     (sequence "|" "CANCELLED(c)")))
-
-  (org-log-done 'time)
-  (org-log-into-drawer t)
-
-  ;; no empty lines between items
-  (org-blank-before-new-entry '((heading . nil) (plain-list-item . nil)))
-
-  (org-hide-emphasis-markers t)
-  (org-hide-leading-stars t)
-  (org-pretty-entities t)
-
-  (org-return-follows-link t)
-
-  (org-export-backends '(html md))
-
-  (org-imenu-depth 4)
-
-  (org-insert-heading-respect-content t)
-
-  (org-outline-path-complete-in-steps nil)
-
-  (org-src-fontify-natively t)
-  (org-src-preserve-indentation t)
-  (org-src-tab-acts-natively t)
-  (org-src-window-setup 'current-window)
-
-  (org-yank-adjusted-subtrees t)
-
-  (org-structure-template-alist
-   '(("s" . "src")
-     ("E" . "src emacs-lisp")
-     ("p" . "src python")
-     ("e" . "example")
-     ("q" . "quote"))))
-
-(use-package org-agenda
-  :ensure nil
-  :after org
-  :bind
-  ("C-c a" . org-agenda)
-  :custom
-  (org-agenda-start-on-weekday 1))
-
-(use-package denote
-  :defer t
-  :custom
-  (denote-sort-keywords t)
-  :hook
-  (dired-mode . denote-dired-mode)
-  :custom-face
-  (denote-faces-link ((t (:slant italic))))
-  :init
-  (require 'denote-org)
-  :bind
-  (("C-c w d b" . denote-find-backlink)
-   ("C-c w d d" . denote-date)
-   ("C-c w d l" . denote-find-link)
-   ("C-c w d h" . denote-org-link-to-heading)
-   ("C-c w d i" . denote-link-or-create)
-   ("C-c w d k" . denote-rename-file-keywords)
-   ("C-c w d n" . denote)
-   ("C-c w d r" . denote-rename-file)
-   ("C-c w d R" . denote-rename-file-using-front-matter)))
-
-(provide 'init-text)
-
-;;; init-text.el ends here
diff --git a/nix/users/fcuny/configs/emacs/site-lisp/init-ui.el b/nix/users/fcuny/configs/emacs/site-lisp/init-ui.el
deleted file mode 100644
index 51ec598..0000000
--- a/nix/users/fcuny/configs/emacs/site-lisp/init-ui.el
+++ /dev/null
@@ -1,50 +0,0 @@
-;;; init-ui.el --- User interface config. -*- lexical-binding: t -*-
-
-;;; Commentary:
-
-;; User interface settings.
-
-;;; Code:
-
-(use-package whitespace
-  :init
-  (global-whitespace-mode t)
-  :custom
-  (whitespace-style '(face
-		      tabs
-		      tab-mark
-		      trailing
-		      missing-newline-at-eof)))
-
-(use-package fringe
-  :custom (fringe-mode '(8 . 0)))
-
-;; | 数字 | アルファベット | 日本語 | 絵文字 |
-;; | 0123 | abcdefghijklmn | あいう | 🍎🍎🍎 |
-(set-face-attribute 'default nil :family "Source Code Pro" :height 140)
-
-(use-package modus-themes
-  :custom
-  (modus-themes-italic-constructs t)
-  (modus-themes-syntax '(alt-syntax green-strings))
-  (modus-themes-mode-line '(moody accented borderless))
-  (modus-themes-tabs-accented t)
-
-  (modus-themes-completions
-      '((matches . (extrabold background))
-        (selection . (semibold accented))
-        (popup . (accented))))
-
-  (modus-themes-fringe 'subtle)
-  (modus-themes-lang-checkers '(text-also straight-underline))
-  (modus-themes-hl-line '(accented))
-  (modus-themes-subtle-line-numbers t)
-  (modus-themes-markup '(bold italic))
-  (modus-themes-paren-match '(bold))
-  (modus-themes-region '())
-
-  :init
-  (load-theme 'modus-operandi-tinted t))
-
-(provide 'init-ui)
-;;; init-ui.el ends here
diff --git a/nix/users/fcuny/emacs.nix b/nix/users/fcuny/emacs.nix
index 0b4878f..f4e3719 100644
--- a/nix/users/fcuny/emacs.nix
+++ b/nix/users/fcuny/emacs.nix
@@ -1,4 +1,9 @@
-{ pkgs, lib, ... }:
+{
+  configPath,
+  pkgs,
+  lib,
+  ...
+}:
 let
   packages =
     epkgs: with epkgs; [
@@ -56,7 +61,7 @@ let
   ];
   mkEmacsFile = file: {
     ".config/emacs/${file}" = {
-      source = ./configs/emacs/${file};
+      source = "${configPath}/emacs/${file}";
     };
   };
 in
-- 
cgit v1.2.3