nvim: remove unneeded bins and disable scroll animation of neovide.dev

3 files changed, 7 insertions, 53 deletions

diff --git a/store/bin/neovide-listen b/store/bin/neovide-listen
deleted file mode 100755
index 3bcc7da..0000000
--- a/store/bin/neovide-listen
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-
-export CRU_NVIM_SERVER=${CRU_NVIM_SERVER:-/tmp/nvimsocket}
-
-args=()
-
-self_built_nvim="$HOME/codes/neovim/build/bin/nvim"
-self_built_nvim_runtime="$HOME/codes/neovim/runtime"
-if [[ -z "$CRU_NVIM" ]] && [[ -e "$self_built_nvim" ]]; then
-  echo "Found self-built neovim at $CRU_NVIM"
-  CRU_NVIM="$self_built_nvim"
-  CRU_VIMRUNTIME="$self_built_nvim_runtime"
-fi 
-
-[[ -z "$CRU_NVIM" ]] || args=("${args[@]}" "--neovim-bin" "$CRU_NVIM")
-export CRU_NVIM=${CRU_NVIM:-nvim}
-[[ -z "$CRU_VIMRUNTIME" ]] || export VIMRUNTIME="$CRU_VIMRUNTIME"
-
-self_built_neovide="$HOME/codes/neovide/target/release/neovide"
-if [[ -z "$CRU_NEOVIDE" ]] && [[ -e "$self_built_neovide" ]]; then
-  echo "Found self-build of neovide at $self_built_neovide"
-  CRU_NEOVIDE="$self_built_neovide"
-fi
-export CRU_NEOVIDE=${CRU_NEOVIDE:-neovide}
-
-listen_added=0
-for arg in "$@"; do
-  args=("${args[@]}" "$arg")
-  if [[ "$arg" == "--" ]]; then
-    args=("${args[@]}" "--listen" "$CRU_NVIM_SERVER")
-    listen_added=1
-  fi
-done
-
-if [[ $listen_added = 0 ]]; then
-  args=("${args[@]}" "--" "--listen" "$CRU_NVIM_SERVER")
-fi
-
-if which nvr > /dev/null; then
-  echo "Found nvr, set VISUAL EDITOR GIT_EDITOR to nvr-wait"
-  export VISUAL="nvr-wait"
-  export EDITOR="$VISUAL"
-  export GIT_EDITOR="$VISUAL"
-fi
-
-args=("$CRU_NEOVIDE" "${args[@]}")
-echo "Full command is ${args[@]}"
-exec "${args[@]}"
-
diff --git a/store/bin/nvr-wait b/store/bin/nvr-wait
deleted file mode 100755
index 410d42d..0000000
--- a/store/bin/nvr-wait
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-export CRU_NVIM_SERVER=${CRU_NVIM_SERVER:-/tmp/nvimsocket}
-exec nvr --nostart --servername "$CRU_NVIM_SERVER" -cc split --remote-wait "$@"
diff --git a/store/config/nvim/init.lua b/store/config/nvim/init.lua
index ac6961a..668c00c 100644
--- a/store/config/nvim/init.lua
+++ b/store/config/nvim/init.lua
@@ -16,11 +16,18 @@ require("lazy").setup {
     spec = { { import = "plugins" } }
 }
 
+vim.cmd([[
+    if has('nvim') && executable('nvr')
+        let $GIT_EDITOR = 'nvr -cc split --remote-wait'
+    endif
+]])
+
 if vim.g.neovide then
     vim.opt.guifont = "Maple Mono";
     vim.g.neovide_normal_opacity = 0.95;
     vim.g.neovide_input_ime = false;
     vim.g.neovide_cursor_animate_in_insert_mode = false
+    vim.g.neovide_scroll_animation_far_lines = 0
     vim.g.neovide_input_macos_option_key_is_meta = 'only_left'
     vim.cmd("colorscheme catppuccin-macchiato")
 end