From 618748a87e07390562f2b4e39a6748fce8b41550 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Wed, 15 Jul 2026 00:34:27 +0200 Subject: [PATCH] feat: initial doom config; install oxocarbon theme --- modules/home/doom-config/config.el | 81 +++++++ modules/home/doom-config/init.el | 201 ++++++++++++++++ modules/home/doom-config/packages.el | 55 +++++ .../themes/doom-oxocarbon-theme.el | 214 ++++++++++++++++++ 4 files changed, 551 insertions(+) create mode 100644 modules/home/doom-config/config.el create mode 100644 modules/home/doom-config/init.el create mode 100644 modules/home/doom-config/packages.el create mode 100644 modules/home/doom-config/themes/doom-oxocarbon-theme.el diff --git a/modules/home/doom-config/config.el b/modules/home/doom-config/config.el new file mode 100644 index 0000000..fd1c8c5 --- /dev/null +++ b/modules/home/doom-config/config.el @@ -0,0 +1,81 @@ +;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- + +;; Place your private configuration here! Remember, you do not need to run 'doom +;; sync' after modifying this file! + + +;; Some functionality uses this to identify you, e.g. GPG configuration, email +;; clients, file templates and snippets. It is optional. +;; (setq user-full-name "John Doe" +;; user-mail-address "john@doe.com") + +;; Doom exposes five (optional) variables for controlling fonts in Doom: +;; +;; - `doom-font' -- the primary font to use +;; - `doom-variable-pitch-font' -- a non-monospace font (where applicable) +;; - `doom-big-font' -- used for `doom-big-font-mode'; use this for +;; presentations or streaming. +;; - `doom-symbol-font' -- for symbols +;; - `doom-serif-font' -- for the `fixed-pitch-serif' face +;; +;; See 'C-h v doom-font' for documentation and more examples of what they +;; accept. For example: +;; +;;(setq doom-font (font-spec :family "Fira Code" :size 12 :weight 'semi-light) +;; doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13)) +;; +;; If you or Emacs can't find your font, use 'M-x describe-font' to look them +;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to +;; refresh your font settings. If Emacs still can't find your font, it likely +;; wasn't installed correctly. Font issues are rarely Doom issues! + +;; There are two ways to load a theme. Both assume the theme is installed and +;; available. You can either set `doom-theme' or manually load a theme with the +;; `load-theme' function. This is the default: +;; (setq doom-theme 'doom-one) ; default +(setq doom-theme 'doom-oxocarbon) +(setq doom-font (font-spec :family "scientifica" :size 24)) + +;; (after! doom-themes +;; (custom-set-faces! +;; '(default :foreground "#bbc2cf"))) + +;; This determines the style of line numbers in effect. If set to `nil', line +;; numbers are disabled. For relative line numbers, set this to `relative'. +(setq display-line-numbers-type t) + +;; If you use `org' and don't want your org files in the default location below, +;; change `org-directory'. It must be set before org loads! +(setq org-directory "~/org/") + + +;; Whenever you reconfigure a package, make sure to wrap your config in an +;; `with-eval-after-load' block, otherwise Doom's defaults may override your +;; settings. E.g. +;; +;; (with-eval-after-load 'PACKAGE +;; (setq x y)) +;; +;; The exceptions to this rule: +;; +;; - Setting file/directory variables (like `org-directory') +;; - Setting variables which explicitly tell you to set them before their +;; package is loaded (see 'C-h v VARIABLE' to look them up). +;; - Setting doom variables (which start with 'doom-' or '+'). +;; +;; Here are some additional functions/macros that will help you configure Doom. +;; +;; - `load!' for loading external *.el files relative to this one +;; - `add-load-path!' for adding directories to the `load-path', relative to +;; this file. Emacs searches the `load-path' when you load packages with +;; `require' or `use-package'. +;; - `map!' for binding new keys +;; +;; To get information about any of these functions/macros, move the cursor over +;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k'). +;; This will open documentation for it, including demos of how they are used. +;; Alternatively, use `C-h o' to look up a symbol (functions, variables, faces, +;; etc). +;; +;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how +;; they are implemented. diff --git a/modules/home/doom-config/init.el b/modules/home/doom-config/init.el new file mode 100644 index 0000000..222f13e --- /dev/null +++ b/modules/home/doom-config/init.el @@ -0,0 +1,201 @@ +;;; $DOOMDIR/init.el -*- lexical-binding: t; -*- + +;; This file controls what Doom modules are enabled and what order they load +;; in. Remember to run 'doom sync' after modifying it! + +;; NOTE: Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's +;; documentation. There you'll find a link to Doom's Module Index where all of +;; our modules are listed, including what flags they support. + +;; NOTE: Move your cursor over a module's name (or its flags) and press 'K' (or +;; 'C-c c k' for non-vim users) to view its documentation. This works on flags +;; as well (those symbols that start with a plus). +;; +;; Alternatively, press 'gd' (or 'C-c c d') on a module to browse its +;; directory (for easy access to its source code). + +(doom! :input + ;;bidi ; (tfel ot) thgir etirw uoy gnipleh + ;;chinese + ;;japanese + ;;layout ; auie,ctsrnm is the superior home row + + :completion + ;;company ; the ultimate code completion backend + (corfu +orderless) ; complete with cap(f), cape and a flying feather! + ;;helm ; the *other* search engine for love and life + ;;ido ; the other *other* search engine... + ;;ivy ; a search engine for love and life + vertico ; the search engine of the future + + :ui + ;;deft ; notational velocity for Emacs + doom ; what makes DOOM look the way it does + dashboard ; a nifty splash screen for Emacs + ;;doom-quit ; DOOM quit-message prompts when you quit Emacs + (emoji +unicode) ; 🙂 + hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW + indent-guides ; highlighted indent columns + ligatures ; ligatures and symbols to make your code pretty again + ;;minimap ; show a map of the code on the side + modeline ; snazzy, Atom-inspired modeline, plus API + nav-flash ; blink cursor line after big motions + ;;neotree ; a project drawer, like NERDTree for vim + ophints ; highlight the region an operation acts on + (popup +defaults) ; tame sudden yet inevitable temporary windows + ;;smooth-scroll ; So smooth you won't believe it's not butter + tabs ; a tab bar for Emacs + treemacs ; a project drawer, like neotree but cooler + ;;unicode ; extended unicode support for various languages + (vc-gutter +pretty) ; vcs diff in the fringe + vi-tilde-fringe ; fringe tildes to mark beyond EOB + window-select ; visually switch windows + workspaces ; tab emulation, persistence & separate workspaces + ;;zen ; distraction-free coding or writing + + :editor + (evil +everywhere); come to the dark side, we have cookies + file-templates ; auto-snippets for empty files + fold ; (nigh) universal code folding + (format +onsave) ; automated prettiness + ;;god ; run Emacs commands without modifier keys + ;;lispy ; vim for lisp, for people who don't like vim + ;;multiple-cursors ; editing in many places at once + ;;objed ; text object editing for the innocent + ;;parinfer ; turn lisp into python, sort of + ;;rotate-text ; cycle region at point between text candidates + snippets ; my elves. They type so I don't have to + (whitespace +guess +trim) ; a butler for your whitespace + word-wrap ; soft wrapping with language-aware indent + + :emacs + dired ; making dired pretty [functional] + electric ; smarter, keyword-based electric-indent + eww ; the internet is gross + ibuffer ; interactive buffer management + tramp ; remote files at your arthritic fingertips + undo ; persistent, smarter undo for your inevitable mistakes + vc ; version-control and Emacs, sitting in a tree + + :term + eshell ; the elisp shell that works everywhere + ;;shell ; simple shell REPL for Emacs + ;;term ; basic terminal emulator for Emacs + vterm ; almost the best terminal emulation in Emacs + ;;ghostel ; the best terminal emulation in Emacs + + :checkers + syntax ; tasing you for every semicolon you forget + (spell +flyspell) ; tasing you for misspelling mispelling + grammar ; tasing grammar mistake every you make + + :tools + ansible + ;;biblio ; Writes a PhD for you (citation needed) + ;;collab ; buffers with friends + ;;debugger ; stepping through code, to help you add bugs + ;;direnv + docker + editorconfig ; let someone else argue about tabs vs spaces + ;;ein ; tame Jupyter notebooks with emacs + (eval +overlay) ; run code, run (also, repls) + lookup ; navigate your code and its documentation + ;;llm ; when I said you needed friends, I didn't mean... + (lsp +eglot) ; M-x vscode + magit ; a git porcelain for Emacs + ;;make ; run make tasks from Emacs + ;;pass ; password manager for nerds + pdf ; pdf enhancements + ;;terraform ; infrastructure as code + ;;tmux ; an API for interacting with tmux + tree-sitter ; syntax and parsing, sitting in a tree... + ;;upload ; map local to remote projects via ssh/ftp + + :os + (:if (featurep :system 'macos) macos) ; improve compatibility with macOS + ;;tty ; improve the terminal Emacs experience + + :lang + ;;ada ; In strong typing we (blindly) trust + ;;(agda +local) ; types of types of types of types... + ;;beancount ; mind the GAAP + ;;(cc +lsp) ; C > C++ == 1 + ;;clojure ; java with a lisp + ;;common-lisp ; if you've seen one lisp, you've seen them all + ;;coq ; proofs-as-programs + ;;crystal ; ruby at the speed of c + ;;csharp ; unity, .NET, and mono shenanigans + ;;data ; config/data formats + ;;(dart +flutter) ; paint ui and not much else + ;;dhall + ;;elixir ; erlang done right + ;;elm ; care for a cup of TEA? + emacs-lisp ; drown in parentheses + ;;erlang ; an elegant language for a more civilized age + ;;ess ; emacs speaks statistics + ;;factor + ;;faust ; dsp, but you get to keep your soul + ;;fortran ; in FORTRAN, GOD is REAL (unless declared INTEGER) + ;;fsharp ; ML stands for Microsoft's Language + ;;fstar ; (dependent) types and (monadic) effects and Z3 + ;;gdscript ; the language you waited for + (go +lsp) ; the hipster dialect + ;;(graphql +lsp) ; Give queries a REST + ;;(haskell +lsp) ; a language that's lazier than I am + ;;hy ; readability of scheme w/ speed of python + ;;idris ; a language you can depend on + json ; At least it ain't XML + ;;janet ; Fun fact: Janet is me! + ;;(java +lsp) ; the poster child for carpal tunnel syndrome + javascript ; all(hope(abandon(ye(who(enter(here)))))) + ;;julia ; a better, faster MATLAB + ;;kotlin ; a better, slicker Java(Script) + latex ; writing papers in Emacs has never been so fun + ;;lean ; for folks with too much to prove + ;;ledger ; be audit you can be + ;;lua ; one-based indices? one-based indices + markdown ; writing docs for people to ignore + ;;nim ; python + lisp at the speed of c + nix ; I hereby declare "nix geht mehr!" + ;;ocaml ; an objective camel + ;;odin ; C, minus its footguns + org ; organize your plain life in plain text + ;;php ; perl's insecure younger brother + ;;plantuml ; diagrams for confusing people more + ;;graphviz ; diagrams for confusing yourself even more + ;;purescript ; javascript, but functional + ;;python ; beautiful is better than ugly + ;;qt ; the 'cutest' gui framework ever + ;;racket ; a DSL for DSLs + ;;raku ; the artist formerly known as perl6 + ;;rest ; Emacs as a REST client + ;;rst ; ReST in peace + ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} + ;;(rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + ;;scad ; trust the preview, regret the render + ;;scala ; java, but good + ;;(scheme +guile) ; a fully conniving family of lisps + sh ; she sells {ba,z,fi}sh shells on the C xor + ;;sml + ;;solidity ; do you need a blockchain? No. + ;;swift ; who asked for emoji variables? + ;;terra ; Earth and Moon in alignment for performance. + web ; the tubes + ;;yaml ; JSON, but readable + ;;zig ; C, but simpler + + :email + ;;(mu4e +org +gmail) + ;;notmuch + ;;(wanderlust +gmail) + + :app + ;;calendar + ;;emms + ;;everywhere ; *leave* Emacs!? You must be joking + ;;irc ; how neckbeards socialize + (rss +org) ; emacs as an RSS reader + + :config + ;;literate + (default +bindings +smartparens)) diff --git a/modules/home/doom-config/packages.el b/modules/home/doom-config/packages.el new file mode 100644 index 0000000..6f7189a --- /dev/null +++ b/modules/home/doom-config/packages.el @@ -0,0 +1,55 @@ +;;; $DOOMDIR/packages.el -*- lexical-binding: t; no-byte-compile: t -*- + +;; To install a package: +;; +;; 1. Declare them here in a `package!' statement, +;; 2. Run 'doom sync' in the shell, +;; 3. Restart Emacs. +;; +;; Use 'C-h f package\!' to look up documentation for the `package!' macro. + + +;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: +;; (package! some-package) + +;; To install a package directly from a remote git repo, you must specify a +;; `:recipe'. You'll find documentation on what `:recipe' accepts here: +;; https://github.com/radian-software/straight.el#the-recipe-format +;; (package! another-package +;; :recipe (:host github :repo "username/repo")) + +;; If the package you are trying to install does not contain a PACKAGENAME.el +;; file, or is located in a subdirectory of the repo, you'll need to specify +;; `:files' in the `:recipe': +;; (package! this-package +;; :recipe (:host github :repo "username/repo" +;; :files ("some-file.el" "src/lisp/*.el"))) + +;; If you'd like to disable a package included with Doom, you can do so here +;; with the `:disable' property: +;; (package! builtin-package :disable t) + +;; You can override the recipe of a built in package without having to specify +;; all the properties for `:recipe'. These will inherit the rest of its recipe +;; from Doom or MELPA/ELPA/Emacsmirror: +;; (package! builtin-package :recipe (:nonrecursive t)) +;; (package! builtin-package-2 :recipe (:repo "myfork/package")) + +;; Specify a `:branch' to install a package from a particular branch or tag. +;; This is required for some packages whose default branch isn't 'master' (which +;; our package manager can't deal with; see radian-software/straight.el#279) +;; (package! builtin-package :recipe (:branch "develop")) + +;; Use `:pin' to specify a particular commit to install. +;; (package! builtin-package :pin "1a2b3c4d5e") + + +;; Doom's packages are pinned to a specific commit and updated from release to +;; release. The `unpin!' macro allows you to unpin single packages... +;; (unpin! pinned-package) +;; ...or multiple packages +;; (unpin! pinned-package another-pinned-package) +;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) +;; (unpin! t) + +(package! tldr) diff --git a/modules/home/doom-config/themes/doom-oxocarbon-theme.el b/modules/home/doom-config/themes/doom-oxocarbon-theme.el new file mode 100644 index 0000000..215ded1 --- /dev/null +++ b/modules/home/doom-config/themes/doom-oxocarbon-theme.el @@ -0,0 +1,214 @@ +;;; modules/home/doom-config/themes/doom-oxocarbon-theme.el -*- lexical-binding: t; -*- + +;;; doom-oxocarbon-theme.el --- oxocarbon port for Doom Emacs -*- lexical-binding: t; -*- +;; +;; Author: Roman Todd (roman-xo) +;; Maintainer: Roman Todd +;; Source: https://github.com/roman-xo/doom-oxocarbon +;; +;;; Commentary: +;; A Doom-native port of the oxocarbon Neovim theme. +;; +;;; Code: + +(require 'doom-themes) + +;;; Variables + +(defgroup doom-oxocarbon-theme nil + "Options for the `doom-oxocarbon' theme." + :group 'doom-themes) + +(defcustom doom-oxocarbon-brighter-modeline nil + "If non-nil, more vivid colors will be used to style the mode-line." + :group 'doom-oxocarbon-theme + :type 'boolean) + +(defcustom doom-oxocarbon-brighter-comments nil + "If non-nil, comments will be highlighted in more vivid colors." + :group 'doom-oxocarbon-theme + :type 'boolean) + +(defcustom doom-oxocarbon-comment-bg doom-oxocarbon-brighter-comments + "If non-nil, comments will have a subtle, darker background. Enhancing their +legibility." + :group 'doom-oxocarbon-theme + :type 'boolean) + +(defcustom doom-oxocarbon-padded-modeline doom-themes-padded-modeline + "If non-nil, adds a 4px padding to the mode-line. Can be an integer to +determine the exact padding." + :group 'doom-oxocarbon-theme + :type '(choice integer boolean)) + + +;;; Theme definition + +(def-doom-theme doom-oxocarbon + "A dark theme using the oxocarbon color palette" + + ;; name default 256 16 + ((bg '("#111111" nil nil )) ; base00 + (bg-alt '("#262626" nil nil )) ; base01 + (base0 '("#0d0d0d" "black" "black" )) + (base1 '("#161616" "#1e1e1e" "brightblack" )) + (base2 '("#1f1f1f" "#2e2e2e" "brightblack" )) + (base3 '("#262626" "#262626" "brightblack" )) ; base01 + (base4 '("#393939" "#393939" "brightblack" )) ; base02 + (base5 '("#525252" "#525252" "brightblack" )) ; base03 + (base6 '("#6f6f6f" "#6b6b6b" "brightblack" )) + (base7 '("#a0a0a0" "#979797" "brightblack" )) + (base8 '("#f2f2f2" "#dfdfdf" "white" )) ; base05 + (fg '("#f2f2f2" "#f2f2f2" "brightwhite" )) ; base05 + (fg-alt '("#d0d0d0" "#d0d0d0" "white" )) ; base04 + + (grey base5) + (red '("#ee5396" "#ee5396" "red" )) ; base10-red + (orange '("#ff9b5e" "#D08770" "brightred" )) ; custom warm orange + (green '("#42be65" "#42be65" "green" )) ; base13-green + (blue '("#78a9ff" "#78a9ff" "brightblue" )) ; base09-blue + (yellow '("#ECBE7B" "#ECBE7B" "yellow" )) ; doom-one yellow + (violet '("#be95ff" "#be95ff" "brightmagenta")) ; base14-purple + (teal '("#08bdba" "#44b9b1" "brightgreen" )) ; base07-turquoise + (dark-blue '("#4589ff" "#2257A0" "blue" )) ; darker blue variant + (magenta '("#ff7eb6" "#ff7eb6" "magenta" )) ; base12-pink + (cyan '("#3ddbd9" "#3ddbd9" "brightcyan" )) ; base08-cyan + (dark-cyan '("#33b1ff" "#33b1ff" "cyan" )) ; base11-light-blue + + ;; face categories -- required for all themes + (highlight cyan) + (vertical-bar (doom-darken bg 0.25)) + (selection base4) + (builtin violet) + (comments (if doom-oxocarbon-brighter-comments base5 base5)) + (doc-comments dark-cyan) + (constants magenta) + (functions magenta) + (keywords blue) + (methods magenta) + (operators blue) + (type blue) + (strings dark-cyan) + (variables fg) + (numbers dark-cyan) + (region base4) + (error red) + (warning yellow) + (success green) + (vc-modified cyan) + (vc-added green) + (vc-deleted red) + + ;; custom categories + (hidden `(,(car bg-alt) "black" "black")) + (-modeline-bright doom-oxocarbon-brighter-modeline) + (-modeline-pad + (when doom-oxocarbon-padded-modeline + (if (integerp doom-oxocarbon-padded-modeline) doom-oxocarbon-padded-modeline 4))) + + (modeline-fg fg) + (modeline-fg-alt base5) + (modeline-bg + (if -modeline-bright + (doom-darken base3 0.1) + base1)) + (modeline-bg-l + (if -modeline-bright + (doom-darken base3 0.05) + base1)) + (modeline-bg-inactive `(,(doom-darken (car bg-alt) 0.05) ,@(cdr base1))) + (modeline-bg-inactive-l (doom-darken bg 0.1))) + + + ;;;; Base theme face overrides + (((default &override) :background bg :foreground fg) + ((font-lock-comment-face &override) + :background (if doom-oxocarbon-comment-bg (doom-lighten bg 0.05))) + ((line-number &override) :foreground base5) + ((line-number-current-line &override) :foreground fg) + (hl-line :background (doom-blend base3 bg 0.4)) + (mode-line + :background modeline-bg :foreground modeline-fg + :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg))) + (mode-line-inactive + :background modeline-bg-inactive :foreground modeline-fg-alt + :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive))) + (mode-line-emphasis :foreground (if -modeline-bright base8 highlight)) + + ;;;; Font rendering fixes + ((bold &override) :weight 'bold) + ((italic &override) :slant 'italic) + ((bold-italic &override) :weight 'bold :slant 'italic) + + ;;;; css-mode / scss-mode + (css-proprietary-property :foreground orange) + (css-property :foreground fg) + (css-selector :foreground red) + ;;;; doom-modeline + (doom-modeline-bar :background (if -modeline-bright modeline-bg highlight)) + ;;;; elscreen + (elscreen-tab-other-screen-face :background base3 :foreground base1) + ;;;; markdown-mode + (markdown-markup-face :foreground base5) + (markdown-header-face :inherit 'bold :foreground red) + ((markdown-code-face &override) :background (doom-darken bg 0.1)) + ;; outline + ((outline-1 &override) :foreground red :weight 'ultra-bold) + ((outline-2 &override) :foreground fg) + ((outline-3 &override) :foreground blue) + ((outline-4 &override) :foreground teal) + ((outline-5 &override) :foreground cyan) + ((outline-6 &override) :foreground dark-cyan) + ((outline-7 &override) :foreground green) + ((outline-8 &override) :foreground fg) + ;;;; org + (org-block :background (doom-darken bg-alt 0.04)) + (org-block-begin-line :foreground base5 :slant 'italic :background (doom-darken bg 0.04)) + (org-ellipsis :underline nil :background bg :foreground red) + ((org-quote &override) :background base1) + (org-hide :foreground bg) + ;; org meta/property keywords + (org-meta-line :foreground base5) + (org-document-title :foreground cyan :weight 'bold) + (org-document-info :foreground cyan) + (org-document-info-keyword :foreground base5) + (org-special-keyword :foreground cyan) + (org-property-value :foreground fg) + (org-drawer :foreground cyan) + ;; org-level faces matching oxocarbon with proper bold + ((org-level-1 &override) :foreground red :weight 'bold) + ((org-level-2 &override) :foreground fg :weight 'bold) + ((org-level-3 &override) :foreground blue :weight 'bold) + ((org-level-4 &override) :foreground teal :weight 'bold) + ((org-level-5 &override) :foreground cyan :weight 'bold) + ((org-level-6 &override) :foreground dark-cyan :weight 'bold) + ((org-level-7 &override) :foreground green :weight 'bold) + ((org-level-8 &override) :foreground violet :weight 'bold) + ;; org TODO keywords + (org-todo :foreground green :weight 'bold) + (org-done :foreground green :weight 'bold) + ;; org headlines (the text after the stars and TODO) + (org-headline-done :foreground base5 :weight 'normal :strike-through t) + ;;;; solaire-mode + (solaire-mode-line-face + :inherit 'mode-line + :background modeline-bg-l + :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-l))) + (solaire-mode-line-inactive-face + :inherit 'mode-line-inactive + :background modeline-bg-inactive-l + :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive-l))) + ;;;; solaire-mode - disable background alternation + (solaire-default-face :inherit 'default :background bg) + (solaire-hl-line-face :background (doom-blend base3 bg 0.4)) + ;;;; dired + (dired-directory :foreground blue) + (dired-marked :foreground magenta) + (dired-symlink :foreground cyan) + (dired-header :foreground red :weight 'bold)) + + ;;;; Base theme variable overrides + ;; () + ) + +;;; doom-oxocarbon-theme.el ends here