nix/configurations/hetzner_benchmark.nix

@@ -40,6 +40,7 @@ in
 
           # use lix everywhere and wrap it with nom
           ../overlays/lix.nix
+          ../overlays/nix-monitored.nix
         ];
       };
 

nix/configurations/hetzner_benchmark/nixos/sane-nix.nix

@@ -11,4 +11,11 @@
     MemoryMax = "90%";
     OOMScoreAdjust = 500;
   };
+
+  # 12 Cores, 64 GB RAM
+  # split into 4 jobs with 3C/16G
+  nix.settings = {
+    cores = 3;
+    max-jobs = 4;
+  };
 }

nix/configurations/hydrogen.nix

@@ -45,6 +45,7 @@ in
 
           # use lix everywhere and wrap it with nom
           ../overlays/lix.nix
+          ../overlays/nix-monitored.nix
         ];
       };
 

nix/configurations/vanadium.nix

@@ -54,15 +54,19 @@ in
           ../overlays/wired-notify.nix
           ../overlays/wallpapers.nix
           ../overlays/nil.nix
+          ../overlays/fcitx5-table-extra-taiwanese.nix
           ../overlays/ghostty-dev.nix
           ../overlays/npins.nix
 
-          ../overlays/iosevka-term.nix
+          ../overlays/iosevka.nix
           ../packages/overlay.nix
 
           ./vanadium/overlay.nix
           ./vanadium/kernel-overlay.nix
 
+          # removed, but I need it for PLFA!
+          ../overlays/pin-emacs28.nix
+
           # use lix everywhere and wrap it with nom
           ../overlays/lix.nix
           ../overlays/nix-monitored.nix

nix/configurations/vanadium/home/programs.nix

@@ -118,6 +118,10 @@
       enable = true;
       defaultEditor = true;
     };
+    emacs = {
+      enable = true;
+      package = pkgs.unsafe-emacs28;
+    };
     lazygit.enable = true;
     fish = {
       enable = true;

nix/configurations/vanadium/nixos/sane-nix.nix

@@ -10,4 +10,11 @@
     MemoryMax = "90%";
     OOMScoreAdjust = 500;
   };
+
+  # 16 Cores, 32 GB RAM
+  # split into 4 jobs with 4C/8G
+  nix.settings = {
+    cores = 2;
+    max-jobs = 4;
+  };
 }

nix/configurations/vanadium/overlay.nix

@@ -16,6 +16,18 @@ infuse {
     ./patches/helix/W-as-write.patch
   ];
 
+  # TODO:
+  # pinned branch of https://github.com/astrand/xclip/tree/xerror
+  # use this until #43 gets resolved properly
+  xclip.__output.src =
+    _:
+    final.fetchFromGitHub {
+      owner = "astrand";
+      repo = "xclip";
+      rev = "2c3b811002b35d3be7f39cc1145dd06bdb32e31c";
+      hash = "sha256-hHbq97GTKiRw8LZa/LY4LUOFOd/5H4+S+NR0BJfcu6M=";
+    };
+
   fcitx5.__output.cmakeFlags.__append = [
     (lib.cmakeFeature "ENABLE_EMOJI" "Off")
     (lib.cmakeFeature "ENABLE_WAYLAND" "Off")

nix/overlays/iosevka.nix

@@ -1,19 +1,29 @@
-final: prev:
+final: prev: rec {
+  nerd-fonts =
     let
-  iosevka-term = prev.iosevka.override {
+      mkNerdFont = final.callPackage ../lib/mkNerdFont.nix { };
-    # This changes pname which changes what the outputted buildPlan name is.
+    in
-    # Stupid API
+    prev.nerd-fonts
+    // {
+      iosevka = mkNerdFont {
+        font = iosevka;
+        patcherArgs = [
+          "--complete"
+          "--careful"
+          "--name {/.}-NFM"
+          "--mono"
+        ];
+      };
+    };
+
+  iosevka = prev.iosevka.override {
     set = "";
 
     # Guide: https://github.com/be5invis/Iosevka/blob/main/doc/custom-build.md
     privateBuildPlan = {
       family = "Iosevka";
       serifs = "sans";
-
+      spacing = "normal";
-      # Iosevka + Ghostty makes "…" display in a odd way.
-      # We use "term" width to avoid this.
-      # https://github.com/ghostty-org/ghostty/discussions/10335
-      spacing = "term";
 
       # Otherwise kitty behaves funny with ligature
       # noLigation = true;
@@ -161,23 +171,4 @@ let
       ];
     };
   };
-
-  mkNerdFont = final.callPackage ../lib/mkNerdFont.nix { };
-  iosevka-term-nerd = mkNerdFont {
-    font = iosevka-term;
-    patcherArgs = [
-      "--complete"
-      "--careful"
-      "--name {/.}-NFM"
-      "--mono"
-    ];
-  };
-in
-{
-  inherit iosevka-term;
-
-  nerd-fonts = prev.nerd-fonts // {
-    iosevka = iosevka-term-nerd;
-    iosevka-term = iosevka-term-nerd;
-  };
 }

nix/overlays/pin-emacs28.nix

@@ -0,0 +1,6 @@
+let
+  sources = import ../../npins;
+in
+_: _: {
+  unsafe-emacs28 = (import sources.pin-emacs28 { }).emacs;
+}

nix/overlays/pin-isabelle-2023.nix

@@ -0,0 +1,7 @@
+let
+  sources = import ../../npins;
+in
+_: _: {
+  # Isabelle version 2023
+  isabelle-2023 = (import sources.pin-isabelle { }).isabelle;
+}

nix/overlays/pin-wireshark.nix

@@ -0,0 +1,8 @@
+let
+  sources = import ../../npins;
+in
+_: _: {
+  # Wireshark bug
+  # https://gitlab.com/wireshark/wireshark/-/issues/19574
+  inherit (import sources.pin-wireshark { }) wireshark;
+}