From 13c8c4432fcb431f6e16dc356ebae1d96624e982 Mon Sep 17 00:00:00 2001 From: Joe Frikker Date: Thu, 17 Sep 2026 08:27:10 -0400 Subject: [PATCH] Fixing emacs config --- home.org | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/home.org b/home.org index 7975c75..faf8e41 100644 --- a/home.org +++ b/home.org @@ -977,6 +977,7 @@ repeats set up that only apply in that mode. Let's unbind some builtin keys that I don't use. I'm not sure if I'll replace them with anything or not, but at a minimum it'll avoid accidental keypresses and clean up which-key output. #+begin_src elisp + (require 'bind-key) (unbind-key "C-x RET") (unbind-key "C-x #") (unbind-key "C-x 5") @@ -1013,7 +1014,7 @@ Ligature mode combines character sequences like <= into a single on-screen glyph cool, so I'm turning it on in prog mode. The enabled ligatures are font-specific, taken from [[https://github.com/mickeynp/ligature.el/wiki#jetbrains-mono][the ligature wiki]]. -#+BEGIN_SRC elisp +#+BEGIN_SRC elisp :noweb no (ligature-set-ligatures 'prog-mode '("--" "---" "==" "===" "!=" "!==" "=!=" "=:=" "=/=" "<=" ">=" "&&" "&&&" "&=" "++" "+++" "***" ";;" "!!" @@ -2303,29 +2304,23 @@ I like Catppuccin Frappe as my theme. Let's use it in as many places as we can. #+END_SRC ** Emacs -:PROPERTIES: -:header-args:elisp: :tangle target/emacs.el -:END: - #+BEGIN_SRC nix { programs.emacs = { extraPackages = epkgs: with epkgs; [ catppuccin-theme ]; - extraConfig = "(defvar my-base-font-size ${if pkgs.stdenv.isDarwin then "130" else "100"})"; + extraConfig = ''(defvar my-base-font-size ${if pkgs.stdenv.isDarwin then "130" else "100"}) + (require 'catppuccin-theme) + (setopt catppuccin-flavor 'frappe) + (load-theme 'catppuccin :no-confirm) + + ;; (set-face-attribute 'default nil :font "JetBrainsMono Nerd Font" :height 130) + ;; (set-face-attribute 'fixed-pitch nil :font "JetBrainsMono Nerd Font" :height 130) + (set-face-attribute 'default nil :font "Iosevka Term SS14" :height my-base-font-size) + (set-face-attribute 'fixed-pitch nil :font "Iosevka Term SS14" :height my-base-font-size) + (set-face-attribute 'variable-pitch nil :font "Iosevka Etoile" :height my-base-font-size) + ''; }; } #+END_SRC - -#+BEGIN_SRC elisp - (require 'catppuccin-theme) - (setopt catppuccin-flavor 'frappe) - (load-theme 'catppuccin :no-confirm) - - ;; (set-face-attribute 'default nil :font "JetBrainsMono Nerd Font" :height 130) - ;; (set-face-attribute 'fixed-pitch nil :font "JetBrainsMono Nerd Font" :height 130) - (set-face-attribute 'default nil :font "Iosevka Term SS14" :height my-base-font-size) - (set-face-attribute 'fixed-pitch nil :font "Iosevka Term SS14" :height my-base-font-size) - (set-face-attribute 'variable-pitch nil :font "Iosevka Etoile" :height my-base-font-size) -#+END_SRC