From a309e967541657f27cce0a30dcb270bf99f3aed4 Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Mon, 17 Jun 2024 09:37:25 -0600 Subject: [PATCH] remove kitty-scrollback-nvim feature --- flake.lock | 17 ----------------- flake.nix | 4 ---- modules/common/applications/kitty.nix | 9 --------- modules/common/neovim/config/misc.nix | 9 --------- modules/common/neovim/config/syntax.nix | 1 - modules/common/neovim/default.nix | 6 ------ overlays/kitty-scrollback-nvim.patch | 13 ------------- overlays/neovim-plugins.nix | 6 ------ 8 files changed, 65 deletions(-) delete mode 100644 overlays/kitty-scrollback-nvim.patch diff --git a/flake.lock b/flake.lock index b6746ad..d0221ad 100644 --- a/flake.lock +++ b/flake.lock @@ -232,22 +232,6 @@ "type": "github" } }, - "kitty-scrollback-nvim-src": { - "flake": false, - "locked": { - "lastModified": 1716487246, - "narHash": "sha256-yHyco+ftcpJAVWhwA8ItKa0IZgNJZjCQQjuyVG93xUs=", - "owner": "mikesmithgh", - "repo": "kitty-scrollback.nvim", - "rev": "08960ad9a96ff6ea6269157dbd4a8a499f7a4311", - "type": "github" - }, - "original": { - "owner": "mikesmithgh", - "repo": "kitty-scrollback.nvim", - "type": "github" - } - }, "nextcloud-cookbook": { "flake": false, "locked": { @@ -514,7 +498,6 @@ "firefox-darwin": "firefox-darwin", "hmts-nvim-src": "hmts-nvim-src", "home-manager": "home-manager", - "kitty-scrollback-nvim-src": "kitty-scrollback-nvim-src", "nextcloud-cookbook": "nextcloud-cookbook", "nextcloud-external": "nextcloud-external", "nextcloud-news": "nextcloud-news", diff --git a/flake.nix b/flake.nix index 7941968..1abf955 100644 --- a/flake.nix +++ b/flake.nix @@ -117,10 +117,6 @@ url = "github:j-hui/fidget.nvim/v1.4.5"; flake = false; }; - kitty-scrollback-nvim-src = { - url = "github:mikesmithgh/kitty-scrollback.nvim"; - flake = false; - }; nvim-lint-src = { url = "github:mfussenegger/nvim-lint"; flake = false; diff --git a/modules/common/applications/kitty.nix b/modules/common/applications/kitty.nix index c41cbb2..3ebbac9 100644 --- a/modules/common/applications/kitty.nix +++ b/modules/common/applications/kitty.nix @@ -50,18 +50,9 @@ # Easy fullscreen toggle (for macOS) "super+f" = "toggle_fullscreen"; - - # Kitty scrollback nvim - "kitty_mod+h" = "kitty_scrollback_nvim"; - "kitty_mod+g" = "kitty_scrollback_nvim --config ksb_builtin_last_cmd_output"; }; settings = { - # Required for kitty-scrollback.nvim - allow_remote_control = "socket-only"; - listen_on = "unix:/tmp/kitty"; - action_alias = "kitty_scrollback_nvim kitten ${pkgs.vimPlugins.kitty-scrollback-nvim}/python/kitty_scrollback_nvim.py --no-nvim-args"; - # Colors (adapted from: https://github.com/kdrag0n/base16-kitty/blob/master/templates/default-256.mustache) background = config.theme.colors.base00; foreground = config.theme.colors.base05; diff --git a/modules/common/neovim/config/misc.nix b/modules/common/neovim/config/misc.nix index aa3f153..c292fdc 100644 --- a/modules/common/neovim/config/misc.nix +++ b/modules/common/neovim/config/misc.nix @@ -13,7 +13,6 @@ pkgs.vimPlugins.glow-nvim # Markdown preview popup pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews pkgs.vimPlugins.which-key-nvim # Keybind helper - pkgs.vimPlugins.kitty-scrollback-nvim # Scrollback pager for kitty ]; # Initialize some plugins @@ -24,14 +23,6 @@ }; setup.glow = { }; setup.which-key = { }; - setup.kitty-scrollback = { - global = dsl.rawLua '' - { - keymaps_enabled = false, - vim.keymap.set({ 'v' }, 'y', '(KsbVisualYank)(KsbQuitAll)', {}) - } - ''; - }; vim.o = { termguicolors = true; # Set to truecolor diff --git a/modules/common/neovim/config/syntax.nix b/modules/common/neovim/config/syntax.nix index ec59eaa..c014209 100644 --- a/modules/common/neovim/config/syntax.nix +++ b/modules/common/neovim/config/syntax.nix @@ -26,7 +26,6 @@ pkgs.vimPlugins.playground # Tree-sitter experimenting pkgs.vimPlugins.nginx-vim pkgs.vimPlugins.vim-helm - pkgs.vimPlugins.baleia-nvim # Clean ANSI from kitty scrollback # pkgs.vimPlugins.hmts-nvim # Tree-sitter injections for home-manager (pkgs.vimUtils.buildVimPlugin { pname = "nmasur"; diff --git a/modules/common/neovim/default.nix b/modules/common/neovim/default.nix index 712243e..67ff354 100644 --- a/modules/common/neovim/default.nix +++ b/modules/common/neovim/default.nix @@ -48,12 +48,6 @@ in }; }; - # Set Neovim as the kitty terminal "scrollback" (vi mode) option. - # Requires removing some of the ANSI escape codes that are sent to the - # scrollback using sed and baleia, as well as removing several - # unnecessary features. - programs.kitty.settings.scrollback_pager = "${neovim}/bin/nvim --headless +'KittyScrollbackGenerateKittens' +'set nonumber' +'set norelativenumber' +'%print' +'quit!' 2>&1"; - # Create a desktop option for launching Neovim from a file manager # (Requires launching the terminal and then executing Neovim) xdg.desktopEntries.nvim = lib.mkIf pkgs.stdenv.isLinux { diff --git a/overlays/kitty-scrollback-nvim.patch b/overlays/kitty-scrollback-nvim.patch deleted file mode 100644 index b20704d..0000000 --- a/overlays/kitty-scrollback-nvim.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lua/kitty-scrollback/health.lua b/lua/kitty-scrollback/health.lua -index 9d87dfa..a231b8d 100644 ---- a/lua/kitty-scrollback/health.lua -+++ b/lua/kitty-scrollback/health.lua -@@ -234,7 +234,7 @@ local function check_kitty_debug_config() - end - - local function check_kitty_scrollback_nvim_version() -- local current_version = nil -+ local current_version = 'master' - local tag_cmd = { 'git', 'describe', '--exact-match', '--tags' } - local ksb_dir = - vim.fn.fnamemodify(vim.api.nvim_get_runtime_file('lua/kitty-scrollback', false)[1], ':h:h') diff --git a/overlays/neovim-plugins.nix b/overlays/neovim-plugins.nix index 19a1454..fd5b778 100644 --- a/overlays/neovim-plugins.nix +++ b/overlays/neovim-plugins.nix @@ -38,11 +38,5 @@ in base16-nvim = plugin "base16-nvim" inputs.base16-nvim-src; baleia-nvim = plugin "baleia-nvim" inputs.baleia-nvim-src; hmts-nvim = plugin "hmts-nvim" inputs.hmts-nvim-src; - kitty-scrollback-nvim = prev.vimUtils.buildVimPlugin { - pname = "kitty-scrollback-nvim"; - src = inputs.kitty-scrollback-nvim-src; - version = "master"; - patches = [ ./kitty-scrollback-nvim.patch ]; - }; }; }