From 085442e442770864ea41952c198b088a44980ad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 15 Jan 2026 21:32:17 +0100 Subject: [PATCH 1/8] vanadium/overlay: remove xclip patch Revert this if the error persists. --- nix/configurations/vanadium/overlay.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/nix/configurations/vanadium/overlay.nix b/nix/configurations/vanadium/overlay.nix index 169bf13b..4fcc6c76 100644 --- a/nix/configurations/vanadium/overlay.nix +++ b/nix/configurations/vanadium/overlay.nix @@ -16,18 +16,6 @@ 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") From daf4d2901ebcbdc2cea2771b7942a22d1edbe855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 15 Jan 2026 21:33:06 +0100 Subject: [PATCH 2/8] overlays/pin-emacs28: drop I suspect that agda toolchain has moved on and I can use a newer emacs --- nix/configurations/vanadium.nix | 3 --- nix/configurations/vanadium/home/programs.nix | 4 ---- nix/overlays/pin-emacs28.nix | 6 ------ 3 files changed, 13 deletions(-) delete mode 100644 nix/overlays/pin-emacs28.nix diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix index d8f2f12c..20037a04 100644 --- a/nix/configurations/vanadium.nix +++ b/nix/configurations/vanadium.nix @@ -64,9 +64,6 @@ in ./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 diff --git a/nix/configurations/vanadium/home/programs.nix b/nix/configurations/vanadium/home/programs.nix index 2f1b390f..a4d1d533 100644 --- a/nix/configurations/vanadium/home/programs.nix +++ b/nix/configurations/vanadium/home/programs.nix @@ -118,10 +118,6 @@ enable = true; defaultEditor = true; }; - emacs = { - enable = true; - package = pkgs.unsafe-emacs28; - }; lazygit.enable = true; fish = { enable = true; diff --git a/nix/overlays/pin-emacs28.nix b/nix/overlays/pin-emacs28.nix deleted file mode 100644 index 11f1ed50..00000000 --- a/nix/overlays/pin-emacs28.nix +++ /dev/null @@ -1,6 +0,0 @@ -let - sources = import ../../npins; -in -_: _: { - unsafe-emacs28 = (import sources.pin-emacs28 { }).emacs; -} From a8e5776854b7c86fba543a4177ab2161118a6e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 15 Jan 2026 21:34:17 +0100 Subject: [PATCH 3/8] vanadium: remove fcitx5-table-extra patch --- nix/configurations/vanadium.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix index 20037a04..3221dcd8 100644 --- a/nix/configurations/vanadium.nix +++ b/nix/configurations/vanadium.nix @@ -54,7 +54,6 @@ in ../overlays/wired-notify.nix ../overlays/wallpapers.nix ../overlays/nil.nix - ../overlays/fcitx5-table-extra-taiwanese.nix ../overlays/ghostty-dev.nix ../overlays/npins.nix From 23ec902debf1b86304faf9b2813170c80c11450e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 15 Jan 2026 21:35:36 +0100 Subject: [PATCH 4/8] overlays/pin-isabelle-2023: drop --- nix/overlays/pin-isabelle-2023.nix | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 nix/overlays/pin-isabelle-2023.nix diff --git a/nix/overlays/pin-isabelle-2023.nix b/nix/overlays/pin-isabelle-2023.nix deleted file mode 100644 index c5cbab6f..00000000 --- a/nix/overlays/pin-isabelle-2023.nix +++ /dev/null @@ -1,7 +0,0 @@ -let - sources = import ../../npins; -in -_: _: { - # Isabelle version 2023 - isabelle-2023 = (import sources.pin-isabelle { }).isabelle; -} From 3d91894fbba8f3c4dfc210ad82869d0b9a10c48b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 15 Jan 2026 21:35:46 +0100 Subject: [PATCH 5/8] overlays/pin-wireshark: drop --- nix/overlays/pin-wireshark.nix | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 nix/overlays/pin-wireshark.nix diff --git a/nix/overlays/pin-wireshark.nix b/nix/overlays/pin-wireshark.nix deleted file mode 100644 index e1708117..00000000 --- a/nix/overlays/pin-wireshark.nix +++ /dev/null @@ -1,8 +0,0 @@ -let - sources = import ../../npins; -in -_: _: { - # Wireshark bug - # https://gitlab.com/wireshark/wireshark/-/issues/19574 - inherit (import sources.pin-wireshark { }) wireshark; -} From 810a3956103a8180702d8853a3a87f336378b9e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 15 Jan 2026 21:41:52 +0100 Subject: [PATCH 6/8] tree-wide: remove nix-monitored on headless hosts --- nix/configurations/hetzner_benchmark.nix | 1 - nix/configurations/hydrogen.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/nix/configurations/hetzner_benchmark.nix b/nix/configurations/hetzner_benchmark.nix index 515bfd3a..af9baca1 100644 --- a/nix/configurations/hetzner_benchmark.nix +++ b/nix/configurations/hetzner_benchmark.nix @@ -40,7 +40,6 @@ in # use lix everywhere and wrap it with nom ../overlays/lix.nix - ../overlays/nix-monitored.nix ]; }; diff --git a/nix/configurations/hydrogen.nix b/nix/configurations/hydrogen.nix index 2cafb757..7bc9620a 100644 --- a/nix/configurations/hydrogen.nix +++ b/nix/configurations/hydrogen.nix @@ -45,7 +45,6 @@ in # use lix everywhere and wrap it with nom ../overlays/lix.nix - ../overlays/nix-monitored.nix ]; }; From 5a296c6e97c4912a2a12f12fdd6a5562ac44f580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 15 Jan 2026 23:57:15 +0100 Subject: [PATCH 7/8] overlays/iosevka-term: always build iosevka term --- nix/configurations/vanadium.nix | 2 +- .../{iosevka.nix => iosevka-term.nix} | 49 +++++++++++-------- 2 files changed, 30 insertions(+), 21 deletions(-) rename nix/overlays/{iosevka.nix => iosevka-term.nix} (91%) diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix index 3221dcd8..2f4bec34 100644 --- a/nix/configurations/vanadium.nix +++ b/nix/configurations/vanadium.nix @@ -57,7 +57,7 @@ in ../overlays/ghostty-dev.nix ../overlays/npins.nix - ../overlays/iosevka.nix + ../overlays/iosevka-term.nix ../packages/overlay.nix ./vanadium/overlay.nix diff --git a/nix/overlays/iosevka.nix b/nix/overlays/iosevka-term.nix similarity index 91% rename from nix/overlays/iosevka.nix rename to nix/overlays/iosevka-term.nix index a22bf34b..e8068820 100644 --- a/nix/overlays/iosevka.nix +++ b/nix/overlays/iosevka-term.nix @@ -1,29 +1,19 @@ -final: prev: rec { - nerd-fonts = - let - mkNerdFont = final.callPackage ../lib/mkNerdFont.nix { }; - in - prev.nerd-fonts - // { - iosevka = mkNerdFont { - font = iosevka; - patcherArgs = [ - "--complete" - "--careful" - "--name {/.}-NFM" - "--mono" - ]; - }; - }; - - iosevka = prev.iosevka.override { +final: prev: +let + iosevka-term = prev.iosevka.override { + # This changes pname which changes what the outputted buildPlan name is. + # Stupid API 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; @@ -171,4 +161,23 @@ final: prev: rec { ]; }; }; + + 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; + }; } From a3c02415f8b483551b6783d48ed914e866c529d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 16 Jan 2026 00:36:36 +0100 Subject: [PATCH 8/8] treewide: remove core and job count configuration --- nix/configurations/hetzner_benchmark/nixos/sane-nix.nix | 7 ------- nix/configurations/vanadium/nixos/sane-nix.nix | 7 ------- 2 files changed, 14 deletions(-) diff --git a/nix/configurations/hetzner_benchmark/nixos/sane-nix.nix b/nix/configurations/hetzner_benchmark/nixos/sane-nix.nix index d73c45e0..3419eae6 100644 --- a/nix/configurations/hetzner_benchmark/nixos/sane-nix.nix +++ b/nix/configurations/hetzner_benchmark/nixos/sane-nix.nix @@ -11,11 +11,4 @@ MemoryMax = "90%"; OOMScoreAdjust = 500; }; - - # 12 Cores, 64 GB RAM - # split into 4 jobs with 3C/16G - nix.settings = { - cores = 3; - max-jobs = 4; - }; } diff --git a/nix/configurations/vanadium/nixos/sane-nix.nix b/nix/configurations/vanadium/nixos/sane-nix.nix index 83088437..83c080d8 100644 --- a/nix/configurations/vanadium/nixos/sane-nix.nix +++ b/nix/configurations/vanadium/nixos/sane-nix.nix @@ -10,11 +10,4 @@ MemoryMax = "90%"; OOMScoreAdjust = 500; }; - - # 16 Cores, 32 GB RAM - # split into 4 jobs with 4C/8G - nix.settings = { - cores = 2; - max-jobs = 4; - }; }