diff --git a/dotfiles/kakoune/default.nix b/dotfiles/kakoune/default.nix index c609046..b6535c7 100644 --- a/dotfiles/kakoune/default.nix +++ b/dotfiles/kakoune/default.nix @@ -11,6 +11,7 @@ in { plugins = with pkgs.kakounePlugins; [ active-window kak-auto-pairs + kak-ayu kak-tree kakoune-auto-percent kakoune-find diff --git a/flake.nix b/flake.nix index 6ca8e6a..10f0f26 100644 --- a/flake.nix +++ b/flake.nix @@ -113,6 +113,8 @@ active-window = buildKakounePlugin "active-window" inputs.active-window; + kak-ayu = final.callPackage ./pkgs/kak-ayu { }; + kak-subvert = buildKakounePlugin "kak-subvert" inputs.kak-subvert; kak-tree = kak-tree.kakounePlugins.kak-tree; diff --git a/backup/pkgs/kak-ayu/.gitignore b/pkgs/kak-ayu/.gitignore similarity index 100% rename from backup/pkgs/kak-ayu/.gitignore rename to pkgs/kak-ayu/.gitignore diff --git a/backup/pkgs/kak-ayu/bin/build.js b/pkgs/kak-ayu/bin/build.js similarity index 100% rename from backup/pkgs/kak-ayu/bin/build.js rename to pkgs/kak-ayu/bin/build.js diff --git a/backup/pkgs/kak-ayu/default.nix b/pkgs/kak-ayu/default.nix similarity index 77% rename from backup/pkgs/kak-ayu/default.nix rename to pkgs/kak-ayu/default.nix index 7fa3f95..ab4a88a 100644 --- a/backup/pkgs/kak-ayu/default.nix +++ b/pkgs/kak-ayu/default.nix @@ -5,14 +5,14 @@ let builder = (import ./node.nix { inherit pkgs system; }).package; in with pkgs; stdenv.mkDerivation { name = "kak-ayu"; - src = ./dummy; + src = ./fakesrc; buildPhase = '' ${builder}/lib/node_modules/kak-ayu/bin/build.js ''; installPhase = '' - mkdir $out - cp *.kak $out/ + mkdir -p $out/share/kak/colors + cp *.kak $out/share/kak/colors ''; } diff --git a/backup/pkgs/kak-ayu/dummy/.gitkeep b/pkgs/kak-ayu/fakesrc/.gitkeep similarity index 100% rename from backup/pkgs/kak-ayu/dummy/.gitkeep rename to pkgs/kak-ayu/fakesrc/.gitkeep diff --git a/backup/pkgs/kak-ayu/node-env.nix b/pkgs/kak-ayu/node-env.nix similarity index 100% rename from backup/pkgs/kak-ayu/node-env.nix rename to pkgs/kak-ayu/node-env.nix diff --git a/backup/pkgs/kak-ayu/node-packages.nix b/pkgs/kak-ayu/node-packages.nix similarity index 100% rename from backup/pkgs/kak-ayu/node-packages.nix rename to pkgs/kak-ayu/node-packages.nix diff --git a/backup/pkgs/kak-ayu/node.nix b/pkgs/kak-ayu/node.nix similarity index 100% rename from backup/pkgs/kak-ayu/node.nix rename to pkgs/kak-ayu/node.nix diff --git a/backup/pkgs/kak-ayu/package-lock.json b/pkgs/kak-ayu/package-lock.json similarity index 100% rename from backup/pkgs/kak-ayu/package-lock.json rename to pkgs/kak-ayu/package-lock.json diff --git a/backup/pkgs/kak-ayu/package.json b/pkgs/kak-ayu/package.json similarity index 100% rename from backup/pkgs/kak-ayu/package.json rename to pkgs/kak-ayu/package.json diff --git a/backup/pkgs/kak-ayu/update.sh b/pkgs/kak-ayu/update.sh similarity index 100% rename from backup/pkgs/kak-ayu/update.sh rename to pkgs/kak-ayu/update.sh