From d9d0c8fe3e5c31ac0f77699a4df0535fe4e02773 Mon Sep 17 00:00:00 2001 From: Michael Chalupiak Date: Fri, 9 Jan 2026 00:47:51 -0500 Subject: [PATCH] emacs config --- config/.config/doom/config.el | 110 ++++++++ config/.config/doom/init.el | 198 ++++++++++++++ config/.config/doom/packages.el | 57 ++++ .../doom/themes/doom-rose-pine-dawn-theme.el | 237 +++++++++++++++++ .../doom/themes/doom-rose-pine-moon-theme.el | 244 ++++++++++++++++++ .../doom/themes/doom-rose-pine-theme.el | 242 +++++++++++++++++ 6 files changed, 1088 insertions(+) create mode 100644 config/.config/doom/config.el create mode 100644 config/.config/doom/init.el create mode 100644 config/.config/doom/packages.el create mode 100644 config/.config/doom/themes/doom-rose-pine-dawn-theme.el create mode 100644 config/.config/doom/themes/doom-rose-pine-moon-theme.el create mode 100644 config/.config/doom/themes/doom-rose-pine-theme.el diff --git a/config/.config/doom/config.el b/config/.config/doom/config.el new file mode 100644 index 0000000..a7a6dda --- /dev/null +++ b/config/.config/doom/config.el @@ -0,0 +1,110 @@ +;;; $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)) +(setq doom-font (font-spec :family "Iosevka Term SS12" :size 16)) +;; +;; 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) + +;; 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 'relative) + +;; 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 +;; `after!' block, otherwise Doom's defaults may override your settings. E.g. +;; +;; (after! 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 up their documentation). +;; - 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 +;; - `use-package!' for configuring packages +;; - `after!' for running code after a package has loaded +;; - `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. +(use-package! auto-dark + :defer t + :init + ;; Configure themes + (setq! auto-dark-themes '((doom-gruvbox) (doom-gruvbox-light))) + ;; Disable doom's theme loading mechanism (just to make sure) + (setq! doom-theme nil) + ;; Declare that all themes are safe to load. + ;; Be aware that setting this variable may have security implications if you + ;; get tricked into loading untrusted themes (via auto-dark-mode or manually). + ;; See the documentation of custom-safe-themes for details. + (setq! custom-safe-themes t) + ;; Enable auto-dark-mode at the right point in time. + ;; This is inspired by doom-ui.el. Using server-after-make-frame-hook avoids + ;; issues with an early start of the emacs daemon using systemd, which causes + ;; problems with the DBus connection that auto-dark mode relies upon. + (defun my-auto-dark-init-h () + (auto-dark-mode) + (remove-hook 'server-after-make-frame-hook #'my-auto-dark-init-h) + (remove-hook 'after-init-hook #'my-auto-dark-init-h)) + (let ((hook (if (daemonp) + 'server-after-make-frame-hook + 'after-init-hook))) + ;; Depth -95 puts this before doom-init-theme-h, which sounds like a good + ;; idea, if only for performance reasons. + (add-hook hook #'my-auto-dark-init-h -95))) + +(add-to-list 'auto-mode-alist '("\\.odin\\'" . odin-ts-mode)) +;; (add-to-list treesit-language-source-alist '(odin "https://github.com/tree-sitter-grammars/tree-sitter-odin")) +(defvar treesit-language-source-alist '((odin "https://github.com/tree-sitter-grammars/tree-sitter-odin"))) + +(require 'lsp-rust) +(setq lsp-inlay-hint-enable 't) diff --git a/config/.config/doom/init.el b/config/.config/doom/init.el new file mode 100644 index 0000000..291a8b6 --- /dev/null +++ b/config/.config/doom/init.el @@ -0,0 +1,198 @@ +;;; 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 + doom-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 ; 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 ; FIXME 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 +dictionary +offline) ; navigate your code and its documentation + ;;llm ; when I said you needed friends, I didn't mean... + (lsp +lsp) ; 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 ; types of types of types of types... + ;;beancount ; mind the GAAP + (cc +lsp +tree-sitter) ; 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 + 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 +tree-sitter) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + ;;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 +lsp +tree-sitter); 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/config/.config/doom/packages.el b/config/.config/doom/packages.el new file mode 100644 index 0000000..40ba19e --- /dev/null +++ b/config/.config/doom/packages.el @@ -0,0 +1,57 @@ +;; -*- no-byte-compile: t; -*- +;;; $DOOMDIR/packages.el + +;; 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! auto-dark) +(package! odin-ts-mode + :recipe (:host github :repo "Sampie159/odin-ts-mode")) diff --git a/config/.config/doom/themes/doom-rose-pine-dawn-theme.el b/config/.config/doom/themes/doom-rose-pine-dawn-theme.el new file mode 100644 index 0000000..2a2c3d4 --- /dev/null +++ b/config/.config/doom/themes/doom-rose-pine-dawn-theme.el @@ -0,0 +1,237 @@ +;;; doom-rose-pine-dawn-theme.el --- A light port of Rose Piné Dawn theme -*- lexical-binding: t; no-byte-compile: t; -*- +;; +;; Author: mvllow +;; Ported by: donniebreve +;; Keywords: custom themes, faces +;; Homepage: https://github.com/donniebreve/rose-pine-doom-emacs +;; Package-Requires: ((emacs "25.1") (cl-lib "0.5") (doom-themes "2.2.1")) +;; +;;; Commentary: +;; +;; Thanks to mvllow (https://github.com/rose-pine) +;; Thanks to hlissner (https://github.com/doomemacs/themes) +;; +;;; Code: + +(require 'doom-themes) + +;;; Variables +(defgroup doom-rose-pine-dawn-theme nil + "Options for the `doom-rose-pine-dawn' theme." + :group 'doom-themes) + +(defcustom doom-rose-pine-dawn-brighter-modeline nil + "If non-nil, more vivid colors will be used to style the mode-line." + :group 'doom-rose-pine-dawn-theme + :type 'boolean) + +(defcustom doom-rose-pine-dawn-brighter-comments nil + "If non-nil, comments will be highlighted in more vivid colors." + :group 'doom-rose-pine-dawn-theme + :type 'boolean) + +(defcustom doom-rose-pine-dawn-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-rose-pine-dawn-theme + :type '(choice integer boolean)) + +;;; Theme definition +(def-doom-theme doom-rose-pine-dawn + "A light port of Rosé Pine Dawn theme" + + ;; Main theme colors + ( + ;; name default 256 16 + (base '("#faf4ed" "#faf4ed" "black" )) + (surface '("#fffaf3" "#fffaf3" "brightblack" )) + (overlay '("#f2e9de" "#f2e9de" "brightblack" )) + (muted '("#9893a5" "#9893a5" "brightblack" )) + (subtle '("#797593" "#797593" "brightblack" )) + (text '("#575279" "#575279" "brightblack" )) + (love '("#b4637a" "#b4637a" "red" )) + (gold '("#ea9d34" "#ea9d34" "white" )) + (rose '("#d7827e" "#d7827e" "white" )) + (pine '("#286983" "#286983" "white" )) + (foam '("#56949f" "#56949f" "white" )) + (iris '("#907aa9" "#907aa9" "white" )) + (highlightL '("#f4ede8" "#f4ede8" "grey" )) + (highlightM '("#dfdad9" "#dfdad9" "grey" )) + (highlightH '("#cecacd" "#cecacd" "grey" )) + + ;; Variables required by doom theme + (bg base) + (fg text) + ;; These are off-color variants of bg/fg, used primarily for `solaire-mode', + ;; but can also be useful as a basis for subtle highlights (e.g. for hl-line + ;; or region), especially when paired with the `doom-darken', `doom-lighten', + ;; and `doom-blend' helper functions. + (bg-alt surface) + (fg-alt text) + ;; These should represent a spectrum from bg to fg, where base0 is a starker + ;; bg and base8 is a starker fg. For example, if bg is light grey and fg is + ;; dark grey, base0 should be white and base8 should be black. + (base0 surface) + (base1 base) + (base2 highlightL) + (base3 overlay) + (base4 highlightM) + (base5 highlightH) + (base6 muted) + (base7 subtle) + (base8 text) + (grey muted) + (red love) + (orange gold) + (green pine) + (teal pine) + (yellow rose) + (blue pine) + (dark-blue pine) + (magenta iris) + (violet iris) + (cyan foam) + (dark-cyan foam) + ;; Variables required by doom theme ends here + + ;; Required face categories for syntax highlighting + (highlight subtle) ; cursor + (selection base) ; can't figure out where this is used + (region overlay) ; visual selection + (vertical-bar surface) ; window split + + (comments (if doom-rose-pine-dawn-brighter-comments subtle muted)) + (doc-comments (if doom-rose-pine-dawn-brighter-comments subtle muted)) + + (builtin pine) + (constants iris) + (functions pine) + (keywords pine) + (methods foam) + (numbers rose) + (operators gold) + (strings gold) + (type rose) + (variables iris) + + (error love) + (success foam) + (warning gold) + + (vc-added foam) + (vc-deleted love) + (vc-modified gold) + + ;; Other categories + ;; Modeline + (modeline-bg (if doom-rose-pine-dawn-brighter-modeline overlay surface)) + (modeline-fg text) + (modeline-bg-alt (if doom-rose-pine-dawn-brighter-modeline muted overlay)) + (modeline-fg-alt text) ; should this be darker or lighter? + (modeline-bg-inactive base) + (modeline-fg-inactive subtle) + (modeline-bg-inactive-alt base) + (modeline-fg-inactive-alt subtle) + (modeline-pad + (when doom-rose-pine-dawn-padded-modeline + if (integerp doom-rose-pine-dawn-padded-modeline) doom-rose-pine-padded-modeline 4))) + + ;; Base theme face overrides + ( + ;; Font + ((font-lock-comment-face &override) + :slant 'italic + :background (if doom-rose-pine-dawn-brighter-comments (doom-blend teal base 0.07))) + ((font-lock-type-face &override) :slant 'italic) + ((font-lock-builtin-face &override) :slant 'italic) + ((font-lock-function-name-face &override) :foreground type) + ((font-lock-keyword-face &override) :weight 'bold) + ((font-lock-constant-face &override) :weight 'bold) + + ;; Highlight line + (hl-line + :background highlightL) + + ;; Line numbers + ((line-number &override) :foreground muted) + ((line-number-current-line &override) :foreground text) + + ;; Mode line + (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-inactive + :box (if modeline-pad `(:line-width ,modeline-pad :color ,modeline-bg-inactive))) + (mode-line-emphasis + :foreground (if doom-rose-pine-dawn-brighter-modeline text subtle)) + + ;; Company + (company-tooltip-selection :background blue :foreground muted) + + ;; CSS mode / scss-mode + (css-proprietary-property :foreground orange) + (css-property :foreground green) + (css-selector :foreground green) + + ;; Doom mode line + (doom-modeline-bar :background green) ; The line to the left + (doom-modeline-evil-emacs-state :foreground magenta) ; The dot color when in emacs mode + (doom-modeline-evil-normal-state :foreground green) ; The dot color when in normal mode + (doom-modeline-evil-visual-state :foreground magenta) ; The dot color when in visual mode + (doom-modeline-evil-insert-state :foreground orange) ; The dot color when in insert mode + + ;; Helm + (helm-selection :foreground base :weight 'bold :background blue) + + ;; Ivy + (ivy-current-match :background highlightL :distant-foreground fg) + (ivy-minibuffer-match-face-1 :foreground pine :background nil :weight 'bold) + (ivy-minibuffer-match-face-2 :foreground iris :background nil :weight 'bold) + (ivy-minibuffer-match-face-3 :foreground gold :background nil :weight 'bold) + (ivy-minibuffer-match-face-4 :foreground rose :background nil :weight 'bold) + (ivy-minibuffer-match-highlight :foreground magenta :weight 'bold) + (ivy-posframe :background modeline-bg-alt) + + ;; Markdown mode + (markdown-markup-face :foreground text) + (markdown-header-face :inherit 'bold :foreground red) + ((markdown-code-face &override) :background surface) + + ;; org + (org-block :background (doom-blend yellow bg 0.04) :extend t) + (org-block-background :background (doom-blend yellow bg 0.04)) + (org-block-begin-line :background (doom-blend yellow bg 0.08) :foreground comments :extend t) + (org-block-end-line :background (doom-blend yellow bg 0.08) :foreground comments :extend t) + (org-level-1 :foreground gold) + (org-level-2 :foreground rose) + (org-level-3 :foreground pine) + (org-level-4 :foreground iris) + (org-level-5 :foreground gold) + (org-level-6 :foreground rose) + (org-level-7 :foreground pine) + (org-level-8 :foreground iris) + + ;; Solaire mode line + (solaire-mode-line-face + :inherit 'mode-line + :background modeline-bg-alt + :box (if modeline-pad `(:line-width ,modeline-pad :color ,modeline-bg-alt))) + (solaire-mode-line-inactive-face + :inherit 'mode-line-inactive + :background modeline-bg-inactive-alt + :box (if modeline-pad `(:line-width ,modeline-pad :color ,modeline-bg-inactive-alt))) + + ;; Widget + (widget-field :foreground fg :background muted) + (widget-single-line-field :foreground fg :background muted) + + ;; Swiper + (swiper-line-face :background highlightM) + (swiper-match-face-1 :inherit 'ivy-minibuffer-match-face-1) + (swiper-match-face-2 :inherit 'ivy-minibuffer-match-face-2) + (swiper-match-face-3 :inherit 'ivy-minibuffer-match-face-3) + (swiper-match-face-4 :inherit 'ivy-minibuffer-match-face-4))) + +;;; doom-rose-pine-dawn-theme.el ends here diff --git a/config/.config/doom/themes/doom-rose-pine-moon-theme.el b/config/.config/doom/themes/doom-rose-pine-moon-theme.el new file mode 100644 index 0000000..2fb50e4 --- /dev/null +++ b/config/.config/doom/themes/doom-rose-pine-moon-theme.el @@ -0,0 +1,244 @@ +;;; doom-rose-pine-moon-theme.el --- A medium port of Rosé Pine Moon theme -*- lexical-binding: t; no-byte-compile: t; -*- +;; +;; Author: mvllow +;; Ported by: donniebreve +;; Keywords: custom themes, faces +;; Homepage: https://github.com/donniebreve/rose-pine-doom-emacs +;; Package-Requires: ((emacs "25.1") (cl-lib "0.5") (doom-themes "2.2.1")) +;; +;;; Commentary: +;; +;; Thanks to mvllow (https://github.com/rose-pine) +;; Thanks to hlissner (https://github.com/doomemacs/themes) +;; +;;; Code: + +(require 'doom-themes) + +;;; Variables +(defgroup doom-rose-pine-moon-theme nil + "Options for the `doom-rose-pine-moon' theme." + :group 'doom-themes) + +(defcustom doom-rose-pine-moon-brighter-modeline nil + "If non-nil, more vivid colors will be used to style the mode-line." + :group 'doom-rose-pine-moon-theme + :type 'boolean) + +(defcustom doom-rose-pine-moon-brighter-comments nil + "If non-nil, comments will be highlighted in more vivid colors." + :group 'doom-rose-pine-moon-theme + :type 'boolean) + +(defcustom doom-rose-pine-moon-brighter-text nil + "If non-nil, default text will be brighter." + :group 'doom-rose-pine-moon-theme + :type 'boolean) + +(defcustom doom-rose-pine-moon-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-rose-pine-moon-theme + :type '(choice integer boolean)) + +;;; Theme definition +(def-doom-theme doom-rose-pine-moon + "A medium port of Rosé Pine Moon theme" + + ;; Main theme colors + ( + ;; name default 256 16 + (base '("#232136" "#232136" "black" )) + (surface '("#2a273f" "#2a273f" "brightblack" )) + (overlay '("#393552" "#393552" "brightblack" )) + (muted '("#6e6a86" "#6e6a86" "brightblack" )) + (subtle '("#908caa" "#908caa" "brightblack" )) + (text '("#e0def4" "#e0def4" "brightblack" )) + (love '("#eb6f92" "#eb6f92" "red" )) + (gold '("#f6c177" "#f6c177" "white" )) + (rose '("#ea9a97" "#ea9a97" "white" )) + (pine '("#3e8fb0" "#3e8fb0" "white" )) + (foam '("#9ccfd8" "#9ccfd8" "white" )) + (iris '("#c4a7e7" "#c4a7e7" "white" )) + (highlightL '("#2a283e" "#2a283e" "white" )) + (highlightM '("#44415a" "#44415a" "white" )) + (highlightH '("#56526e" "#56526e" "white" )) + + ;; Variables required by doom theme + ;; These are required by doom theme and used in various places + (bg base) + (fg text) + ;; These are off-color variants of bg/fg, used primarily for `solaire-mode', + ;; but can also be useful as a basis for subtle highlights (e.g. for hl-line + ;; or region), especially when paired with the `doom-darken', `doom-lighten', + ;; and `doom-blend' helper functions. + (bg-alt surface) + (fg-alt text) + ;; These should represent a spectrum from bg to fg, where base0 is a starker + ;; bg and base8 is a starker fg. For example, if bg is light grey and fg is + ;; dark grey, base0 should be white and base8 should be black. + (base0 base) + (base1 surface) + (base2 highlightL) + (base3 overlay) + (base4 highlightM) + (base5 highlightH) + (base6 muted) + (base7 subtle) + (base8 text) + (grey muted) + (red love) + (orange gold) + (green pine) + (teal foam) + (yellow rose) + (pink rose) + (blue pine) + (dark-blue pine) + (magenta iris) + (violet iris) + (cyan foam) + (dark-cyan pine) + ;; Variables required by doom theme ends here + + ;; Required face categories for syntax highlighting + (highlight subtle) ; cursor + (selection base) ; can't figure out where this is used + (region overlay) ; visual selection + (vertical-bar surface) ; window split + + (comments (if doom-rose-pine-moon-brighter-comments subtle muted)) + (doc-comments (if doom-rose-pine-moon-brighter-comments subtle muted)) + + (builtin pine) + (constants iris) + (functions pine) + (keywords pine) + (methods foam) + (numbers rose) + (operators gold) + (strings gold) + (type rose) + (variables iris) + + (error love) + (success foam) + (warning gold) + + (vc-added foam) + (vc-deleted love) + (vc-modified gold) + + ;; Other categories + ;; Modeline + (modeline-bg (if doom-rose-pine-moon-brighter-modeline overlay surface)) + (modeline-fg text) + (modeline-bg-alt (if doom-rose-pine-moon-brighter-modeline muted overlay)) + (modeline-fg-alt text) ; should this be darker or lighter? + (modeline-bg-inactive base) + (modeline-fg-inactive subtle) + (modeline-bg-inactive-alt base) + (modeline-fg-inactive-alt subtle) + (modeline-pad + (when doom-rose-pine-moon-padded-modeline + if (integerp doom-rose-pine-moon-padded-modeline) doom-rose-pine-padded-modeline 4))) + + ;; Base theme face overrides + ( + ;; Font + ((font-lock-comment-face &override) + :slant 'italic + :background (if doom-rose-pine-moon-brighter-comments (doom-blend teal base 0.07))) + ((font-lock-type-face &override) :slant 'italic) + ((font-lock-builtin-face &override) :slant 'italic) + ((font-lock-function-name-face &override) :foreground type) + ((font-lock-keyword-face &override) :weight 'bold) + ((font-lock-constant-face &override) :weight 'bold) + + ;; Highlight line + (hl-line + :background surface) + + ;; Line numbers + ((line-number &override) :foreground muted) + ((line-number-current-line &override) :foreground text) + + ;; Mode line + (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-inactive + :box (if modeline-pad `(:line-width ,modeline-pad :color ,modeline-bg-inactive))) + (mode-line-emphasis + :foreground (if doom-rose-pine-moon-brighter-modeline text subtle)) + + ;; Company + (company-tooltip-selection :background blue :foreground muted) + + ;; CSS mode / scss-mode + (css-proprietary-property :foreground orange) + (css-property :foreground green) + (css-selector :foreground green) + + ;; Doom mode line + (doom-modeline-bar :background green) ; The line to the left + (doom-modeline-evil-emacs-state :foreground magenta) ; The dot color when in emacs mode + (doom-modeline-evil-normal-state :foreground green) ; The dot color when in normal mode + (doom-modeline-evil-visual-state :foreground magenta) ; The dot color when in visual mode + (doom-modeline-evil-insert-state :foreground orange) ; The dot color when in insert mode + + ;; Helm + (helm-selection :foreground base :weight 'bold :background blue) + + ;; Ivy + (ivy-current-match :background overlay :distant-foreground fg) + (ivy-minibuffer-match-face-1 :foreground pine :background nil :weight 'bold) + (ivy-minibuffer-match-face-2 :foreground iris :background nil :weight 'bold) + (ivy-minibuffer-match-face-3 :foreground gold :background nil :weight 'bold) + (ivy-minibuffer-match-face-4 :foreground rose :background nil :weight 'bold) + (ivy-minibuffer-match-highlight :foreground magenta :weight 'bold) + (ivy-posframe :background modeline-bg-alt) + + ;; Markdown mode + (markdown-markup-face :foreground text) + (markdown-header-face :inherit 'bold :foreground red) + ((markdown-code-face &override) :background surface) + + ;; org + (org-block :background (doom-blend yellow bg 0.04) :extend t) + (org-block-background :background (doom-blend yellow bg 0.04)) + (org-block-begin-line :background (doom-blend yellow bg 0.08) :foreground comments :extend t) + (org-block-end-line :background (doom-blend yellow bg 0.08) :foreground comments :extend t) + (org-level-1 :foreground gold) + (org-level-2 :foreground rose) + (org-level-3 :foreground pine) + (org-level-4 :foreground iris) + (org-level-5 :foreground gold) + (org-level-6 :foreground rose) + (org-level-7 :foreground pine) + (org-level-8 :foreground iris) + + ;; Solaire mode line + (solaire-mode-line-face + :inherit 'mode-line + :background modeline-bg-alt + :box (if modeline-pad `(:line-width ,modeline-pad :color ,modeline-bg-alt))) + (solaire-mode-line-inactive-face + :inherit 'mode-line-inactive + :background modeline-bg-inactive-alt + :box (if modeline-pad `(:line-width ,modeline-pad :color ,modeline-bg-inactive-alt))) + + ;; Widget + (widget-field :foreground fg :background muted) + (widget-single-line-field :foreground fg :background muted) + + ;; Swiper + (swiper-line-face :background highlightM) + (swiper-match-face-1 :inherit 'ivy-minibuffer-match-face-1) + (swiper-match-face-2 :inherit 'ivy-minibuffer-match-face-2) + (swiper-match-face-3 :inherit 'ivy-minibuffer-match-face-3) + (swiper-match-face-4 :inherit 'ivy-minibuffer-match-face-4))) + +;;; doom-rose-pine-moon-theme.el ends here diff --git a/config/.config/doom/themes/doom-rose-pine-theme.el b/config/.config/doom/themes/doom-rose-pine-theme.el new file mode 100644 index 0000000..c37cfc2 --- /dev/null +++ b/config/.config/doom/themes/doom-rose-pine-theme.el @@ -0,0 +1,242 @@ +;;; doom-rose-pine-theme.el --- A dark port of Rosé Pine theme -*- lexical-binding: t; no-byte-compile: t; -*- +;; +;; Author: mvllow +;; Ported by: donniebreve +;; Keywords: custom themes, faces +;; Homepage: https://github.com/donniebreve/rose-pine-doom-emacs +;; Package-Requires: ((emacs "25.1") (cl-lib "0.5") (doom-themes "2.2.1")) +;; +;;; Commentary: +;; +;; Thanks to mvllow (https://github.com/rose-pine) +;; Thanks to hlissner (https://github.com/doomemacs/themes) +;; +;;; Code: + +(require 'doom-themes) + +;;; Variables +(defgroup doom-rose-pine-theme nil + "Options for the `doom-rose-pine' theme." + :group 'doom-themes) + +(defcustom doom-rose-pine-brighter-modeline nil + "If non-nil, more vivid colors will be used to style the mode-line." + :group 'doom-rose-pine-theme + :type 'boolean) + +(defcustom doom-rose-pine-brighter-comments nil + "If non-nil, comments will be highlighted in more vivid colors." + :group 'doom-rose-pine-theme + :type 'boolean) + +(defcustom doom-rose-pine-brighter-text nil + "If non-nil, default text will be brighter." + :group 'doom-rose-pine-theme + :type 'boolean) + +(defcustom doom-rose-pine-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-rose-pine-theme + :type '(choice integer boolean)) + +;;; Theme definition +(def-doom-theme doom-rose-pine + "A dark port of Rosé Pine theme" + + ;; Main theme colors + ( + ;; name default 256 16 + (base '("#191724" "#191724" "black" )) + (surface '("#1f1d2e" "#1f1d2e" "brightblack" )) + (overlay '("#26233a" "#26233a" "brightblack" )) + (muted '("#6e6a86" "#6e6a86" "brightblack" )) + (subtle '("#908caa" "#908caa" "brightblack" )) + (text '("#e0def4" "#e0def4" "brightblack" )) + (love '("#eb6f92" "#eb6f92" "red" )) + (gold '("#f6c177" "#f6c177" "white" )) + (rose '("#ebbcba" "#ebbcba" "white" )) + (pine '("#31748f" "#31748f" "white" )) + (foam '("#9ccfd8" "#9ccfd8" "white" )) + (iris '("#c4a7e7" "#c4a7e7" "white" )) + (highlightL '("#21202e" "#21202e" "grey" )) + (highlightM '("#403d52" "#403d52" "grey" )) + (highlightH '("#524f67" "#524f67" "grey" )) + + ;; Variables required by doom theme + ;; These are required by doom theme and used in various places + (bg base) + (fg text) + ;; These are off-color variants of bg/fg, used primarily for `solaire-mode', + ;; but can also be useful as a basis for subtle highlights (e.g. for hl-line + ;; or region), especially when paired with the `doom-darken', `doom-lighten', + ;; and `doom-blend' helper functions. + (bg-alt surface) + (fg-alt text) + ;; These should represent a spectrum from bg to fg, where base0 is a starker + ;; bg and base8 is a starker fg. For example, if bg is light grey and fg is + ;; dark grey, base0 should be white and base8 should be black. + (base0 base) + (base1 surface) + (base2 highlightL) + (base3 overlay) + (base4 highlightM) + (base5 highlightH) + (base6 muted) + (base7 subtle) + (base8 text) + (grey muted) + (red love) + (orange gold) + (green pine) + (teal pine) + (yellow rose) + (blue pine) + (dark-blue pine) + (magenta iris) + (violet iris) + (cyan foam) + (dark-cyan foam) + ;; Variables required by doom theme ends here + + ;; Required face categories for syntax highlighting + (highlight subtle) ; cursor + (selection base) ; can't figure out where this is used + (region overlay) ; visual selection + (vertical-bar surface) ; window split + + (comments (if doom-rose-pine-brighter-comments subtle muted)) + (doc-comments (if doom-rose-pine-brighter-comments subtle muted)) + + (builtin pine) + (constants iris) + (functions pine) + (keywords pine) + (methods foam) + (numbers rose) + (operators gold) + (strings gold) + (type rose) + (variables iris) + + (error love) + (success foam) + (warning gold) + + (vc-added foam) + (vc-deleted love) + (vc-modified gold) + + ;; Other categories + ;; Modeline + (modeline-bg (if doom-rose-pine-brighter-modeline overlay surface)) + (modeline-fg text) + (modeline-bg-alt (if doom-rose-pine-brighter-modeline muted overlay)) + (modeline-fg-alt text) ; should this be darker or lighter? + (modeline-bg-inactive base) + (modeline-fg-inactive subtle) + (modeline-bg-inactive-alt base) + (modeline-fg-inactive-alt subtle) + (modeline-pad + (when doom-rose-pine-padded-modeline + if (integerp doom-rose-pine-padded-modeline) doom-rose-pine-padded-modeline 4))) + + ;; Base theme face overrides + ( + ;; Font + ((font-lock-comment-face &override) + :slant 'italic + :background (if doom-rose-pine-brighter-comments (doom-blend teal base 0.07))) + ((font-lock-type-face &override) :slant 'italic) + ((font-lock-builtin-face &override) :slant 'italic) + ((font-lock-function-name-face &override) :foreground type) + ((font-lock-keyword-face &override) :weight 'bold) + ((font-lock-constant-face &override) :weight 'bold) + + ;; Highlight line + (hl-line + :background surface) + + ;; Line numbers + ((line-number &override) :foreground muted) + ((line-number-current-line &override) :foreground text) + + ;; Mode line + (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-inactive + :box (if modeline-pad `(:line-width ,modeline-pad :color ,modeline-bg-inactive))) + (mode-line-emphasis + :foreground (if doom-rose-pine-brighter-modeline text subtle)) + + ;; Company + (company-tooltip-selection :background blue :foreground muted) + + ;; CSS mode / scss-mode + (css-proprietary-property :foreground orange) + (css-property :foreground green) + (css-selector :foreground green) + + ;; Doom mode line + (doom-modeline-bar :background green) ; The line to the left + (doom-modeline-evil-emacs-state :foreground magenta) ; The dot color when in emacs mode + (doom-modeline-evil-normal-state :foreground green) ; The dot color when in normal mode + (doom-modeline-evil-visual-state :foreground magenta) ; The dot color when in visual mode + (doom-modeline-evil-insert-state :foreground orange) ; The dot color when in insert mode + + ;; Helm + (helm-selection :foreground base :weight 'bold :background blue) + + ;; Ivy + (ivy-current-match :background overlay :distant-foreground fg) + (ivy-minibuffer-match-face-1 :foreground pine :background nil :weight 'bold) + (ivy-minibuffer-match-face-2 :foreground iris :background nil :weight 'bold) + (ivy-minibuffer-match-face-3 :foreground gold :background nil :weight 'bold) + (ivy-minibuffer-match-face-4 :foreground rose :background nil :weight 'bold) + (ivy-minibuffer-match-highlight :foreground magenta :weight 'bold) + (ivy-posframe :background modeline-bg-alt) + + ;; Markdown mode + (markdown-markup-face :foreground text) + (markdown-header-face :inherit 'bold :foreground red) + ((markdown-code-face &override) :background surface) + + ;; org + (org-block :background (doom-blend yellow bg 0.04) :extend t) + (org-block-background :background (doom-blend yellow bg 0.04)) + (org-block-begin-line :background (doom-blend yellow bg 0.08) :foreground comments :extend t) + (org-block-end-line :background (doom-blend yellow bg 0.08) :foreground comments :extend t) + (org-level-1 :foreground gold) + (org-level-2 :foreground rose) + (org-level-3 :foreground pine) + (org-level-4 :foreground iris) + (org-level-5 :foreground gold) + (org-level-6 :foreground rose) + (org-level-7 :foreground pine) + (org-level-8 :foreground iris) + + ;; Solaire mode line + (solaire-mode-line-face + :inherit 'mode-line + :background modeline-bg-alt + :box (if modeline-pad `(:line-width ,modeline-pad :color ,modeline-bg-alt))) + (solaire-mode-line-inactive-face + :inherit 'mode-line-inactive + :background modeline-bg-inactive-alt + :box (if modeline-pad `(:line-width ,modeline-pad :color ,modeline-bg-inactive-alt))) + + ;; Widget + (widget-field :foreground fg :background muted) + (widget-single-line-field :foreground fg :background muted) + + ;; Swiper + (swiper-match-face-1 :inherit 'ivy-minibuffer-match-face-1) + (swiper-match-face-2 :inherit 'ivy-minibuffer-match-face-2) + (swiper-match-face-3 :inherit 'ivy-minibuffer-match-face-3) + (swiper-match-face-4 :inherit 'ivy-minibuffer-match-face-4))) + +;;; doom-rose-pine-theme.el ends here