feat: add oxocarbon

package/config.org

@@ -46,25 +46,13 @@ May or may not need nerd fonts for some of the below packages. 8)
 #+END_SRC
 
 ** Theme
-Using doom-themes here because Tokyo Night isn't on MELPA.
+Using oxocarbon-theme because it reflects my colour scheme.
 #+BEGIN_SRC emacs-lisp
-  (use-package doom-themes
+  (use-package oxocarbon-theme)
-    :ensure t
+  (use-package autothemer
-    :config
+    :after (oxocarbon-theme)
-    ;; Global settings (defaults)
+    :init
-    (setq doom-themes-enable-bold t    ; if nil, bold is universally disabled
+    (load-theme 'oxocarbon t))
-          doom-themes-enable-italic t) ; if nil, italics is universally disabled
-    (load-theme 'doom-tokyo-night t)
-
-    ;; Enable flashing mode-line on errors
-    (doom-themes-visual-bell-config)
-    ;; Enable custom neotree theme (all-the-icons must be installed!)
-    (doom-themes-neotree-config)
-    ;; or for treemacs users
-    (setq doom-themes-treemacs-theme "doom-tokyo-night") ; use "doom-colors" for less minimal icon theme
-    (doom-themes-treemacs-config)
-    ;; Corrects (and improves) org-mode's native fontification.
-    (doom-themes-org-config))
 #+END_SRC
 
 ** Mood-line

package/default.nix

@@ -1,15 +1,28 @@
-{ emacsWithPackagesFromUsePackage, emacs29-pgtk, python3 }:
+{ emacsWithPackagesFromUsePackage, fetchurl, emacs29-pgtk, python3 }:
 emacsWithPackagesFromUsePackage {
   package = emacs29-pgtk;
   config = ./config.org;
   defaultInitFile = true;
   alwaysEnsure = true;
   alwaysTangle = true;
-    extraEmacsPackages =
+  extraEmacsPackages = e:
-      e: (builtins.attrValues {
+    let
+      mkEmacsPackage =
+        pname:
+        src:
+        deps:
+        e.callPackage
+          ({ trivialBuild }: trivialBuild {
+            inherit pname src;
+            version = "0.1.0";
+            buildInputs = deps;
+            propagatedUserEnvPkgs = deps;
+          })
+          { inherit (e) trivialBuild; };
+    in
+    (builtins.attrValues {
       inherit (e)
         nix-mode
-          doom-themes
         vertico
         orderless
         marginalia
@@ -42,10 +55,16 @@ emacsWithPackagesFromUsePackage {
         spacious-padding
         mood-line
         ement
+        autothemer
         ;
-      }) ++ [
+
-        e.treesit-grammars.with-all-grammars
+      treesit-grammars = e.treesit-grammars.with-all-grammars;
-        python3
+      inherit python3;
-      ];
+      oxocarbon = mkEmacsPackage "oxocarbon-theme"
+        (fetchurl {
+          url = "https://raw.githubusercontent.com/konrad1977/emacs/main/themes/oxocarbon-theme.el";
+          hash = "sha256-jD4DYc7aePuAF3m323YAi7jzE6ZpsSWb/zdmEgjFCns=";
+        }) [ e.autothemer ];
+    });
   override = _: prev: { use-package = prev.emacs; };
 }