flake.nix

@@ -187,27 +187,11 @@
             ++ extraModules;
         };
 
-      kakoune-unwrapped-from-pkgs =
-        pkgs:
-        pkgs.kakoune-unwrapped.overrideAttrs (attrs: {
-          version = "r${builtins.substring 0 6 inputs.kakoune.rev}";
-          src = inputs.kakoune;
-          patches = [
-            # patches in the original package was already applied
-          ];
-        });
-      nki-kakoune-from-pkgs =
-        pkgs:
-        pkgs.callPackage ./packages/common/nki-kakoune {
-          kakoune-unwrapped = kakoune-unwrapped-from-pkgs pkgs;
-        };
-
     in
     {
       overlays = {
         default = lib.composeManyExtensions overlays;
         kakoune = final: prev: {
-          kakoune-unwrapped = kakoune-unwrapped-from-pkgs prev;
           nki-kakoune = final.callPackage ./packages/common/nki-kakoune { };
         };
       };
@@ -215,15 +199,15 @@
       packages.x86_64-linux.deploy-rs = deploy-rs.packages.x86_64-linux.default;
       apps.x86_64-linux.deploy-rs = deploy-rs.apps.x86_64-linux.default;
 
-      packages.x86_64-linux.nki-kakoune = nki-kakoune-from-pkgs (
+      packages.x86_64-linux.nki-kakoune =
-        import nixpkgs-unstable { system = "x86_64-linux"; }
+        (import nixpkgs-unstable { system = "x86_64-linux"; }).callPackage ./packages/common/nki-kakoune
-      );
+          { };
-      packages.aarch64-linux.nki-kakoune = nki-kakoune-from-pkgs (
+      packages.aarch64-linux.nki-kakoune =
-        import nixpkgs-unstable { system = "aarch64-linux"; }
+        (import nixpkgs-unstable { system = "aarch64-linux"; }).callPackage ./packages/common/nki-kakoune
-      );
+          { };
-      packages.aarch64-darwin.nki-kakoune = nki-kakoune-from-pkgs (
+      packages.aarch64-darwin.nki-kakoune =
-        import nixpkgs-unstable { system = "aarch64-darwin"; }
+        (import nixpkgs-unstable { system = "aarch64-darwin"; }).callPackage ./packages/common/nki-kakoune
-      );
+          { };
 
       # MacBook configuration: nix-darwin + home-manager
       darwinConfigurations."nki-macbook" = darwin.lib.darwinSystem rec {

modules/common/linux/default.nix

@@ -117,20 +117,6 @@ let
         virtualisation.virtualbox.host.enable = false;
         users.extraGroups.vboxusers.members = [ cfg.username ];
       };
-
-    nix-ld =
-      { pkgs, ... }:
-      {
-        programs.nix-ld = {
-          enable = true;
-          libraries = with pkgs; [
-            ncurses
-            llvmPackages.libcxx
-            glibc
-            sqlite
-          ];
-        };
-      };
   };
 
   rt-audio =
@@ -179,7 +165,6 @@ in
     virtualisation
     accounts
     rt-audio
-    nix-ld
   ];
 
   options.common.linux = {

packages/common/nki-kakoune/default.nix

@@ -12,7 +12,6 @@
   ...
 }:
 (kakoune.override {
-  kakoune = kakoune-unwrapped;
   plugins =
     nki-kak-plugins
     ++ nki-kak-themes