system changes

Makefile

@@ -62,7 +62,7 @@ macos-update: install
 	nix flake update --flake $(DSTDIR)/flake
 	darwin-rebuild switch --flake $(DSTDIR)/flake
 	brew update
-	brew upgrade -f
+	brew upgrade
 
 # macos install tells System Events to update the wallpaper after installation
 macos-install: $(CONFIGS)

common/.config/emacs/early-init.el.org

@@ -29,7 +29,7 @@ Clean up interface by removing unnecessary elements.
 Set up fonts. I use Source Code Pro (Nerd Font) for =monospace= and Computer Modern for /variable width/.
 #+begin_src emacs-lisp
   (defvar jj/mono-font "Atkinson Hyperlegible Mono-14:weight=thin")
-  (defvar jj/var-font "CMU Serif-18")
+  (defvar jj/var-font "Atkinson Hyperlegible Next-14")
   (add-to-list 'default-frame-alist
                `(font . ,jj/mono-font))
   (custom-set-faces

common/.config/emacs/init.el.org

@@ -72,7 +72,8 @@ Display the current time in the mode line.
     :custom
     (auto-dark-themes '((modus-vivendi) (modus-operandi)))
     :init
-    (auto-dark-mode))
+    (when (memq window-system '(mac ns x))
+      (auto-dark-mode)))
 #+end_src
 
 ** Colours!
@@ -135,15 +136,13 @@ Install and configure =visual-fill-column= to make some file types display with
   (defun jj/run-visual-line-mode ()
     "run visual-line-mode"
     (visual-line-mode)
-    (visual-fill-column-mode)
+    (visual-fill-column-mode))
-    (setq visual-fill-column-width 100
-          visual-fill-column-center-text t))
   (use-package visual-fill-column
     :hook
     (org-mode . jj/run-visual-line-mode)
     (markdown-mode . jj/run-visual-line-mode)
     :config
-    (setq visual-fill-column-width 100
+    (setq-default visual-fill-column-width 128
           visual-fill-column-center-text t))
 #+end_src
 
@@ -446,22 +445,25 @@ Define functions for my =eshell= prompt. =jj/shorten-path-str= takes only the fi
                           (match-string 1 (shell-command-to-string "git status"))))
             (git-status (s-trim (shell-command-to-string "git status")))
             (outofsync (if (string-match-p "use \"git push\" to publish your local commits" git-status)
-                           " "
+                           (concat " " (propertize "" 'font-lock-face '(:family "Symbols Nerd Font Mono" :foreground "dark green")))
                          ""))
             (staged (if (string-match-p "Changes to be committed:" git-status)
-                        " "
+                        (concat " " (propertize "" 'font-lock-face '(:family "Symbols Nerd Font Mono" :foreground "orange")))
                       ""))
             (unstaged (if (string-match-p "Changes not staged for commit:" git-status)
-                          " "
+                          (concat " " (propertize "" 'font-lock-face '(:family "Symbols Nerd Font Mono" :foreground "magenta")))
                         ""))
             (untracked (if (string-match-p "Untracked files:"git-status)
-                           " "
+                           (concat " " (propertize "" 'font-lock-face '(:family "Symbols Nerd Font Mono" :foreground "dark red")))
                          "")))
-        (concat (propertize (concat " " git-branch) 'font-lock-face '(:foreground "blue"))
+       (concat " "
-                (propertize outofsync 'font-lock-face '(:font "Symbols Nerd Font Mono" :foreground "dark green"))
+               (propertize "" 'font-lock-face '(:family "Symbols Nerd Font Mono" :foreground "blue"))
-                (propertize staged 'font-lock-face '(:font "Symbols Nerd Font Mono" :foreground "orange"))
+               (propertize git-branch 'font-lock-face '(:foreground "blue"))
-                (propertize unstaged 'font-lock-face '(:font "Symbols Nerd Font Mono" :foreground "magenta"))
+               outofsync
-                (propertize untracked 'font-lock-face '(:font "Symbols Nerd Font Mono" :foreground "dark red"))))))
+               staged
+               unstaged
+               untracked))))
+
 #+end_src
 
 Install and configure =eat= as a terminal emulator in Emacs with =eshell= as a shell.
@@ -483,7 +485,7 @@ Install and configure =eat= as a terminal emulator in Emacs with =eshell= as a s
                                    (concat (jj/shorten-path-str (eshell/pwd))
                                            (jj/curr-dir-git-branch (eshell/pwd))
                                            (unless (eshell-exit-success-p)
-                                             (format " [%d]" eshell-last-command-status))
+                                             (propertize (format " [%d]" eshell-last-command-status) 'font-lock-face '(:foreground "dark red")))
                                            (if (= (file-user-uid) 0) " # " " $ "))))
 
     :config
@@ -497,7 +499,7 @@ Install and configure =eat= as a terminal emulator in Emacs with =eshell= as a s
                      (eshell/alias "la" "ls -a $@*")
                      (eshell/alias "l" "ls -F $@*")
                      (eshell/alias "ff" "find-file $@*")
-                     (eshell/alias "clr" "clear-scrollback")))
+                     (eshell/alias "clear" "clear-scrollback")))
     :bind
     ("C-c v" . eshell)
     (:map eshell-mode-map ("C-d" . jj/eshell-quit-or-delete-char)))
@@ -610,7 +612,9 @@ Install a better PDF viewer than =DocView=.
   (use-package pdf-tools
     :hook
     (doc-view-mode . (lambda () (pdf-tools-install))) ;; install on first pdf opened instead of startup
-    (pdf-view-mode . (lambda () (display-line-numbers-mode -1)))
+    (pdf-view-mode . (lambda ()
+                       (display-line-numbers-mode -1)
+                       (pdf-view-themed-minor-mode)))
     :init
     (add-hook 'TeX-after-compilation-finished-functions #'TeX-revert-document-buffer)
     :config
@@ -717,7 +721,7 @@ Configure =org-mode=. I use =~/org= as my =org= directory and hide emphasis mark
                                    ("WONT-DO" . (:foreground "LimeGreen" :weight bold)))
           org-log-done 'time
           org-hide-emphasis-markers t
-          org-format-latex-options (plist-put org-format-latex-options :scale 2.0)
+          org-format-latex-options (plist-put org-format-latex-options :scale 1.0)
           org-return-follows-link t
           org-tags-exclude-from-inheritance '("crypt")
           org-crypt-key nil

common/.flake/home/fonts.nix.org

@@ -1,6 +1,7 @@
 #+title: Font Configuration
 
 Install fonts necessary for my configuration. Namely
+- Atkinson Hyperlegible Mono
 - Computer Modern
 - Source Code Pro (Nerd Font)
 #+begin_src nix
@@ -9,6 +10,7 @@ Install fonts necessary for my configuration. Namely
   {
     fonts.fontconfig.enable = true;
     home.packages = with pkgs; [
+      atkinson-hyperlegible-next
       atkinson-hyperlegible-mono
       cm_unicode
       nerd-fonts.symbols-only

macos.local/flake/flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742871411,
+        "lastModified": 1743082807,
-        "narHash": "sha256-F3xBdOs5m0SE6Gq3jz+JxDOPvsLs22vbGfD05uF6xEc=",
+        "narHash": "sha256-qmrCYHVqE6j0TQApfxGx8aRYNdNsqtOrZuH09A+cjTU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "869f2ec2add75ce2a70a6dbbf585b8399abec625",
+        "rev": "171915bfce41018528fda9960211e81946d999b7",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1742800061,
+        "lastModified": 1742923925,
-        "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=",
+        "narHash": "sha256-biPjLws6FiBVUUDHEMFq5pUQL84Wf7PntPYdo3oKkFw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734",
+        "rev": "25d1b84f5c90632a623c48d83a2faf156451e6b1",
         "type": "github"
       },
       "original": {

macos.local/flake/home/programs/core.nix.org

@@ -30,7 +30,6 @@ Import configurations for programs and install programs with no configuration.
       findutils
       fzf
       ghc
-      gnuplot
       gnutls
       go
       gopls

macos.local/flake/system/homebrew.nix.org

@@ -45,6 +45,7 @@ Set up Homebrew. I disable the quarantine automatically and ensure that the stat
         "clang-format" # nix version screws up clang setup
         "openjdk" # there's really no jdk for mac from nix?
         "pinentry-touchid" # no nix version
+        "gnuplot" # no qt?
 
         # needed for pdf-tools for emacs
         "autoconf"