Merge remote-tracking branch 'origin/master'

flake.nix

@@ -4,8 +4,12 @@
   inputs.emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
   inputs.flake-utils.url = "github:numtide/flake-utils";
 
-  outputs = { self, nixpkgs, flake-utils, emacs-overlay }:
-    flake-utils.lib.eachDefaultSystem (system: let
+  outputs = { self, nixpkgs, flake-utils, emacs-overlay }: let
+    mkEmacs = pkgs: v: pkgs.emacsWithPackagesFromUsePackage {
+      config = ./main.org;
+      package = pkgs."${v}${if pkgs.stdenv.isDarwin then "-macport" else "-pgtk"}";
+    };    
+  in (flake-utils.lib.eachDefaultSystem (system: let
       pkgs = import nixpkgs {
         inherit system;
         overlays = [
@@ -14,10 +18,11 @@
       };
     in {
       packages = {
-        emacs = pkgs.emacsWithPackagesFromUsePackage {
-          config = ./main.org;
-          package = if pkgs.stdenv.isDarwin then pkgs.emacs29-macport else pkgs.emacs29;
-        };
+        me-emacs = mkEmacs pkgs "emacs29";
       };
-    });
+    })) // {
+      overlays.default = final: prev: (emacs-overlay.overlays.default final prev) // {
+        me-emacs = mkEmacs final "emacs29";
+      };      
+    };
 }

main.org

@@ -7,13 +7,14 @@
 #+author:
 #+language: en
 
-* Intialization
+* Initialization
+
+** Leaf.el
 
 We must initialize =leaf.el=, which we use as a use-package
-replacement for defining configs for different things.
+replacement for defining configs and relations between packages etc.
 
 #+begin_src elisp :tangle yes
-  ;; <leaf-install-code>
   (eval-and-compile
     (customize-set-variable
      'package-archives '(("org" . "https://orgmode.org/elpa/")
@@ -34,7 +35,6 @@ replacement for defining configs for different things.
       :config
       ;; initialize leaf-keywords.el
       (leaf-keywords-init)))
-  ;; </leaf-install-code>
 
   (leaf leaf-tree :ensure t)
   (leaf leaf-convert :ensure t)
@@ -43,6 +43,26 @@ replacement for defining configs for different things.
     :bind (("M-=" . transient-dwim-dispatch)))
 #+end_src
 
+** Performance
+
+*** Garbage Collection
+
+#+begin_src elisp :tangle yes
+    (leaf gcmh :ensure t
+      :hook (after-init-hook))
+#+end_src
+
+*** Profiling
+#+begin_src elisp :tangle yes
+  (leaf esup :disabled nil :ensure t)
+#+end_src
+
+** Emacs Paths
+
+*** Custom.el
+
+Ensure that the =custom.el= resides in the users' emacs directory.
+
 #+begin_src elisp :tangle yes
   (leaf custom-el
 	:config
@@ -51,6 +71,10 @@ replacement for defining configs for different things.
 	(load custom-file 'noerror 'nomessage))
 #+end_src
 
+*** Backups
+
+Set the backups directory to reside in the users' emacs directory.
+
 #+begin_src elisp :tangle yes
   (leaf backup
 	:config
@@ -63,30 +87,9 @@ replacement for defining configs for different things.
 
 #+begin_src elisp :tangle yes
   (when (eq system-type 'darwin)
-    (setq mac-option-modifier 'meta)
-  )
+    (setq mac-option-modifier 'meta))
 #+end_src
 
-* Visual Customization
-
-#+begin_src elisp :tangle yes
-(leaf visual
-  :doc "Visual Changes to Emacs"
-  :tag "builtin" "internal"
-  :custom ((menu-bar-mode . nil)
-	   (tool-bar-mode . nil)
-	   (scroll-bar-mode . nil))
-  :custom-face ((default . '((t (:family "JuliaMono"
-					 :height 150
-					 :weight normal)))))
-  :config (prog1 'visual
-	   ;; Set location of custom theme dir
-	   (setq custom-theme-directory (concat user-emacs-directory "themes"))
-	   (load-theme 'UniverseHighContrast)))
-#+end_src
-
-* Package Configuration
-
 ** Path Preservation
 
 Exec-path-from-shell ensures that path variable is preserved from
@@ -98,6 +101,26 @@ shell.
     (exec-path-from-shell-initialize))
 #+end_src
 
+* Visual Customization
+
+Visual Theme of Emacs config: defined in the =themes= directory.
+
+#+begin_src elisp :tangle yes
+  (leaf visual
+    :doc "Visual Changes to Emacs"
+    :tag "builtin" "internal"
+    :custom ((menu-bar-mode . nil)
+	     (tool-bar-mode . nil)
+	     (scroll-bar-mode . nil))
+    :custom-face ((default . '((t (:family "JuliaMono"
+					   :height 150
+					   :weight normal)))))
+    :config
+    ;; Set location of custom theme dir
+    (setq custom-theme-directory (concat user-emacs-directory "themes"))
+    (load-theme 'UniverseHighContrast))
+#+end_src
+
 ** Font Related
 
 *** Ligature
@@ -132,10 +155,7 @@ Font related ligatures, combining multiple characters into "one".
 	(global-ligature-mode t))
 #+end_src
 
-** Profiling
-#+begin_src elisp :tangle yes
-  (leaf esup :disabled nil :ensure t)
-#+end_src
+* Package Configuration
 
 ** Version Control
 #+begin_src elisp :tangle yes