From 486c92b939561b6167dd5bb25a4a73ca34be7a46 Mon Sep 17 00:00:00 2001 From: leiserfg Date: Sun, 9 Mar 2025 22:34:50 +0100 Subject: [PATCH] kitty: move to by-name --- .../kitty/themes.nix => by-name/ki/kitty-themes/package.nix} | 0 .../disable-test_ssh_bootstrap_with_different_launchers.patch | 0 .../ki}/kitty/fix-test_ssh_env_vars.patch | 0 .../terminal-emulators => by-name/ki}/kitty/fix_setup.patch | 0 .../kitty/default.nix => by-name/ki/kitty/package.nix} | 0 .../ki}/kitty/zsh-compinit.patch | 0 pkgs/top-level/all-packages.nix | 4 ++-- 7 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/{applications/terminal-emulators/kitty/themes.nix => by-name/ki/kitty-themes/package.nix} (100%) rename pkgs/{applications/terminal-emulators => by-name/ki}/kitty/disable-test_ssh_bootstrap_with_different_launchers.patch (100%) rename pkgs/{applications/terminal-emulators => by-name/ki}/kitty/fix-test_ssh_env_vars.patch (100%) rename pkgs/{applications/terminal-emulators => by-name/ki}/kitty/fix_setup.patch (100%) rename pkgs/{applications/terminal-emulators/kitty/default.nix => by-name/ki/kitty/package.nix} (100%) rename pkgs/{applications/terminal-emulators => by-name/ki}/kitty/zsh-compinit.patch (100%) diff --git a/pkgs/applications/terminal-emulators/kitty/themes.nix b/pkgs/by-name/ki/kitty-themes/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/kitty/themes.nix rename to pkgs/by-name/ki/kitty-themes/package.nix diff --git a/pkgs/applications/terminal-emulators/kitty/disable-test_ssh_bootstrap_with_different_launchers.patch b/pkgs/by-name/ki/kitty/disable-test_ssh_bootstrap_with_different_launchers.patch similarity index 100% rename from pkgs/applications/terminal-emulators/kitty/disable-test_ssh_bootstrap_with_different_launchers.patch rename to pkgs/by-name/ki/kitty/disable-test_ssh_bootstrap_with_different_launchers.patch diff --git a/pkgs/applications/terminal-emulators/kitty/fix-test_ssh_env_vars.patch b/pkgs/by-name/ki/kitty/fix-test_ssh_env_vars.patch similarity index 100% rename from pkgs/applications/terminal-emulators/kitty/fix-test_ssh_env_vars.patch rename to pkgs/by-name/ki/kitty/fix-test_ssh_env_vars.patch diff --git a/pkgs/applications/terminal-emulators/kitty/fix_setup.patch b/pkgs/by-name/ki/kitty/fix_setup.patch similarity index 100% rename from pkgs/applications/terminal-emulators/kitty/fix_setup.patch rename to pkgs/by-name/ki/kitty/fix_setup.patch diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/by-name/ki/kitty/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/kitty/default.nix rename to pkgs/by-name/ki/kitty/package.nix diff --git a/pkgs/applications/terminal-emulators/kitty/zsh-compinit.patch b/pkgs/by-name/ki/kitty/zsh-compinit.patch similarity index 100% rename from pkgs/applications/terminal-emulators/kitty/zsh-compinit.patch rename to pkgs/by-name/ki/kitty/zsh-compinit.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8588c147b93674..f18b837d918f63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1516,7 +1516,7 @@ with pkgs; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; - kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty { + kitty = darwin.apple_sdk_11_0.callPackage ../by-name/ki/kitty/package.nix { harfbuzz = harfbuzz.override { withCoreText = stdenv.hostPlatform.isDarwin; }; inherit (darwin) autoSignDarwinBinariesHook; inherit (darwin.apple_sdk_11_0) Libsystem; @@ -1528,7 +1528,7 @@ with pkgs; ; }; - kitty-themes = callPackage ../applications/terminal-emulators/kitty/themes.nix { }; + kitty-themes = callPackage ../by-name/ki/kitty-themes/package.nix { }; mlterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/mlterm { }; mlterm-wayland = mlterm.override {