Compare commits

...

5 commits

Author SHA1 Message Date
ec4d17cf83
packages/ruler: update 2026-01-16 16:20:57 +01:00
bab66207cc
packages/overlay: fix iosevka-term rename 2026-01-16 16:18:32 +01:00
261ffa3ff1
nvim/leap: fix plugin binding 2026-01-16 12:18:57 +01:00
a12fabd33d
Revert "vanadium/overlay: remove xclip patch"
The crashing bug can still be sometimes triggered.
Let's keep using this branch for now.
2026-01-16 09:56:04 +01:00
bcd45dddf5
overlays/iosevka-term: trace useful message and override iosevka package 2026-01-16 09:49:22 +01:00
5 changed files with 26 additions and 6 deletions

View file

@ -1,3 +1,3 @@
local leap = require("leap")
vim.keymap.set({ "n", "x", "o" }, "s", function() leap.leap() end)
vim.keymap.set({ "n", "x", "o" }, "s", function() leap.leap { backward = false } end)
vim.keymap.set("n", "S", function() leap.leap { backward = true } end)

View file

@ -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")

View file

@ -1,5 +1,7 @@
final: prev:
let
inherit (final) lib;
iosevka-term = prev.iosevka.override {
# This changes pname which changes what the outputted buildPlan name is.
# Stupid API
@ -172,12 +174,18 @@ let
"--mono"
];
};
warnActuallyTerm = lib.warn ''
The overlay "${toString ./iosevka-term.nix}" is used, you are actually using iosevka-term.
There is no difference between iosevka and iosevka term when using this overlay.
'';
in
{
inherit iosevka-term;
iosevka = warnActuallyTerm iosevka-term;
iosevka-term = iosevka-term;
nerd-fonts = prev.nerd-fonts // {
iosevka = iosevka-term-nerd;
iosevka = warnActuallyTerm iosevka-term-nerd;
iosevka-term = iosevka-term-nerd;
};
}

View file

@ -13,8 +13,8 @@ let
domain = "git.confusedcompiler.org";
owner = "leana8959";
repo = "ruler";
rev = "addc8a75dcfd64d5f40516f2526210c8fc163e70";
hash = "sha256-6dnZgkeG0p2O4ROtrFoG+jUmAQPWKHodKzUdVrBgcIM=";
rev = "1740f6d632142e97b1a8c8157fb018039631eabf";
hash = "sha256-HNz4XJ26HXWc75/JE/Rx1TwpInCk978eQRh+DZS12CQ=";
}) { };
cabalOverrides = o: {

View file

@ -7,6 +7,6 @@ in
(import sources.nixpkgs {
overlays = map scopeOverlay [
(import ./overlay.nix)
(import ../overlays/iosevka.nix)
(import ../overlays/iosevka-term.nix)
];
}).export