diff --git a/.config/nvim/plugin/leap.lua b/.config/nvim/plugin/leap.lua index d977c684..14ea952b 100644 --- a/.config/nvim/plugin/leap.lua +++ b/.config/nvim/plugin/leap.lua @@ -1,3 +1,3 @@ local leap = require("leap") -vim.keymap.set({ "n", "x", "o" }, "s", function() leap.leap { backward = false } end) +vim.keymap.set({ "n", "x", "o" }, "s", function() leap.leap() end) vim.keymap.set("n", "S", function() leap.leap { backward = true } end) 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") diff --git a/nix/overlays/iosevka-term.nix b/nix/overlays/iosevka-term.nix index ddfcfcbb..e8068820 100644 --- a/nix/overlays/iosevka-term.nix +++ b/nix/overlays/iosevka-term.nix @@ -1,7 +1,5 @@ final: prev: let - inherit (final) lib; - iosevka-term = prev.iosevka.override { # This changes pname which changes what the outputted buildPlan name is. # Stupid API @@ -174,18 +172,12 @@ 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 { - iosevka = warnActuallyTerm iosevka-term; - iosevka-term = iosevka-term; + inherit iosevka-term; nerd-fonts = prev.nerd-fonts // { - iosevka = warnActuallyTerm iosevka-term-nerd; + iosevka = iosevka-term-nerd; iosevka-term = iosevka-term-nerd; }; } diff --git a/nix/packages/by-name/ruler/package.nix b/nix/packages/by-name/ruler/package.nix index 98020c21..e7de03a8 100644 --- a/nix/packages/by-name/ruler/package.nix +++ b/nix/packages/by-name/ruler/package.nix @@ -13,8 +13,8 @@ let domain = "git.confusedcompiler.org"; owner = "leana8959"; repo = "ruler"; - rev = "1740f6d632142e97b1a8c8157fb018039631eabf"; - hash = "sha256-HNz4XJ26HXWc75/JE/Rx1TwpInCk978eQRh+DZS12CQ="; + rev = "addc8a75dcfd64d5f40516f2526210c8fc163e70"; + hash = "sha256-6dnZgkeG0p2O4ROtrFoG+jUmAQPWKHodKzUdVrBgcIM="; }) { }; cabalOverrides = o: { diff --git a/nix/packages/default.nix b/nix/packages/default.nix index 71739d36..b72b05c0 100644 --- a/nix/packages/default.nix +++ b/nix/packages/default.nix @@ -7,6 +7,6 @@ in (import sources.nixpkgs { overlays = map scopeOverlay [ (import ./overlay.nix) - (import ../overlays/iosevka-term.nix) + (import ../overlays/iosevka.nix) ]; }).export