From e7c66a3ccb20d32e17dd8b0264322969af05404c Mon Sep 17 00:00:00 2001 From: David Crompton Date: Sat, 4 May 2024 15:56:47 -0400 Subject: [PATCH 1/7] Proper Overlays --- flake.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index a3ab370..9a14c89 100644 --- a/flake.nix +++ b/flake.nix @@ -12,12 +12,17 @@ emacs-overlay.overlays.default ]; }; + mkEmacs = pkgs: v: pkgs.emacsWithPackagesFromUsePackage { + config = ./main.org; + package = pkgs."${v}${pkgs.lib.optionalString pkgs.stdenv.isDarwin "-macport"}"; + }; 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: { + me-emacs = mkEmacs final "emacs29"; }; }); } From 116b93e52a97d4922f086b004fa9e8043ba8931c Mon Sep 17 00:00:00 2001 From: David Crompton Date: Sat, 4 May 2024 15:49:03 -0400 Subject: [PATCH 2/7] Agenda Custom.el Fix --- custom.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom.el b/custom.el index 45b4c13..7ab2856 100644 --- a/custom.el +++ b/custom.el @@ -16,7 +16,7 @@ '(lsp-java-format-settings-profile nil) '(lsp-pylsp-plugins-jedi-use-pyenv-environment t) '(org-agenda-files - '("/Users/universelaptop/Documents/Blender/eCal/SpecSheet/spec.org" "/Users/universelaptop/Documents/Development/pyBQN/doc/VM/notes.org" "/Users/universelaptop/Documents/Development/syzygial/syzygui/README.org" "/Users/universelaptop/Documents/Development/syzygial/web/syzygial-cc/content/blog/articles.org" "/Users/universelaptop/Documents/Development/syzygial/web/syzygial-cc/content/main/about.org" "/Users/universelaptop/Documents/Development/syzygial/web/syzygial-cc/content/main/index.org" "/Users/universelaptop/Documents/Resume_and_CV/cv.org" "/Users/universelaptop/Documents/Resume_and_CV/resume.org" "/Users/universelaptop/Documents/org/dates.org" "/Users/universelaptop/Documents/research/AntidromROOTs/TechnicalPaper/Refdoc/majorrefs.org" "/Users/universelaptop/Documents/research/AntidromROOTs/CodeOverview.org" "/Users/universelaptop/Documents/research/CommitteeMeetings/First/Report/David_Crompton_Masters_Supervisory_Committee_Meeting_Report.org" "/Users/universelaptop/Documents/research/DBS/ERNA/AbstractModel/Methods/MethodsModel.org" "/Users/universelaptop/Documents/research/DBS/ERNA/AbstractModel/Results/Limitations.org" "/Users/universelaptop/Documents/research/DBS/ERNA/AbstractModel/Results/Results.org" "/Users/universelaptop/Documents/research/DBS/ERNA/NEURON/old/Tutorial/Tutorial.org" "/Users/universelaptop/Documents/research/DBS/ERNA/NEURON/old/README.org" "/Users/universelaptop/Documents/research/DBS/ERNA/Notes/ModelProposals/MeanOrNeural/diagram/diagram.org" "/Users/universelaptop/Documents/research/DBS/ERNA/PBLIF/README.org" "/Users/universelaptop/Documents/research/DBS/ERNA/TMP/README.org" "/Users/universelaptop/Documents/research/DBS/ERNA/Materials.org" "/Users/universelaptop/Documents/research/DBS/TechnicalEvaluation/technicaldraft.org" "/Users/universelaptop/Documents/research/MPS/MPSModel/modelResearch.org" "/Users/universelaptop/Documents/research/MPS/MPS_Antidromic_STDP/README.org" "/Users/universelaptop/Documents/research/MPS/ModelProposal/model_proposal.org" "/Users/universelaptop/Documents/research/MiladMeetings/Notes.org" "/Users/universelaptop/Documents/research/Morris_Lecar_SK/README.org" "/Users/universelaptop/Documents/research/OLM_Model/OLM_Single_Compartment/Equations/equations.org" "/Users/universelaptop/Documents/research/StateEstimation/OLM/OLM_Equations/equations.org" "/Users/universelaptop/Documents/research/StateEstimation/OLM/OpenAccess/README.org" "/Users/universelaptop/Documents/research/StateEstimation/README.org" "/Users/universelaptop/Documents/research/conferences/krembil_research_day/2023/abstract.org" "/Users/universelaptop/Documents/research/fpga/NEURON/ideas/proposal/proposal.org" "/Users/universelaptop/Documents/research/grants/CIHR/CGS-D/2022/ResearchProposal.org" "/Users/universelaptop/Documents/research/grants/CIHR/CGS-D/2023/LukaSupportBlurbs.org" "/Users/universelaptop/Documents/research/grants/CIHR/CGS-D/2023/ResearchProposal.org" "/Users/universelaptop/Documents/research/grants/GooglePhdFellowship/2023/EssayResponses/Responses.org" "/Users/universelaptop/Documents/research/grants/GooglePhdFellowship/2023/ResearchProposal/Crompton_David_1004162434_Transfer_Thesis_Proposal.org" "/Users/universelaptop/Documents/research/grants/GooglePhdFellowship/2023/README.org" "/Users/universelaptop/Documents/research/grants/Milad/2023/Feb/ModelDescription.org" "/Users/universelaptop/Documents/research/grants/OGS/2022/PlanOfStudy.org" "/Users/universelaptop/Documents/research/grants/OGS/2022/Research.org" "/Users/universelaptop/Documents/research/grants/OIST/2023/application.org" "/Users/universelaptop/Documents/research/review/GEMsort/review.org" "/Users/universelaptop/Documents/research/skml/FPGA/SKML_3D.org" "/Users/universelaptop/Documents/research/skml/draft/SKML_firstdraft.org" "/Users/universelaptop/Documents/research/skml/paper/SKML_first_draft.org" "/Users/universelaptop/Documents/research/thesis/Ideas/ModelDetails.org" "/Users/universelaptop/Documents/research/thesis/firstMeeting/proposal.org" "/Users/universelaptop/Documents/research/thesis/transfer/Crompton_David_1004162434_Transfer_Thesis_Proposal.org" "/Users/universelaptop/Documents/uoft/BME1477/AlumniInterview/AlumniInterview.org" "/Users/universelaptop/Documents/uoft/BME1477/PeerReview/JoseValenzuela/Peer_Review.org" "/Users/universelaptop/Documents/uoft/BME1477/PeerReview/KatieDoran/Peer_Review.org" "/Users/universelaptop/Documents/uoft/BME1477/Proposal_Edit/Proposal_Edit.org" "/Users/universelaptop/Documents/uoft/BME1477/PCA4.org" "/Users/universelaptop/Documents/uoft/BME1477/PCA5.org" "/Users/universelaptop/Documents/uoft/BME1477/PCA6.org" "/Users/universelaptop/Documents/uoft/BME1477/Proposal_Draft.org" "/Users/universelaptop/Documents/uoft/BME1477/Proposal_Outline.org" "/Users/universelaptop/Documents/uoft/BME1478/week1/assignment/Week1_Crompton_David_1004162434.org" "/Users/universelaptop/Documents/uoft/BME1478/week2/assignment/Crompton_David_1004162434.org" "/Users/universelaptop/Documents/uoft/BME1478/week3/assignment/Crompton_David_1004162434_Week3.org" "/Users/universelaptop/Documents/uoft/BME1478/week4/assignment/Instructions.org" "/Users/universelaptop/Documents/uoft/BME1500/LiteratureReview/LitReview.org" "/Users/universelaptop/Documents/uoft/BME1500/PeerReview/Crompton_David_1004162434_PeerReview.org" "/Users/universelaptop/Documents/uoft/BME1500/Presentations_Day1.org" "/Users/universelaptop/Documents/uoft/BME1500/Presentations_Day2.org" "/Users/universelaptop/Documents/uoft/BME1500/lecture10.org" "/Users/universelaptop/Documents/uoft/BME1500/lecture12.org" "/Users/universelaptop/Documents/uoft/BME1500/lecture2.org" "/Users/universelaptop/Documents/uoft/BME1500/lecture3.org" "/Users/universelaptop/Documents/uoft/BME1500/lecture4.org" "/Users/universelaptop/Documents/uoft/BME1500/lecture5.org" "/Users/universelaptop/Documents/uoft/BME1500/lecture6.org" "/Users/universelaptop/Documents/uoft/BME1500/lecture7.org" "/Users/universelaptop/Documents/uoft/BME1500/lecture8.org" "/Users/universelaptop/Documents/uoft/BME1500/lecture9.org" "/Users/universelaptop/Documents/uoft/BME1802/assignment/riskanalysis/hazop.org" "/Users/universelaptop/Documents/uoft/BME1802/assignment/riskanalysis_review/peerreview.org" "/Users/universelaptop/Documents/uoft/JPB1071/NEURON/lecture/Lecture.org" "/Users/universelaptop/Documents/uoft/JPB1071/OralPres/Crompton_David_1004162434_Presentation.org" "/Users/universelaptop/Documents/uoft/JPB1071/OralRev/Reviews.org" "/Users/universelaptop/Documents/uoft/JPB1071/WrittenAssignment/Crompton_David_1004162434_JPB1071_Written_Assignment.org" "/Users/universelaptop/Documents/uoft/JPH441/Essay3/Crompton_David_1004162434_Essay3.org" "/Users/universelaptop/Documents/uoft/JPH441/FinalEssay/Crompton_David_1004162434_Final_Essay.org" "/Users/universelaptop/Documents/uoft/JPH441/VideoEssay/VideoEssay_Discussion_Crompton_David_1004162434.org" "/Users/universelaptop/Documents/uoft/PHY354/FINAL/Q2E.org" "/Users/universelaptop/Documents/uoft/PHY354/PS5/Q1.org" "/Users/universelaptop/Documents/uoft/PHY354/PS5/Q4.org" "/Users/universelaptop/Documents/uoft/PSL1441/Essay/crompton_david_1004162434.org" "/Users/universelaptop/Documents/uoft/PSL1441/auditory/lec1/lec1.org" "/Users/universelaptop/Documents/uoft/PSL1441/auditory/lec2/lec2.org" "/Users/universelaptop/Documents/uoft/PSL1441/auditory/lec3/lec3.org" "/Users/universelaptop/Documents/uoft/PSL1441/auditory/lec5/lec5.org" "/Users/universelaptop/Documents/uoft/PSL1441/lec3/lec3.org" "/Users/universelaptop/Documents/uoft/PSL1441/lec4/lec4.org" "/Users/universelaptop/Documents/uoft/PSL1441/lec5/lec5.org" "/Users/universelaptop/Documents/uoft/PSY492/Research_Proposal/Crompton_David_1004162434_PSY492_Research_Proposal.org" "/Users/universelaptop/Documents/uoft/TA/CoverLetter/Template.org" "/Users/universelaptop/Documents/uoft/phy324/Lab-2-ThermalMotion/Crompton_David_1004162434_Thermal_Motion.org" "/Users/universelaptop/Documents/uoft/phy324/Lab1_DCPOWER/Crompton_David_1004162434_DCPOWER.org" "/Users/universelaptop/Documents/uoft/phy324/Lab_3_Interferometer/Crompton_David_1004162434_PHY324_Lab_Interferometer.org" "/Users/universelaptop/Documents/uoft/phy324/Lab_4_ChargeMass/Crompton_David_1004162434_PHY324_ChargeMass.org" "/Users/universelaptop/Documents/uoft/phy324/Pendulum/Crompton_David_1004162434_PHY324_Pendulum.org" "/Users/universelaptop/Documents/uoft/phy324/lab4/DCPOWER_LAB.org" "/Users/universelaptop/Documents/uoft/MASc_Statement_Of_Intent.org")) + '("/home/universe/Documents/research/DBS/TechnicalEvaluation/technicaldraft.org")) '(org-export-backends '(ascii beamer html icalendar latex odt)) '(org-latex-classes '(("labtemplate" "\\documentclass{labtemplate}" From 15c1113980af4e8ff89abd65823f988ce48b0db4 Mon Sep 17 00:00:00 2001 From: David Crompton Date: Sat, 4 May 2024 16:05:51 -0400 Subject: [PATCH 3/7] Fix Overlay --- flake.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 9a14c89..ac247e2 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ inputs.flake-utils.url = "github:numtide/flake-utils"; outputs = { self, nixpkgs, flake-utils, emacs-overlay }: - flake-utils.lib.eachDefaultSystem (system: let + (flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; overlays = [ @@ -20,9 +20,9 @@ packages = { me-emacs = mkEmacs pkgs "emacs29"; }; - + })) // { overlays.default = final: prev: { me-emacs = mkEmacs final "emacs29"; - }; - }); + }; + }; } From 7f537d472d3aa420980affbd41e4c166b2ddfa2a Mon Sep 17 00:00:00 2001 From: David Crompton Date: Sat, 4 May 2024 16:06:52 -0400 Subject: [PATCH 4/7] Real fix --- flake.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index ac247e2..573420d 100644 --- a/flake.nix +++ b/flake.nix @@ -4,18 +4,18 @@ 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}${pkgs.lib.optionalString pkgs.stdenv.isDarwin "-macport"}"; + }; + in (flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; overlays = [ emacs-overlay.overlays.default ]; }; - mkEmacs = pkgs: v: pkgs.emacsWithPackagesFromUsePackage { - config = ./main.org; - package = pkgs."${v}${pkgs.lib.optionalString pkgs.stdenv.isDarwin "-macport"}"; - }; in { packages = { me-emacs = mkEmacs pkgs "emacs29"; From a25078b1c1afd3fd887042ac8187bd9b300a6e83 Mon Sep 17 00:00:00 2001 From: David Crompton Date: Sat, 4 May 2024 16:09:16 -0400 Subject: [PATCH 5/7] Passthru overlay --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 573420d..27098dc 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,7 @@ me-emacs = mkEmacs pkgs "emacs29"; }; })) // { - overlays.default = final: prev: { + overlays.default = final: prev: (emacs-overlay.overlays.default final prev) // { me-emacs = mkEmacs final "emacs29"; }; }; From 048841f5881952e40e601d97ab825b9baac07c63 Mon Sep 17 00:00:00 2001 From: David Crompton Date: Sat, 11 May 2024 10:31:01 -0400 Subject: [PATCH 6/7] Emacs Pure GTK: Wayland Compat --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 27098dc..0d3aa0e 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ outputs = { self, nixpkgs, flake-utils, emacs-overlay }: let mkEmacs = pkgs: v: pkgs.emacsWithPackagesFromUsePackage { config = ./main.org; - package = pkgs."${v}${pkgs.lib.optionalString pkgs.stdenv.isDarwin "-macport"}"; + package = pkgs."${v}${if pkgs.stdenv.isDarwin then "-macport" else "-pgtk"}"; }; in (flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { From 7fbdd0979f86c01258e9d4fc4bb27c1f6dde7951 Mon Sep 17 00:00:00 2001 From: David Crompton Date: Tue, 4 Jun 2024 23:18:21 -0400 Subject: [PATCH 7/7] Reorganization: Beginning --- main.org | 77 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 28 deletions(-) diff --git a/main.org b/main.org index 746580f..8724d84 100644 --- a/main.org +++ b/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 - ;; (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 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 @@ -59,26 +83,6 @@ replacement for defining configs for different things. `(("." . ,(concat user-emacs-directory "backups"))))) #+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 @@ -90,6 +94,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 @@ -124,10 +148,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