feat: overhaul theme (#416)

* feat: overhaul theme * chore: update screenshots
terlar · Oct 26, 2024 · 771c2dd · 771c2dd
1 parent 3911b69
commit 771c2dd
Show file tree

Hide file tree

Showing 13 changed files with 349 additions and 409 deletions.
diff --git a/dev/flake-module.nix b/dev/flake-module.nix
@@ -53,7 +53,7 @@
             help = "generate new screenshots";
             category = "emacs";
             command = ''
-              exec nix run $PRJ_ROOT/dev#updateScreenshots
+              exec nix run $PRJ_ROOT#updateScreenshots
             '';
           }
         ];
@@ -88,7 +88,7 @@
           text = ''
             EMACS_DIR="$(mktemp -td emacs.XXXXXXXXXX)"
             lndir -silent ${config.packages.emacs-config} "$EMACS_DIR"
-            emacs -fs --init-directory "$EMACS_DIR" --load ${./screenshots.el} --eval '(kill-emacs)'
+            emacs --fullscreen --init-directory "$EMACS_DIR" --load ${./screenshots.el} --eval '(kill-emacs)'
           '';
         };
       };

diff --git a/dev/screenshots.el b/dev/screenshots.el
@@ -24,28 +24,29 @@
        (captures
         `((org-mode
            . ((find-file (expand-file-name "samples/sample.org" ,media-dir))
-              (no-fringes)
+              (goto-char 49)
               (follow-mode 1)
               (split-window-right)
-              (goto-char 49)))
+              (follow-redraw)))
           (markdown-mode
            . ((find-file (expand-file-name "samples/sample.md" ,media-dir))
-              (no-fringes)
+              (goto-char 51)
               (follow-mode 1)
               (split-window-right)
-              (goto-char 51)))
+              (follow-redraw)))
           (rst-mode
            . ((find-file (expand-file-name "samples/sample.rst" ,media-dir))
-              (no-fringes)
+              (goto-char 239)
               (follow-mode 1)
               (split-window-right)
-              (goto-char 239)))
+              (follow-redraw)))
           (emacs-lisp-mode
            . ((find-file (expand-file-name "../lisp/readable-mono-theme.el" ,media-dir))
-              (no-fringes)
+              (goto-char 1223)
               (follow-mode 1)
               (split-window-right)
-              (goto-char 1443))))))
+              (follow-redraw))))))
+  (global-hide-fringes-mode 1)
   (blink-cursor-mode 0)
 
   (dolist (capture captures)
@@ -55,17 +56,19 @@
 
       (dolist (action actions) (eval action))
 
+      (font-lock-update)
+
       (dolist (background-mode '(light dark))
         (customize-set-variable 'frame-background-mode background-mode)
         (customize-set-variable 'custom-enabled-themes custom-enabled-themes)
         (message nil)
-        (unwind-protect (with-temp-file (expand-file-name
-                                         (concat name
-                                                 "-"
-                                                 (symbol-name background-mode)
-                                                 ".png")
-                                         media-dir)
-                          (insert (x-export-frames nil 'png))))))))
+        (with-temp-file (expand-file-name
+                         (concat name
+                                 "-"
+                                 (symbol-name background-mode)
+                                 ".png")
+                         media-dir)
+          (insert (x-export-frames nil 'png)))))))
 
 (provide 'screenshots)
 ;;; screenshots.el ends here
diff --git a/flake.nix b/flake.nix
@@ -45,6 +45,7 @@
       partitionedAttrs = {
         checks = "dev";
         devShells = "dev";
+        packages = "dev";
       };
 
       partitions.dev = {