Make nki-kakoune slightly more extensible, expose it as an overlay

flake.lock

@@ -746,11 +746,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1742676311,
+        "lastModified": 1743644801,
-        "narHash": "sha256-EZ+/JXbyE7r/e4tNftecWcWtzjb8YBOGLG75Z+rFgZg=",
+        "narHash": "sha256-z8x/j/RuDBo/5lNt3XYatKRpIMFMHVE2HK7TKVxYn+c=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "d56129adbc7cc099b44eb134d2c25e3e2201ec7f",
+        "rev": "f3fca85fe72c70d58f44f4c6ad2f27a91aa54d0d",
         "type": "github"
       },
       "original": {
@@ -779,11 +779,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1742641057,
+        "lastModified": 1743492917,
-        "narHash": "sha256-+OhtlQPNOKmwK6YtAaXPu42jXe3ufi7hny78N8dqDKA=",
+        "narHash": "sha256-OqLDg0Ody1HX23hgjvjIkfZPNhYKxbkj/ONcDjdD4Ik=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "ed20822ce947198e4106698d7afffd0a832a7b3c",
+        "rev": "60034a57efd9c8130b05797b37cbc187a8c13145",
         "type": "github"
       },
       "original": {
@@ -926,11 +926,11 @@
     },
     "nixpkgs-stable_3": {
       "locked": {
-        "lastModified": 1742512142,
+        "lastModified": 1743576891,
-        "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=",
+        "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682",
+        "rev": "44a69ed688786e98a101f02b712c313f1ade37ab",
         "type": "github"
       },
       "original": {
@@ -1102,11 +1102,11 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1742422364,
+        "lastModified": 1743583204,
-        "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
+        "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
+        "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
         "type": "github"
       },
       "original": {
@@ -1508,11 +1508,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1742671548,
+        "lastModified": 1743346993,
-        "narHash": "sha256-nJK70IyhyOXth5Dcyv7DKtv95TTZkqcAYHVj4Uq2Blw=",
+        "narHash": "sha256-i7rWd/5BcqLgQEtB5L/6gKN5R5GUJcmm34F+iBivH60=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "0fa13c6fb43ae26a597103989a42e44a03d2d827",
+        "rev": "45c055696437a08e3989d9b91d9c617b84cc2bc3",
         "type": "github"
       },
       "original": {

flake.nix

@@ -189,7 +189,12 @@
 
     in
     {
-      overlays.default = lib.composeManyExtensions overlays;
+      overlays = {
+        default = lib.composeManyExtensions overlays;
+        kakoune = final: prev: {
+          nki-kakoune = final.callPackage ./packages/common/nki-kakoune { };
+        };
+      };
 
       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/common/nki-kakoune/default.nix

@@ -2,21 +2,24 @@
   callPackage,
   kakoune,
   kakoune-unwrapped,
+  nki-kak-util ? callPackage ./util.nix { },
+  nki-kak-lsp ? callPackage ./lsp.nix { },
+  nki-kak-rc ? callPackage ./rc.nix { },
+  nki-kak-plugins ? callPackage ./plugins.nix { util = nki-kak-util; },
+  nki-kak-kaktex ? callPackage ./kaktex { },
+  nki-kak-themes ? callPackage ./themes.nix { },
+  nki-kak-faces ? callPackage ./faces.nix { util = nki-kak-util; },
   ...
 }:
-let
-  lsp = callPackage ./lsp.nix { };
-  rc = (callPackage ./rc.nix { });
-in
 (kakoune.override {
   plugins =
-    callPackage ./plugins.nix { }
+    nki-kak-plugins
-    ++ callPackage ./themes.nix { }
+    ++ nki-kak-themes
     ++ [
-      (callPackage ./kaktex { })
+      nki-kak-kaktex
-      (callPackage ./faces.nix { })
+      nki-kak-faces
-      rc
+      nki-kak-rc
-      lsp.plugin
+      nki-kak-lsp.plugin
     ];
 }).overrideAttrs
   (attrs: {
@@ -27,6 +30,15 @@ in
       rm "$out/bin/kak"
       makeWrapper "${kakoune-unwrapped}/bin/kak" "$out/bin/kak" \
         --set KAKOUNE_RUNTIME "$out/share/kak" \
-        --suffix PATH ":" "${lsp.extraPaths}"
+        --suffix PATH ":" "${nki-kak-lsp.extraPaths}"
     '';
+
+    passthru = {
+      lsp = nki-kak-lsp;
+      rc = nki-kak-rc;
+      plugins = nki-kak-plugins;
+      kaktex = nki-kak-kaktex;
+      themes = nki-kak-themes;
+      faces = nki-kak-faces;
+    };
   })

packages/common/nki-kakoune/faces.nix

@@ -1,6 +1,9 @@
-{ callPackage, ... }:
+{
+  callPackage,
+  utils ? callPackage ./utils.nix { },
+  ...
+}:
 let
-  utils = callPackage ./utils.nix { };
   faces = {
     Default = "%opt{text},%opt{base}";
     BufferPadding = "%opt{base},%opt{base}";

packages/common/nki-kakoune/lsp.nix

@@ -19,11 +19,15 @@
   marksman,
   templ,
   rust-analyzer,
+  overrideConfig ? (baseConfig: baseConfig),
+  extraSetup ? "",
   ...
 }:
 let
   # Configuration for kak-lsp
-  config = {
+  config =
+    let
+      baseConfig = {
         languageIDs = {
           c = "c_cpp";
           cpp = "c_cpp";
@@ -462,6 +466,8 @@ let
           verbosity = 255;
         };
       };
+    in
+    overrideConfig baseConfig;
 
   per-lang-config =
     lang:
@@ -602,6 +608,9 @@ in
 
       ## Faces
       ${faces-config}
+
+      ## Extra setup
+      ${extraSetup}
     }
   '';
 }

packages/common/nki-kakoune/plugins.nix

@@ -1,59 +1,14 @@
 {
-  pkgs,
+  callPackage,
-  symlinkJoin,
+  utils ? callPackage ./utils.nix { },
-  writeTextDir,
+  fetchFromGitHub,
-  kakouneUtils,
+  fetchFromGitLab,
+  luajit,
   ...
 }:
 with {
-  inherit (kakouneUtils) buildKakounePluginFrom2Nix;
+  inherit (utils) toDir writeModuleWrapper kakounePlugin;
 };
-let
-  toDir = name: file: writeTextDir name (builtins.readFile file);
-
-  writeActivationScript =
-    script:
-    writeTextDir "on-load.kak" ''
-      hook global KakBegin .* %{
-        ${script}
-      }
-    '';
-
-  writeModuleWrapper =
-    name: script:
-    writeTextDir "module.kak" ''
-      provide-module ${name} %◍
-        ${script}
-      ◍
-    '';
-
-  kakounePlugin =
-    {
-      name,
-      src,
-      wrapAsModule ? false,
-      activationScript ? null,
-      ...
-    }@attrs:
-    let
-      module = if wrapAsModule then writeModuleWrapper name (builtins.readFile src) else src;
-    in
-    buildKakounePluginFrom2Nix {
-      pname = name;
-      version = attrs.version or "latest";
-      src =
-        if activationScript == null then
-          module
-        else
-          symlinkJoin {
-            name = "${name}-src";
-            paths = [
-              module
-              (writeActivationScript activationScript)
-            ];
-          };
-    };
-in
 builtins.map kakounePlugin [
   # My own scripts
   {
@@ -68,7 +23,7 @@ builtins.map kakounePlugin [
   # Plugins
   {
     name = "luar";
-    src = pkgs.fetchFromGitHub {
+    src = fetchFromGitHub {
       owner = "gustavo-hms";
       repo = "luar";
       rev = "2f430316f8fc4d35db6c93165e2e77dc9f3d0450";
@@ -78,12 +33,12 @@ builtins.map kakounePlugin [
       # Enable luar
       require-module luar
       # Use luajit
-      set-option global luar_interpreter ${pkgs.luajit}/bin/luajit
+      set-option global luar_interpreter ${luajit}/bin/luajit
     '';
   }
   {
     name = "peneira";
-    src = pkgs.fetchFromGitHub {
+    src = fetchFromGitHub {
       owner = "gustavo-hms";
       repo = "peneira";
       rev = "b56dd10bb4771da327b05a9071b3ee9a092f9788";
@@ -128,7 +83,7 @@ builtins.map kakounePlugin [
   }
   {
     name = "kakoune-focus";
-    src = pkgs.fetchFromGitHub {
+    src = fetchFromGitHub {
       owner = "caksoylar";
       repo = "kakoune-focus";
       rev = "949c0557cd4c476822acfa026ca3c50f3d38a3c0";
@@ -140,7 +95,7 @@ builtins.map kakounePlugin [
   }
   {
     name = "kakoune-inc-dec";
-    src = pkgs.fetchFromGitLab {
+    src = fetchFromGitLab {
       owner = "Screwtapello";
       repo = "kakoune-inc-dec";
       rev = "7bfe9c51";
@@ -158,14 +113,10 @@ builtins.map kakounePlugin [
       })
       + "/rc";
   }
-  # {
-  #   name = "kakoune-discord";
-  #   src = (builtins.getFlake "github:natsukagami/kakoune-discord/03f95e40d6efd8fd3de7bca31653d43de2dcfc5f").packages.${pkgs.system}.kakoune-discord-rc + "/rc";
-  # }
   rec {
     name = "kakoune-mirror";
     src =
-      pkgs.fetchFromGitHub {
+      fetchFromGitHub {
         owner = "Delapouite";
         repo = "kakoune-mirror";
         rev = "5710635f440bcca914d55ff2ec1bfcba9efe0f15";
@@ -182,7 +133,7 @@ builtins.map kakounePlugin [
   }
   {
     name = "unicode-math";
-    src = pkgs.fetchFromGitHub {
+    src = fetchFromGitHub {
       owner = "natsukagami";
       repo = "kakoune-unicode-math";
       rev = "08dff25da2b86ee0b0777091992bc7fb28c3cb1d";
@@ -199,7 +150,7 @@ builtins.map kakounePlugin [
   }
   {
     name = "kakoune-buffers";
-    src = pkgs.fetchFromGitHub {
+    src = fetchFromGitHub {
       owner = "Delapouite";
       repo = "kakoune-buffers";
       rev = "6b2081f5b7d58c72de319a5cba7bf628b6802881";

packages/common/nki-kakoune/utils.nix

@@ -1,5 +1,14 @@
-{ lib, writeTextDir, ... }:
 {
+  lib,
+  writeTextDir,
+  kakouneUtils,
+  symlinkJoin,
+  ...
+}:
+with {
+  inherit (kakouneUtils) buildKakounePluginFrom2Nix;
+};
+rec {
   mkFacesScript =
     name: faces:
     writeTextDir "share/kak/autoload/${name}/faces.kak" ''
@@ -9,4 +18,49 @@
       )}
       }
     '';
+
+  toDir = name: file: writeTextDir name (builtins.readFile file);
+
+  writeActivationScript =
+    script:
+    writeTextDir "on-load.kak" ''
+      hook global KakBegin .* %{
+        ${script}
+      }
+    '';
+
+  writeModuleWrapper =
+    name: script:
+    writeTextDir "module.kak" ''
+      provide-module ${name} %◍
+        ${script}
+      ◍
+    '';
+
+  kakounePlugin =
+    {
+      name,
+      src,
+      wrapAsModule ? false,
+      activationScript ? null,
+      ...
+    }@attrs:
+    let
+      module = if wrapAsModule then writeModuleWrapper name (builtins.readFile src) else src;
+    in
+    buildKakounePluginFrom2Nix {
+      pname = name;
+      version = attrs.version or "latest";
+      src =
+        if activationScript == null then
+          module
+        else
+          symlinkJoin {
+            name = "${name}-src";
+            paths = [
+              module
+              (writeActivationScript activationScript)
+            ];
+          };
+    };
 }