From dccbebb81e9241b9b7b2140b77a818befe6e5a0a Mon Sep 17 00:00:00 2001 From: Preston Pan Date: Mon, 30 Mar 2026 17:31:14 -0700 Subject: sweep --- mindmap/limit.org | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'mindmap') diff --git a/mindmap/limit.org b/mindmap/limit.org index d0f6679..be543ad 100644 --- a/mindmap/limit.org +++ b/mindmap/limit.org @@ -4,6 +4,7 @@ #+title: limit #+author: Preston Pan #+description: Pushing math to its limit +#+LATEX_HEADER: \usepackage{tikz-cd} #+options: broken-links:t @@ -151,5 +152,8 @@ different /kinds/ of limits enables oneself to draw on connections between limit set is exactly the same set with all its limit points included, and both closures, and as we will see, limits, are /idempotent/, which is to say, applying them once is the same thing as applying them twice. Note that if $f: X \rightarrow Y$ where $Y$ is any topological space and $f$ is any continuous function, then $\beta f(X) = f(\beta X)$, which one can represent with a commutative diagram, where $\beta f$ is the /unique extension/ of the mapping $f$. Actually, in a moment -we will see that the funcor commuting is equivalent to the /limit/ commuting. +we will see that the functor commuting is equivalent to the /limit/ commuting on nets. + +*** The Universal Property +We say the following diagram commutes: -- cgit v1.3 From 131261c783e9a2f9a6342f7e341d5c263ce33c2d Mon Sep 17 00:00:00 2001 From: Preston Pan Date: Tue, 31 Mar 2026 02:23:16 -0700 Subject: fix website build; add new content --- .gitignore | 1 + config/emacs.org | 683 ++++++++++++++++++++++++++------------------ config/nix.org | 65 +++-- flake.nix | 2 +- mindmap/lrc_circuit.png | Bin 4632 -> 4632 bytes nix | 2 +- style.scss | 18 +- tests/ci-build-stage-two.el | 98 ++++++- tests/ci-build.el | 16 +- tests/ci-runner.el | 13 +- 10 files changed, 570 insertions(+), 328 deletions(-) (limited to 'mindmap') diff --git a/.gitignore b/.gitignore index 3752675..f8c3556 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ + blog/rss.org sitemap.org sitemap.xml diff --git a/config/emacs.org b/config/emacs.org index cc5182a..6dc0719 100644 --- a/config/emacs.org +++ b/config/emacs.org @@ -87,16 +87,15 @@ syntax elsewhere. Generally, however, these are all unordered and not dependent (global-auto-revert-mode 1) ;; load theme, fonts, and transparency. Prettify symbols. - (set-face-attribute 'default nil :font "Iosevka Nerd Font" :height 130) - (set-face-attribute 'variable-pitch nil :font "Lora" :height 1.1) - (set-face-attribute 'alert-urgent-face nil :inherit nil) - (when (display-graphic-p) + (unless noninteractive (when (display-graphic-p) + (set-face-attribute 'default nil :font "Iosevka Nerd Font" :height 130) + (set-face-attribute 'variable-pitch nil :font "Lora" :height 1.1) (set-fontset-font t 'han (font-spec :family "Noto Sans CJK SC")) (set-fontset-font t 'kana (font-spec :family "Noto Sans CJK JP")) (set-fontset-font t 'emoji (font-spec :family "Noto Color Emoji") nil 'prepend) (set-fontset-font t 'symbol (font-spec :family "Noto Color Emoji") nil 'append) (set-fontset-font t '(#x1f300 . #x1f5ff) (font-spec :family "Noto Color Emoji") nil 'prepend) - (set-fontset-font t '(#xe000 . #xf8ff) (font-spec :family "Symbols Nerd Font Mono") nil 'append))) + (set-fontset-font t '(#xe000 . #xf8ff) (font-spec :family "Symbols Nerd Font Mono") nil 'append)))) ;; imperative (defun evil-config () @@ -128,16 +127,59 @@ syntax elsewhere. Generally, however, these are all unordered and not dependent (defun remove-annoying-pairing () (remove-hook 'post-self-insert-hook #'yaml-electric-bar-and-angle t)) ;; taken from blog https://writepermission.com/org-blogging-rss-feed.html +;; (defun rp/org-rss-publish-to-rss (plist filename pub-dir) +;; "Publish RSS with PLIST, only when FILENAME is 'rss.org'. +;; PUB-DIR is when the output will be placed." +;; (if (equal "rss.org" (file-name-nondirectory filename)) +;; (org-rss-publish-to-rss plist filename pub-dir))) + +;; (defun rp/org-rss-publish-to-rss (plist filename pub-dir) +;; "Publish an Org file to RSS without creating Org IDs." +;; (let* ((ext (concat "." (or (plist-get plist :rss-extension) +;; org-rss-extension +;; "xml"))) +;; (visiting (find-buffer-visiting filename)) +;; (buf (or visiting +;; (let ((org-inhibit-startup t)) +;; (find-file-noselect filename))))) +;; (unwind-protect +;; (with-current-buffer buf +;; (let ((org-inhibit-startup t)) +;; ;; Keep PUBDATE generation. +;; (org-rss-add-pubdate-property) +;; (save-buffer)) +;; (org-publish-org-to 'rss filename ext plist pub-dir)) +;; (unless visiting +;; (kill-buffer buf))))) + (defun rp/org-rss-publish-to-rss (plist filename pub-dir) - "Publish RSS with PLIST, only when FILENAME is 'rss.org'. - PUB-DIR is when the output will be placed." - (if (equal "rss.org" (file-name-nondirectory filename)) - (org-rss-publish-to-rss plist filename pub-dir))) + (org-publish-org-to + 'rss + filename + (concat "." (or (plist-get plist :rss-extension) + org-rss-extension + "xml")) + plist + pub-dir)) + +;; (defun rp/org-rss-publish-to-rss (plist filename pub-dir) +;; "Use stock RSS publishing for normal posts, but bypass UID/PUBDATE +;; mutation for the generated rss.org sitemap." +;; (if (string-equal (file-name-nondirectory filename) "rss.org") +;; (org-publish-org-to +;; 'rss +;; filename +;; (concat "." (or (plist-get plist :rss-extension) +;; org-rss-extension +;; "xml")) +;; plist +;; pub-dir) +;; (org-rss-publish-to-rss plist filename pub-dir))) (defun format-rss-feed-entry (entry style project) "Format ENTRY for the RSS feed. - ENTRY is a file name. STYLE is either 'list' or 'tree'. - PROJECT is the current project." +ENTRY is a file name. STYLE is either 'list' or 'tree'. +PROJECT is the current project." (cond ((not (directory-name-p entry)) (let* ((file (org-publish--expand-file-name entry project)) (title (org-publish-find-title entry project)) @@ -156,6 +198,7 @@ syntax elsewhere. Generally, however, these are all unordered and not dependent (file-name-nondirectory (directory-file-name entry))) (t entry))) + (defun format-rss-feed (title list) "Generate the rss.org file from the formatted list." (with-temp-buffer @@ -281,9 +324,9 @@ then append the typed input to the mu4e database query." (setq my-dashboard-refresh-timer (run-with-timer 60 60 #'my-refresh-dashboard-if-visible))) (defun my-fix-htmlize-invalid-face-bug (orig-fn face attribute &optional frame inherit) - (if (eq face t) - 'unspecified - (funcall orig-fn face attribute frame inherit))) + (if (facep face) + (funcall orig-fn face attribute frame inherit) + 'unspecified)) #+end_src ** Random Packages These are packages that I require in order to write some scripts in emacs-lisp. @@ -491,7 +534,7 @@ This is my org mode configuration, which also configures latex. (use-package htmlize :demand t - :after (catppuccin-theme doom-themes yaml-mode) + :after (doom-themes yaml-mode) :config (advice-add 'face-attribute :around #'my-fix-htmlize-invalid-face-bug)) (use-package ox-latex @@ -544,15 +587,13 @@ This is my org mode configuration, which also configures latex. :html-footnotes-section "
%s%s
" :html-head ,(concat "\n\n\n\n\n\n\n\n\n\n\n" "" "") - (s-replace "\n" "") - (s-replace "/*]]>*/-->" "") - (s-trim) - (minify-css))) - "/* HTMLIZE FAILED TO LOAD - CHECK EMACS INIT ERRORS */") + (->> (create-htmlize-css) + (s-replace-regexp "]*>" "") + (s-replace "" "") + (s-replace "\n" "") + (s-replace "/*]]>*/-->" "") + (s-trim) + (minify-css)) (f-read-text "~/monorepo/style.css" 'utf-8) "") :html-preamble t @@ -565,19 +606,43 @@ This is my org mode configuration, which also configures latex. :sitemap-style list :sitemap-sort-files anti-chronologically) + ;; ("website-blog-rss" + ;; :base-directory "~/monorepo/blog" + ;; :base-extension "org" + ;; :recursive nil + ;; :exclude "rss\\.org\\|index\\.org\\|404\\.org" + ;; :rss-extension "xml" + + ;; :publishing-directory "~/website_html/blog" + ;; :publishing-function rp/org-rss-publish-to-rss + ;; :html-link-home "https://ret2pop.net/blog/" + ;; :html-link-use-abs-url t + + ;; ;; use custom sitemap functionality to publish rss feed + ;; :auto-sitemap t + ;; :sitemap-filename "rss.org" + ;; :sitemap-title "Blog Feed" + ;; :sitemap-style list + ;; :sitemap-sort-folders ignore + ;; :sitemap-sort-files anti-chronologically + ;; :sitemap-format-entry format-rss-feed-entry + ;; :sitemap-function format-rss-feed) + ("website-blog-rss" :base-directory "~/monorepo/blog" :base-extension "org" :recursive nil - :exclude "rss\\.org\\|index\\.org\\|404\\.org" - :rss-extension "xml" + ;; Only publish the generated feed source. + :exclude ".*" + :include ("rss.org") + + :rss-extension "xml" :publishing-directory "~/website_html/blog" :publishing-function rp/org-rss-publish-to-rss :html-link-home "https://ret2pop.net/blog/" :html-link-use-abs-url t - ;; use custom sitemap functionality to publish rss feed :auto-sitemap t :sitemap-filename "rss.org" :sitemap-title "Blog Feed" @@ -624,8 +689,7 @@ I already pull in all-the-icons, but we need the emacs package to load it correc I use this in org-mode so that I can read/write with variable pitched font. Feels like I'm reading a blog article or something. #+begin_src emacs-lisp :tangle ../nix/init.el (use-package mixed-pitch - :hook ((text-mode . mixed-pitch-mode) - (org-mode . mixed-pitch-mode)) + :hook ((org-mode . mixed-pitch-mode)) :custom (mixed-pitch-set-height t) :config (dolist (face '(org-latex-and-related @@ -645,7 +709,19 @@ I want to show indent lines in emacs so that I can line things up. #+begin_src emacs-lisp :tangle ../nix/init.el (use-package indent-bars :after (nix-mode) - :hook ((python-mode yaml-mode nix-mode) . indent-bars-mode)) + :hook ( + (python-ts-mode . indent-bars-mode) + (css-ts-mode . indent-bars-mode) + (haskell-mode . indent-bars-mode) + (js-ts-mode . indent-bars-mode) + (c-ts-mode . indent-bars-mode) + (c++-ts-mode . indent-bars-mode) + (rust-ts-mode . indent-bars-mode) + (go-ts-mode . indent-bars-mode) + (python-mode . indent-bars-mode) + (yaml-ts-mode . indent-bars-mode) + (nix-mode . indent-bars-mode) + (emacs-lisp-mode . indent-bars-mode))) #+end_src * Autopair Use electric-pair to automatically complete pairs of things. We need to change @@ -683,15 +759,29 @@ Yasnippets are useful for macros that automatically complete to an arbitrary for Company-mode! We need this to do autocomplete stuff. #+begin_src emacs-lisp :tangle ../nix/init.el (use-package company - :custom (company-backends '(company-ispell company-capf company-yasnippet company-files) "Set company backends") + :custom + (company-backends '(company-capf company-files company-yasnippet company-ispell)) + + (company-idle-delay 0.1) + (company-minimum-prefix-length 1) + (company-require-match nil) + (company-selection-wrap-around t) + (company-tooltip-align-annotations t) + :bind (:map company-active-map ("RET" . nil) ("" . nil) - ("tab" . company-complete-selection) - ("" . company-complete-selection)) + ("TAB" . company-complete-selection) + ("" . company-complete-selection) + ("C-j" . company-select-next) + ("C-k" . company-select-previous)) + :hook ((after-init . global-company-mode))) + (use-package company-box - :hook (company-mode . company-box-mode)) + :hook (company-mode . company-box-mode) + :custom + (company-box-scrollbar nil)) #+end_src * Spelling This loads a dictionary so that I can save certain words to be not misspelled and also have @@ -713,112 +803,200 @@ this spellcheck during org mode. * Packages First, some small configurations and some evil-mode initilaization because I like vim keybindings: #+begin_src emacs-lisp :tangle ../nix/init.el -(use-package evil - :demand t - :custom (evil-want-keybinding nil "Don't load a whole bunch of default keybindings") - :bind - (:map evil-normal-state-map - ("/" . swiper) - ("?" . (lambda () (interactive) (swiper "--reverse")))) - :config (evil-config)) - -(use-package evil-collection - :demand t - :after (evil) - :bind (:map evil-motion-state-map - ("SPC" . nil) - ("RET" . nil) - ("TAB" . nil)) - :config (evil-collection-init)) - -(use-package evil-commentary - :after (evil) - :config (evil-commentary-mode)) - -(use-package evil-org - :after (evil org) - :hook (org-mode . evil-org-mode)) - -(use-package evil-org-agenda - :after (evil-org) - :config (evil-org-agenda-set-keys)) - -(use-package which-key - :config (which-key-mode)) - -(use-package page-break-lines - :config (page-break-lines-mode)) - -(use-package evil-mc - :after evil - :config (global-evil-mc-mode 1)) - -(use-package evil-surround - :after evil - :config - (global-evil-surround-mode 1)) - -(use-package evil-lion - :config - (evil-lion-mode)) - -(use-package evil-multiedit - :after evil - :config - (evil-multiedit-default-keybinds)) - -(use-package evil-textobj-tree-sitter - :ensure t - ;; Ensure Evil is loaded first so the text-object maps exist - :after evil - - ;; 1. The Keybindings - :bind ((:map evil-outer-text-objects-map - ("f" . my-treesit-outer-function) - ("c" . my-treesit-outer-class) - ("a" . my-treesit-outer-arg)) - - (:map evil-inner-text-objects-map - ("f" . my-treesit-inner-function) - ("c" . my-treesit-inner-class) - ("a" . my-treesit-inner-arg)) - - (:map evil-normal-state-map - ("] f" . my-treesit-goto-next-function) - ("[ f" . my-treesit-goto-prev-function) - ("] c" . my-treesit-goto-next-class) - ("[ c" . my-treesit-goto-prev-class))) - - ;; 2. The Command Definitions - :config - ;; Link the custom names we bound above to the actual Tree-sitter closures - (defalias 'my-treesit-outer-function (evil-textobj-tree-sitter-get-textobj "function.outer")) - (defalias 'my-treesit-inner-function (evil-textobj-tree-sitter-get-textobj "function.inner")) - - (defalias 'my-treesit-outer-class (evil-textobj-tree-sitter-get-textobj "class.outer")) - (defalias 'my-treesit-inner-class (evil-textobj-tree-sitter-get-textobj "class.inner")) - - ;; "a" is standard Vim terminology for "argument" (parameter) - (defalias 'my-treesit-outer-arg (evil-textobj-tree-sitter-get-textobj "parameter.outer")) - (defalias 'my-treesit-inner-arg (evil-textobj-tree-sitter-get-textobj "parameter.inner")) - - ;; Navigation commands are standard interactive functions, so we wrap them cleanly - (defun my-treesit-goto-next-function () - (interactive) - (evil-textobj-tree-sitter-goto-textobj "function.outer")) + (use-package evil + :demand t + :custom (evil-want-keybinding nil "Don't load a whole bunch of default keybindings") + :bind + (:map evil-normal-state-map + ("/" . swiper) + ("?" . (lambda () (interactive) (swiper "--reverse")))) + :config (evil-config)) + + (use-package evil-collection + :demand t + :after (evil) + :bind (:map evil-motion-state-map + ("SPC" . nil) + ("RET" . nil) + ("TAB" . nil)) + :config (evil-collection-init)) + + (use-package evil-commentary + :after (evil) + :config (evil-commentary-mode)) + + (use-package evil-org + :after (evil org) + :hook (org-mode . evil-org-mode)) + + (use-package evil-org-agenda + :after (evil-org) + :config (evil-org-agenda-set-keys)) + + (use-package which-key + :config (which-key-mode)) + + (use-package page-break-lines + :config (page-break-lines-mode)) + + (use-package evil-mc + :after evil + :config (global-evil-mc-mode 1)) + + (use-package evil-surround + :after evil + :config + (global-evil-surround-mode 1)) + + (use-package evil-lion + :config + (evil-lion-mode)) + + (use-package evil-multiedit + :after evil + :config + (evil-multiedit-default-keybinds)) + + (use-package evil-textobj-tree-sitter + :ensure t + ;; Ensure Evil is loaded first so the text-object maps exist + :after evil - (defun my-treesit-goto-prev-function () - (interactive) - (evil-textobj-tree-sitter-goto-textobj "function.outer" t)) - - (defun my-treesit-goto-next-class () - (interactive) - (evil-textobj-tree-sitter-goto-textobj "class.outer")) + ;; 1. The Keybindings + :bind ((:map evil-outer-text-objects-map + ("f" . my-treesit-outer-function) + ("c" . my-treesit-outer-class) + ("a" . my-treesit-outer-arg)) + + (:map evil-inner-text-objects-map + ("f" . my-treesit-inner-function) + ("c" . my-treesit-inner-class) + ("a" . my-treesit-inner-arg)) + + (:map evil-normal-state-map + ("] f" . my-treesit-goto-next-function) + ("[ f" . my-treesit-goto-prev-function) + ("] c" . my-treesit-goto-next-class) + ("[ c" . my-treesit-goto-prev-class))) + + ;; 2. The Command Definitions + :config + ;; Link the custom names we bound above to the actual Tree-sitter closures + (defalias 'my-treesit-outer-function (evil-textobj-tree-sitter-get-textobj "function.outer")) + (defalias 'my-treesit-inner-function (evil-textobj-tree-sitter-get-textobj "function.inner")) - (defun my-treesit-goto-prev-class () - (interactive) - (evil-textobj-tree-sitter-goto-textobj "class.outer" t))) - + (defalias 'my-treesit-outer-class (evil-textobj-tree-sitter-get-textobj "class.outer")) + (defalias 'my-treesit-inner-class (evil-textobj-tree-sitter-get-textobj "class.inner")) + + ;; "a" is standard Vim terminology for "argument" (parameter) + (defalias 'my-treesit-outer-arg (evil-textobj-tree-sitter-get-textobj "parameter.outer")) + (defalias 'my-treesit-inner-arg (evil-textobj-tree-sitter-get-textobj "parameter.inner")) + + ;; Navigation commands are standard interactive functions, so we wrap them cleanly + (defun my-treesit-goto-next-function () + (interactive) + (evil-textobj-tree-sitter-goto-textobj "function.outer")) + + (defun my-treesit-goto-prev-function () + (interactive) + (evil-textobj-tree-sitter-goto-textobj "function.outer" t)) + + (defun my-treesit-goto-next-class () + (interactive) + (evil-textobj-tree-sitter-goto-textobj "class.outer")) + + (defun my-treesit-goto-prev-class () + (interactive) + (evil-textobj-tree-sitter-goto-textobj "class.outer" t))) + + + (use-package general + :after (evil evil-collection) + :config + (general-create-definer leader-key :prefix "SPC") + ;; these are just bindings but the symbols are all lazily handled by general + (create-irc-servers + (znc "ret2pop.net" "5000") + (prestonpan "nullring.xyz" "6697") + (libera-chat "irc.libera.chat" "6697") + (efnet "irc.prison.net" "6697") + (matrix-org "matrix.org" "8448") + (gimp-org "irc.gimp.org" "6697")) + + (leader-key 'normal + "o c" '(org-capture :wk "Capture") + ;; Org Mode + "n" '(:ignore t :wk "Org mode plugins") + "n j j" '(org-journal-new-entry :wk "Make new journal entry") + "n r f" '(org-roam-node-find :wk "Find roam node") + "n r i" '(org-roam-node-insert :wk "Insert roam node") + "n r a" '(org-roam-alias-add :wk "Add alias to org roam node") + "n r g" '(org-roam-graph :wk "Graph roam database") + "m I" '(org-id-get-create :wk "Make org id") + + ;; Programming Projects + "." '(counsel-find-file :wk "find file") + "p a" '(projectile-add-known-project :wk "Add to project list") + + "N f" '(nix-flake :wk "nix flake menu") + "f" '(:ignore t :wk "file operations") + "f p" '(projectile-switch-project :wk "find project to switch to") + "f f" '(counsel-fzf :wk "find file in project") + "f s" '(counsel-rg :wk "find string in project") + + "y n s" '(yas-new-snippet :wk "Create new snippet") + + "g" '(:ignore t :wk "Magit") + "g /" '(magit-dispatch :wk "git commands") + "g P" '(magit-push :wk "git push") + "g c" '(magit-commit :wk "git commit") + "g p" '(magit-pull :wk "Pull from git") + "g s" '(magit-status :wk "Change status of files") + "g i" '(magit-init :wk "init new git project") + "g r" '(magit-rebase :wk "Rebase branch") + "g m" '(magit-merge :wk "Merge branches") + "g b" '(magit-branch :wk "Git branch") + + "o p" '(treemacs :wk "Project Drawer") + "o P" '(treemacs-projectile :wk "Import Projectile project to treemacs") + + "w r" '(writeroom-mode :wk "focus mode for writing") + + ;; Applications + "o" '(:ignore t :wk "Open application") + "o t" '(projectile-run-vterm-other-window :wk "Terminal") + "o e" '(projectile-run-eshell :wk "Elisp Interpreter") + "o m" '(mu4e :wk "Email") + "o M" '(matrix-org :wk "Connect to matrix") + "o r s" '(elfeed :wk "rss feed") + "o a" '(org-agenda :wk "Open agenda") + "o w" '(eww :wk "web browser") + "o n" '(enwc :wk "NetworkManager Interface") + "m m" '(emms :wk "Music player") + "s m" '(proced :wk "System Manager") + "l p" '(list-processes :wk "List Emacs Processes") + + "m P p" '(org-publish :wk "Publish website components") + "s e" '(sudo-edit :wk "Edit file with sudo") + + ;; "f f" '(eglot-format :wk "Format code buffer") + "i p c" '(prestonpan :wk "Connect to my IRC server") + "i l c" '(liberachat :wk "Connect to libera chat server") + "i e c" '(efnet :wk "Connect to efnet chat server") + "i g c" '(gimp-org :wk "Connect to gimp chat server") + "i z c" '(znc :wk "Connect to my ZNC instance") + + ;; Documentation + "h" '(:ignore t :wk "Documentation") + "h v" '(counsel-describe-variable :wk "Describe variable") + "h f" '(counsel-describe-function :wk "Describe function") + "h h" '(help :wk "Help") + "h m" '(woman :wk "Manual") + "h i" '(info :wk "Info") + + "s i p" '(insert-urandom-password :wk "insert random password to buffer (for sops)") + + "h r r" '(lambda () (interactive) (load-file (expand-file-name "~/monorepo/nix/init.el"))))) #+end_src ** Journal I use org-journal to journal about my life, and it's a part of my website: @@ -875,6 +1053,7 @@ I used to use catppuccin, but the doom themes are so good that I am willing to b to use doom themes. I mean it looks better anyways if emacs is a distinct theme. #+begin_src emacs-lisp :tangle ../nix/init.el (use-package doom-themes + :demand t :custom (doom-themes-enable-bold t "use bold letters") (doom-themes-enable-italic t "use italic letters") @@ -882,9 +1061,6 @@ to use doom themes. I mean it looks better anyways if emacs is a distinct theme. :config (unless noninteractive (doom-themes-config))) -(use-package catppuccin-theme - :config (when noninteractive (try (load-theme 'catppuccin-theme t)))) - (use-package solaire-mode :after doom-themes :config (solaire-global-mode +1)) @@ -925,7 +1101,71 @@ We use org-alert in order to give us notifications based on our org-agenda. ** LSP We set up eglot, the LSP manager for emacs, now built in: #+begin_src emacs-lisp :tangle ../nix/init.el +(use-package python + :after lsp-mode + :hook (python-ts-mode . lsp-deferred)) + +(use-package yaml-mode + :after lsp-mode + :hook (yaml-ts-mode . lsp-deferred)) + +(use-package go-ts-mode + :after lsp-mode + :hook (go-ts-mode . lsp-deferred)) + +(use-package haskell-mode + :after lsp-mode + :hook (haskell-mode . lsp-deferred)) + +(use-package scheme-mode + :hook (scheme-mode . lsp-deferred) + :after lsp-mode + :mode ("\\.sls\\'" "\\.scm\\'")) + +(use-package elisp-mode + :after lsp-mode + :hook (emacs-lisp-mode . lsp-deferred)) + +(use-package cc-mode + :after lsp-mode + :hook ((c-mode . lsp-deferred) + (c-ts-mode . lsp-deferred))) + +(use-package css-mode + :after lsp-mode + :hook ((css-mode . lsp-deferred) + (css-ts-mode . lsp-deferred))) + +(use-package js + :after lsp-mode + :hook ((js-mode . lsp-deferred) + (js-ts-mode . lsp-deferred) + (tsx-ts-mode . lsp-deferred))) + +(use-package json-mode + :after lsp-mode + :hook ((json-mode . lsp-deferred) + (json-ts-mode . lsp-deferred))) + +(use-package toml-mode + :after lsp-mode + :hook ((toml-ts-mode . lsp-deferred))) + +(use-package nix-mode + :demand t + :after lsp-mode + :hook (nix-mode . lsp-deferred) + :mode "\\.nix\\'") + +(use-package sh-script + :after lsp-mode + :hook (sh-mode . lsp-deferred)) + +(use-package poetry + :config (poetry-tracking-mode 1)) + (use-package lsp-mode + :demand t :custom (lsp-use-plists t) (lsp-typescript-format-enable t) @@ -937,18 +1177,6 @@ We set up eglot, the LSP manager for emacs, now built in: (lsp-restart 'auto-restart) (lsp-keep-workspace-alive t) - :hook ((python-mode . lsp-deferred) - (python-ts-mode . lsp-deferred) - (emacs-lisp-mode . lsp-deferred) - (yaml-mode . lsp-deferred) - (yaml-ts-mode . lsp-deferred) - (json-mode . lsp-deferred) - (json-ts-mode . lsp-deferred) - (toml-mode . lsp-deferred) - (toml-ts-mode . lsp-deferred) - (sh-mode . lsp-deferred) - (nix-mode . lsp-deferred)) - :commands (lsp lsp-deferred) :general (:states 'normal :keymaps 'lsp-mode-map "gI" #'lsp-find-implementation @@ -993,8 +1221,6 @@ Specific configuration for C (I also use the clangd lsp): For writing solidity: #+begin_src emacs-lisp :tangle ../nix/init.el (use-package solidity-mode) -(use-package company-solidity - :after company) (use-package solidity-flycheck :after flycheck :custom (solidity-flycheck-solc-checker-active t)) @@ -1059,8 +1285,12 @@ Ivy is a pretty cool general program for displaying stuff: :bind ("C-j" . ivy-immediate-done) ("C-c C-r" . ivy-resume) - :init (ivy-mode) - :config (ivy-rich-mode)) + :config + (ivy-mode)) + +(use-package ivy-rich + :config + (ivy-rich-mode)) (use-package counsel :after ivy @@ -1137,99 +1367,6 @@ Configure IRC to use my username. (erc-nick system-username "sets erc username to the one set in nix config") (erc-user-full-name system-fullname "sets erc fullname to the one set in nix config")) #+end_src -** Keybindings -Global keybindings for everything that I care about globally. It's all here! I use general -to manage my global keybindings in a declarative way. These are in part inspired by the doom -emacs keybindings. -#+begin_src emacs-lisp :tangle ../nix/init.el -(use-package general - :after (evil evil-collection) - :init (general-create-definer leader-key :prefix "SPC") - :config - ;; these are just bindings but the symbols are all lazily handled by general - (create-irc-servers - (znc "ret2pop.net" "5000") - (prestonpan "nullring.xyz" "6697") - (libera-chat "irc.libera.chat" "6697") - (efnet "irc.prison.net" "6697") - (matrix-org "matrix.org" "8448") - (gimp-org "irc.gimp.org" "6697")) - - (leader-key 'normal - "o c" '(org-capture :wk "Capture") - ;; Org Mode - "n" '(:ignore t :wk "Org mode plugins") - "n j j" '(org-journal-new-entry :wk "Make new journal entry") - "n r f" '(org-roam-node-find :wk "Find roam node") - "n r i" '(org-roam-node-insert :wk "Insert roam node") - "n r a" '(org-roam-alias-add :wk "Add alias to org roam node") - "n r g" '(org-roam-graph :wk "Graph roam database") - "m I" '(org-id-get-create :wk "Make org id") - - ;; Programming Projects - "." '(counsel-find-file :wk "find file") - "p a" '(projectile-add-known-project :wk "Add to project list") - - "N f" '(nix-flake :wk "nix flake menu") - "f" '(:ignore t :wk "file operations") - "f p" '(projectile-switch-project :wk "find project to switch to") - "f f" '(counsel-fzf :wk "find file in project") - "f s" '(counsel-rg :wk "find string in project") - - "y n s" '(yas-new-snippet :wk "Create new snippet") - - "g" '(:ignore t :wk "Magit") - "g /" '(magit-dispatch :wk "git commands") - "g P" '(magit-push :wk "git push") - "g c" '(magit-commit :wk "git commit") - "g p" '(magit-pull :wk "Pull from git") - "g s" '(magit-status :wk "Change status of files") - "g i" '(magit-init :wk "init new git project") - "g r" '(magit-rebase :wk "Rebase branch") - "g m" '(magit-merge :wk "Merge branches") - "g b" '(magit-branch :wk "Git branch") - - "o p" '(treemacs :wk "Project Drawer") - "o P" '(treemacs-projectile :wk "Import Projectile project to treemacs") - - "w r" '(writeroom-mode :wk "focus mode for writing") - - ;; Applications - "o" '(:ignore t :wk "Open application") - "o t" '(vterm :wk "Terminal") - "o e" '(eshell :wk "Elisp Interpreter") - "o m" '(mu4e :wk "Email") - "o M" '(matrix-org :wk "Connect to matrix") - "o r s" '(elfeed :wk "rss feed") - "o a" '(org-agenda :wk "Open agenda") - "o w" '(eww :wk "web browser") - "o n" '(enwc :wk "NetworkManager Interface") - "m m" '(emms :wk "Music player") - "s m" '(proced :wk "System Manager") - "l p" '(list-processes :wk "List Emacs Processes") - - "m P p" '(org-publish :wk "Publish website components") - "s e" '(sudo-edit :wk "Edit file with sudo") - - ;; "f f" '(eglot-format :wk "Format code buffer") - "i p c" '(prestonpan :wk "Connect to my IRC server") - "i l c" '(liberachat :wk "Connect to libera chat server") - "i e c" '(efnet :wk "Connect to efnet chat server") - "i g c" '(gimp-org :wk "Connect to gimp chat server") - "i z c" '(znc :wk "Connect to my ZNC instance") - - ;; Documentation - "h" '(:ignore t :wk "Documentation") - "h v" '(counsel-describe-variable :wk "Describe variable") - "h f" '(counsel-describe-function :wk "Describe function") - "h h" '(help :wk "Help") - "h m" '(woman :wk "Manual") - "h i" '(info :wk "Info") - - "s i p" '(insert-urandom-password :wk "insert random password to buffer (for sops)") - - "h r r" '(lambda () (interactive) (load-file (expand-file-name "~/monorepo/nix/init.el"))))) -#+end_src ** LLM I use LLMs in order to help me come up with ideas. I use a local LLM so that I can have a competitive LLM that doesn't cost money. @@ -1238,30 +1375,20 @@ Minuet does my code completion, showing the potential code completion as a ghost still. It is kind of like copilot but it works with local LLMs, which is better. Though, it's obviously not always the most accurate. #+begin_src emacs-lisp :tangle ../nix/init.el (use-package minuet - :bind - (("M-y" . #'minuet-complete-with-minibuffer) - ("C-c m" . #'minuet-show-suggestion) - :map minuet-active-mode-map - ("C-c r" . #'minuet-dismiss-suggestion) - ("TAB" . #'minuet-accept-suggestion)) - :hook ((prog-mode-hook . minuet-auto-suggestion-mode)) - :custom - (minuet-request-timeout 40 "Max timeout in seconds") - (minuet-provider 'openai-fim-compatible "FIM compatible OpenAI-like API (Ollama)") - (minuet-n-completions 1 "I am using ghost text so I only need one possible completion") - (minuet-context-window 1024 "how much context do I want?") - (minuet-openai-fim-compatible-options - '( - :end-point "http://localhost:11434/v1/completions" - :name "Ollama" - :api-key "TERM" - :template ( - :prompt minuet--default-fim-prompt-function - :suffix minuet--default-fim-suffix-function) - :transform () - :get-text-fn minuet--openai-fim-get-text-fn - :optional (:max-tokens 50) - :model "qwen2.5-coder:14b"))) + :config + (setq minuet-provider 'openai-fim-compatible) + (setq minuet-n-completions 1) + (setq minuet-context-window 4096) + (plist-put minuet-openai-fim-compatible-options :end-point "http://localhost:11434/v1/completions") + ;; an arbitrary non-null environment variable as placeholder. + ;; For Windows users, TERM may not be present in environment variables. + ;; Consider using APPDATA instead. + (plist-put minuet-openai-fim-compatible-options :name "Ollama") + (plist-put minuet-openai-fim-compatible-options :api-key "nothing") + (plist-put minuet-openai-fim-compatible-options :model "rnj-1:latest") + + (minuet-set-optional-options minuet-openai-fim-compatible-options :max_tokens 100) + :hook (prog-mode-hook . minuet-auto-suggestion-mode)) #+end_src ** RSS Feed I use really simple syndication (RSS) in order to read news. As a result, I use @@ -1514,15 +1641,9 @@ to Chromium if I have to: ** Nix Mode Load Nix mode so our exported website has syntax highlighting for Nix blocks. #+begin_src emacs-lisp :tangle ../nix/init.el - (use-package nix-mode - :demand t - :mode "\\.nix\\'") #+end_src ** Scheme #+begin_src emacs-lisp :tangle ../nix/init.el -(use-package scheme-mode - :mode ("\\.sls\\'" "\\.scm\\'")) - (use-package geiser :after scheme) @@ -1696,7 +1817,7 @@ I use tabs because sometimes I like using the mouse (it's actually more efficien (:map global-map ("C-x l" . pulsar-pulse-line) ("C-x L" . pulsar-highlight-permanently-dwim)) - :init + :config (pulsar-global-mode 1)) #+end_src * Unpinned diff --git a/config/nix.org b/config/nix.org index ff777fb..dca7f38 100644 --- a/config/nix.org +++ b/config/nix.org @@ -134,21 +134,21 @@ and now for the main flake: }; commonModules = hostname: [ - impermanence.nixosModules.impermanence - nix-topology.nixosModules.default - lanzaboote.nixosModules.lanzaboote - disko.nixosModules.disko - home-manager.nixosModules.home-manager - sops-nix.nixosModules.sops - nixos-dns.nixosModules.dns - { - nixpkgs.overlays = [ nur.overlays.default ]; - home-manager.extraSpecialArgs = attrs // { - systemHostName = "${hostname}"; - }; - networking.hostName = "${hostname}"; - } - (./. + "/systems/${hostname}/default.nix") + impermanence.nixosModules.impermanence + nix-topology.nixosModules.default + lanzaboote.nixosModules.lanzaboote + disko.nixosModules.disko + home-manager.nixosModules.home-manager + sops-nix.nixosModules.sops + nixos-dns.nixosModules.dns + { + nixpkgs.overlays = [ nur.overlays.default ]; + home-manager.extraSpecialArgs = attrs // { + systemHostName = "${hostname}"; + }; + networking.hostName = "${hostname}"; + } + (./. + "/systems/${hostname}/default.nix") ]; mkHostModules = hostname: @@ -1569,19 +1569,29 @@ does not support conduit at the moment. Note that this is not fully declarative ** Ollama Use ollama for serving large language models to my other computers. #+begin_src nix :tangle ../nix/modules/ollama.nix - { config, lib, pkgs, ... }: - { - # services.open-webui.enable = lib.mkDefault (!config.monorepo.profiles.server.enable); - services.ollama = { - enable = lib.mkDefault config.monorepo.profiles.desktop.enable; - package = if (config.monorepo.profiles.cuda.enable) then pkgs.ollama-cuda else pkgs.ollama-vulkan; - loadModels = if (config.monorepo.profiles.cuda.enable) then [ - ] else [ - ]; - host = "0.0.0.0"; - openFirewall = true; +{ config, lib, pkgs, ... }: +{ + services.open-webui = { + enable = lib.mkDefault config.services.ollama.enable; + port = 11111; + host = "127.0.0.1"; + environment = { + OLLAMA_API_BASE_URL = "http://127.0.0.1:11434"; + # Disable authentication + WEBUI_AUTH = "False"; }; - } + }; + + services.ollama = { + enable = lib.mkDefault config.monorepo.profiles.desktop.enable; + package = if (config.monorepo.profiles.cuda.enable) then pkgs.ollama-cuda else pkgs.ollama-vulkan; + loadModels = if (config.monorepo.profiles.cuda.enable) then [ + ] else [ + ]; + host = "0.0.0.0"; + openFirewall = true; + }; +} #+end_src ** Bitcoind #+begin_src nix :tangle ../nix/modules/bitcoin.nix @@ -3570,6 +3580,7 @@ epkgs: with epkgs; [ platformio-mode projectile polymode + poetry rustic s sops diff --git a/flake.nix b/flake.nix index 23d3ae8..9cf033d 100644 --- a/flake.nix +++ b/flake.nix @@ -233,7 +233,7 @@ fi buildPhase = '' export HOME=$TMPDIR/fake-home -mkdir -p $HOME/.emacs.d +mkdir -p $HOME/.emacs.d/snippets mkdir -p public mkdir -p .cache/texmf diff --git a/mindmap/lrc_circuit.png b/mindmap/lrc_circuit.png index 9f781a0..a2fe380 100644 Binary files a/mindmap/lrc_circuit.png and b/mindmap/lrc_circuit.png differ diff --git a/nix b/nix index 691a04f..cff2184 160000 --- a/nix +++ b/nix @@ -1 +1 @@ -Subproject commit 691a04f2dc49e6b8ec95e7463dd0cab49fbc3043 +Subproject commit cff2184c501a59c8f2772f2fb20d0c8dd217cd94 diff --git a/style.scss b/style.scss index a4c39ed..9204cd3 100644 --- a/style.scss +++ b/style.scss @@ -472,10 +472,24 @@ h1.title { } .theorem { margin-bottom: 20px; &::before { content: "Theorem.\00a0\00a0"; } } + .proof { + position: relative; margin-bottom: 30px; - &::after { content: "\25FC"; float: right; } - &::before { content: 'Proof.\00a0\00a0'; } + padding-right: 1.2em; + &::before { + content: "Proof.\00a0\00a0"; + } + &::after { + content: ""; + position: absolute; + right: 0; + bottom: 0.2em; + width: 0.65em; + height: 0.65em; + border: 0.08em solid currentColor; + box-sizing: border-box; + } } .links-page > ul { diff --git a/tests/ci-build-stage-two.el b/tests/ci-build-stage-two.el index aca425d..1b58af4 100644 --- a/tests/ci-build-stage-two.el +++ b/tests/ci-build-stage-two.el @@ -16,6 +16,7 @@ (setq org-html-link-org-files-as-html t) (require (quote htmlize)) +(require 'hl-line) (require (quote nix-mode)) (setq org-html-htmlize-output-type (quote css)) @@ -24,14 +25,22 @@ (defun my-ci-force-fontification () "Ensure the buffer is fully colorized before htmlize touches it." - (font-lock-ensure) - (font-lock-flush) - (font-lock-ensure)) + ;; Do NOT try to syntax-highlight the Frankenstein RSS file + (unless (string-match-p "rss\\.org$" (buffer-file-name)) + (font-lock-ensure))) + +(princ "after ci force fontification\n" (quote external-debugging-output)) +(princ "C\n" 'external-debugging-output) (add-hook 'org-publish-before-export-hook #'my-ci-force-fontification) +(princ "C\n" 'external-debugging-output) + +(princ "please work\n" (quote external-debugging-output)) (face-spec-recalc 'default (selected-frame)) -(when (fboundp 'redisplay) (redisplay t)) +(princ "please work part 2\n" (quote external-debugging-output)) +;; (when (fboundp 'redisplay) (redisplay t)) +(princ "please work part 3\n" (quote external-debugging-output)) (princ (format "THEME CHECK - Default background: %s\n" (face-attribute 'default :background)) @@ -39,5 +48,84 @@ (princ "STEP 6: before publish-all\n" (quote external-debugging-output)) +(setq treesit-auto-install nil) + +;; --- DUMP LOG BUFFERS --- +(let ((warnings-buf (get-buffer "*Warnings*")) + (messages-buf (get-buffer "*Messages*"))) + + (princ "\n========================================\n" 'external-debugging-output) + + ;; 1. Dump Warnings + (if warnings-buf + (with-current-buffer warnings-buf + (princ " DUMPING *Warnings* BUFFER \n" 'external-debugging-output) + (princ "----------------------------------------\n" 'external-debugging-output) + (princ (buffer-string) 'external-debugging-output)) + (princ " No *Warnings* buffer found. \n" 'external-debugging-output)) + + (princ "\n========================================\n" 'external-debugging-output) + + ;; 2. Dump Messages + (if messages-buf + (with-current-buffer messages-buf + (princ " DUMPING *Messages* BUFFER \n" 'external-debugging-output) + (princ "----------------------------------------\n" 'external-debugging-output) + (princ (buffer-string) 'external-debugging-output)) + (princ " No *Messages* buffer found. \n" 'external-debugging-output)) + + (princ "========================================\n\n" 'external-debugging-output)) +;; ---------------------------- + +(require 'pp) ; Pull in the pretty-printer + +(princ "\n========================================\n" 'external-debugging-output) +(princ " DUMPING org-publish-project-alist \n" 'external-debugging-output) +(princ "----------------------------------------\n" 'external-debugging-output) + +;; pp-to-string formats the nested list with proper indentation and line breaks +(princ (pp-to-string org-publish-project-alist) 'external-debugging-output) + +(princ "\n========================================\n\n" 'external-debugging-output) +(setq org-export-use-babel nil) + +(advice-add 'org-publish-file :before + (lambda (file &rest _) + (princ (format "-> Exporting file: %s\n" file) 'external-debugging-output))) + +(advice-add 'org-publish-find-title :before + (lambda (file &rest _) + (princ (format "-> Extracting title for sitemap: %s\n" file) 'external-debugging-output))) + +(advice-add 'org-publish-file :after + (lambda (file &rest _) + (princ (format "<- Finished file: %s\n" file) 'external-debugging-output))) + +(defvar my-sitemap-counter 0) +(advice-add 'org-sitemap-format-entry-xml :before + (lambda (entry &rest _) + (setq my-sitemap-counter (1+ my-sitemap-counter)) + (when (= 0 (mod my-sitemap-counter 20)) + (princ (format " [Sitemap XML] Processed %d files... Current: %s\n" + my-sitemap-counter entry) + 'external-debugging-output)))) + +(advice-add 'org-rss-publish-to-rss :around + (lambda (fn plist filename pub-dir) + (princ (format "[rss] enter %s\n" filename) 'external-debugging-output) + (prog1 (funcall fn plist filename pub-dir) + (princ (format "[rss] leave %s\n" filename) 'external-debugging-output)))) + +(advice-add 'org-icalendar-create-uid :before + (lambda (&rest _) (princ "[rss] before uid\n" 'external-debugging-output))) + +(advice-add 'org-rss-add-pubdate-property :before + (lambda (&rest _) (princ "[rss] before pubdate\n" 'external-debugging-output))) + +(advice-add 'write-file :before + (lambda (&rest _) (princ "[rss] before write-file\n" 'external-debugging-output))) + +(advice-add 'org-export-to-file :before + (lambda (&rest _) (princ "[rss] before org-export-to-file\n" 'external-debugging-output))) + (org-publish-all t) -(org-publish-all nil) diff --git a/tests/ci-build.el b/tests/ci-build.el index 68d8670..02827d8 100644 --- a/tests/ci-build.el +++ b/tests/ci-build.el @@ -1,9 +1,17 @@ +(setq debug-on-error t) (setq inhibit-startup-screen t) (setq inhibit-startup-message t) (setq enable-local-variables :all) -(defalias (quote yes-or-no-p) (lambda (&rest args) t)) -(defalias (quote y-or-n-p) (lambda (&rest args) t)) +(defalias 'yes-or-no-p + (lambda (prompt &rest args) + (princ (format "!!! EMACS PROMPTED YES/NO: %s\n" prompt) 'external-debugging-output) + t)) + +(defalias 'y-or-n-p + (lambda (prompt &rest args) + (princ (format "!!! EMACS PROMPTED Y/N: %s\n" prompt) 'external-debugging-output) + t)) (setq message-log-max t) (setq standard-output (quote external-debugging-output)) @@ -15,6 +23,7 @@ (setq system-username "ci-runner") (setq system-fullname "Preston Pan") ;; needed for postamble (setq system-gpgkey "00000000") +(setq logo-file "~/monorepo/img/logo.webp") (defun package-vc-install (&rest args) (message "blocked package-vc-install for %s" args)) (defun package-vc--unpack (&rest args) nil) (setq package-archives nil) @@ -41,6 +50,9 @@ (setq make-backup-files nil auto-save-default nil create-lockfiles nil) (require 'catppuccin-theme) +(add-to-list 'custom-theme-load-path + (file-name-directory (locate-library "catppuccin-theme"))) + (setq catppuccin-flavor 'mocha) (load-theme 'catppuccin t) diff --git a/tests/ci-runner.el b/tests/ci-runner.el index 5b3397f..7f41a0d 100644 --- a/tests/ci-runner.el +++ b/tests/ci-runner.el @@ -1,9 +1,4 @@ -(condition-case err - (progn - (load-file (expand-file-name "tests/ci-build.el" default-directory)) - (load-file (expand-file-name "init.el" (getenv "NIXMACS_DIR"))) - (load-file (expand-file-name "tests/ci-build-stage-two.el" default-directory)) - (kill-emacs 0)) - (error - (princ (format "\nFATAL CI ERROR: %s\n" (error-message-string err)) 'external-debugging-output) - (kill-emacs 1))) +;; ci-runner.el +(load-file (expand-file-name "tests/ci-build.el" default-directory)) +(load-file (expand-file-name "init.el" (getenv "NIXMACS_DIR"))) +(load-file (expand-file-name "tests/ci-build-stage-two.el" default-directory)) -- cgit v1.3