Switch to using my fork of nixpkgs.

nix/configuration/configuration.nix

@@ -16,7 +16,6 @@
     ./roles/boot
     ./roles/chromecast
     ./roles/chromium
-    ./roles/d2
     ./roles/direnv
     ./roles/distributed_build
     ./roles/docker

nix/configuration/hosts/odo/default.nix

@@ -65,7 +65,6 @@
   me.bluetooth.enable = true;
   me.chromecast.enable = true;
   me.chromium.enable = true;
-  me.d2.enable = true;
   me.direnv.enable = true;
   me.docker.enable = true;
   me.ecc.enable = false;

nix/configuration/hosts/odo/power_management.nix

@@ -20,7 +20,7 @@
   # amd_pstate=guided :: Same as passive except we can set upper and lower frequency bounds.
   # amdgpu.dcdebugmask=0x10 :: Allegedly disables Panel Replay from https://community.frame.work/t/tracking-freezing-arch-linux-amd/39495/32
   boot.kernelParams = [
-    "amdgpu.abmlevel=2"
+    "amdgpu.abmlevel=3"
     "pcie_aspm=force"
     # "pcie_aspm.policy=powersupersave"
     "nowatchdog"

nix/configuration/hosts/quark/default.nix

@@ -26,7 +26,7 @@
 
     me.optimizations = {
       enable = true;
-      arch = "znver4"; # build breaks on znver5 currently.
+      arch = "znver5";
       system_features = [
         "gccarch-znver4"
         "gccarch-znver5"
@@ -60,7 +60,6 @@
     me.bluetooth.enable = true;
     me.chromecast.enable = true;
     me.chromium.enable = true;
-    me.d2.enable = true;
     me.direnv.enable = true;
     me.docker.enable = true;
     me.ecc.enable = true;

nix/configuration/roles/d2/default.nix

@@ -1,29 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  options.me = {
-    d2.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install d2.";
-    };
-  };
-
-  config = lib.mkIf config.me.d2.enable (
-    lib.mkMerge [
-      {
-        environment.systemPackages = with pkgs; [
-          d2
-        ];
-      }
-    ]
-  );
-}

nix/configuration/roles/emacs/default.nix

@@ -134,7 +134,6 @@ in
                     final.prettier # Format yaml, json, and JS
                     final.terraform-ls
                     final.typescript-language-server
-                    final.tex
                   ]
                 }
               '';

nix/configuration/roles/emacs/files/emacs/elisp/lang-d2.el

@@ -1,16 +0,0 @@
-(defun d2-format-buffer ()
-  "Run prettier."
-  (interactive)
-  (run-command-on-buffer "d2" "fmt" "-")
-  )
-
-(use-package d2-mode
-  :commands (d2-mode)
-  :hook (
-         (d2-mode . (lambda ()
-                      ;; (add-hook 'before-save-hook 'd2-format-buffer nil 'local)
-                      ))
-         )
-  )
-
-(provide 'lang-d2)

nix/configuration/roles/emacs/files/emacs/elisp/lang-org.el

@@ -87,8 +87,4 @@
 (use-package gnuplot)
 (use-package graphviz-dot-mode)
 
-(use-package htmlize
-  ;; For syntax highlighting when exporting to HTML.
-  )
-
 (provide 'lang-org)

nix/configuration/roles/emacs/files/emacs/init.el

@@ -40,6 +40,4 @@
 
 (require 'lang-cmake)
 
-(require 'lang-d2)
-
 (load-directory autoload-directory)

nix/configuration/roles/latex/default.nix

@@ -5,6 +5,22 @@
   ...
 }:
 
+let
+  tex = (
+    pkgs.texlive.combine {
+      inherit (pkgs.texlive)
+        scheme-basic
+        dvisvgm
+        dvipng # for preview and export as html in org-mode
+        wrapfig
+        amsmath
+        ulem
+        hyperref
+        capt-of
+        ;
+    }
+  );
+in
 {
   imports = [ ];
 
@@ -24,35 +40,6 @@
           tex
         ];
       }
-      {
-        nixpkgs.overlays = [
-          (final: prev: {
-            tex = (
-              pkgs.texlive.combine {
-                inherit (pkgs.texlive)
-                  scheme-basic
-                  dvisvgm
-                  dvipng # for preview and export as html in org-mode
-                  wrapfig
-                  amsmath
-                  ulem
-                  hyperref
-                  capt-of
-                  svg # emacs org-mode pdf export
-                  catchfile # emacs org-mode pdf export
-                  xcolor # emacs org-mode pdf export
-                  transparent # emacs org-mode pdf export
-                  pgf # emacs org-mode pdf export
-                  minted # emacs org-mode pdf export code block highlighting
-                  upquote # emacs org-mode pdf export
-                  lineno # emacs org-mode pdf export
-                  ;
-              }
-            );
-          })
-        ];
-
-      }
     ]
   );
 }