diff --git a/lua/core/options.lua b/lua/core/options.lua index e94197f28..d857516d3 100644 --- a/lua/core/options.lua +++ b/lua/core/options.lua @@ -121,17 +121,6 @@ local function load_options() vim.g.python3_host_prog = use_if_defined(vim.g.python3_host_prog, "python3") end - -- custom sqlite3 provider - local sqlite_clib_path = os.getenv("SQLITE_CLIB_PATH") - if not isempty(sqlite_clib_path) then - -- Try environment variable first - vim.g.sqlite_clib_path = sqlite_clib_path - elseif global.is_windows then - -- Fix sqlite3 missing-lib issue on Windows - -- Download the DLLs form https://www.sqlite.org/download.html - vim.g.sqlite_clib_path = global.home .. "/Documents/sqlite-dll-win64-x64-3400200/sqlite3.dll" - end - for name, value in pairs(require("modules.utils").extend_config(global_local, "user.options")) do vim.o[name] = value end diff --git a/lua/modules/plugins/tool.lua b/lua/modules/plugins/tool.lua index 5e7916d42..775d572dc 100644 --- a/lua/modules/plugins/tool.lua +++ b/lua/modules/plugins/tool.lua @@ -80,12 +80,10 @@ tool["nvim-telescope/telescope.nvim"] = { event = { "CursorHold", "CursorHoldI" }, config = require("tool.project"), }, - { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, - { "nvim-telescope/telescope-frecency.nvim", dependencies = { - { "kkharji/sqlite.lua" }, - } }, { "jvgrootveld/telescope-zoxide" }, + { "nvim-telescope/telescope-frecency.nvim" }, { "nvim-telescope/telescope-live-grep-args.nvim" }, + { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, }, } diff --git a/nixos/neovim/default.nix b/nixos/neovim/default.nix index 74498b658..8afa2a092 100644 --- a/nixos/neovim/default.nix +++ b/nixos/neovim/default.nix @@ -134,7 +134,7 @@ in patchelf ]; home.extraOutputsToInstall = optional cfg.setBuildEnv "nvim-depends"; - home.shellAliases.nvim = optionalString cfg.setBuildEnv (concatStringsSep " " buildEnv) + " SQLITE_CLIB_PATH=${pkgs.sqlite.out}/lib/libsqlite3.so " + "nvim"; + home.shellAliases.nvim = optionalString cfg.setBuildEnv (concatStringsSep " " buildEnv) + " nvim"; programs.neovim = { enable = true; @@ -147,7 +147,6 @@ in [ # Dependent packages used by default plugins doq - sqlite ] ++ optionals cfg.withBuildTools [ cargo diff --git a/scripts/install.ps1 b/scripts/install.ps1 index 2f77ebfc2..c53f1f832 100644 --- a/scripts/install.ps1 +++ b/scripts/install.ps1 @@ -13,8 +13,8 @@ $REQUIRED_NVIM_VERSION_LEGACY = [version]'0.8.0' $USE_SSH = $True # package mgr vars -$choco_package_matrix = @{ "gcc" = "mingw"; "git" = "git"; "nvim" = "neovim"; "make" = "make"; "sudo" = "psutils"; "node" = "nodejs"; "pip" = "python3"; "fzf" = "fzf"; "rg" = "ripgrep"; "go" = "go"; "curl" = "curl"; "wget" = "wget"; "tree-sitter" = "tree-sitter"; "ruby" = "ruby"; "sqlite3" = "sqlite"; "rustc" = "rust-ms" } -$scoop_package_matrix = @{ "gcc" = "mingw"; "git" = "git"; "nvim" = "neovim"; "make" = "make"; "sudo" = "psutils"; "node" = "nodejs"; "pip" = "python"; "fzf" = "fzf"; "rg" = "ripgrep"; "go" = "go"; "curl" = "curl"; "wget" = "wget"; "tree-sitter" = "tree-sitter"; "ruby" = "ruby"; "sqlite3" = "sqlite"; "rustc" = "rust" } +$choco_package_matrix = @{ "gcc" = "mingw"; "git" = "git"; "nvim" = "neovim"; "make" = "make"; "sudo" = "psutils"; "node" = "nodejs"; "pip" = "python3"; "fzf" = "fzf"; "rg" = "ripgrep"; "go" = "go"; "curl" = "curl"; "wget" = "wget"; "tree-sitter" = "tree-sitter"; "ruby" = "ruby"; "rustc" = "rust-ms" } +$scoop_package_matrix = @{ "gcc" = "mingw"; "git" = "git"; "nvim" = "neovim"; "make" = "make"; "sudo" = "psutils"; "node" = "nodejs"; "pip" = "python"; "fzf" = "fzf"; "rg" = "ripgrep"; "go" = "go"; "curl" = "curl"; "wget" = "wget"; "tree-sitter" = "tree-sitter"; "ruby" = "ruby"; "rustc" = "rust" } $installer_pkg_matrix = @{ "NodeJS" = "npm"; "Python" = "pip"; "Ruby" = "gem" } # env vars @@ -266,7 +266,6 @@ function fetch_deps { check_and_fetch_exec -PkgName "curl" check_and_fetch_exec -PkgName "wget" check_and_fetch_exec -PkgName "rustc" - check_and_fetch_exec -PkgName "sqlite3" check_and_fetch_exec -PkgName "tree-sitter" # Reload PATH for future use @@ -398,10 +397,8 @@ Please make sure you have nvim v$REQUIRED_NVIM_VERSION_LEGACY installed at the v } info -Msg "Spawning Neovim and fetching plugins... (You'll be redirected shortly)" - info -Msg 'To make sqlite work with lua, manually grab the dlls from "https://www.sqlite.org/download.html" and replace' - info_ext -Msg 'vim.g.sqlite_clib_path with your path at the bottom of `lua/core/options.lua`.' - info -Msg 'Also, please make sure you have a Rust Toolchain installed via `rustup`! Otherwise, unexpected things may' - info_ext -Msg 'happen. See: https://www.rust-lang.org/tools/install. ¯¯¯¯¯¯¯¯¯¯¯¯' + info -Msg 'Please make sure you have a Rust Toolchain installed via `rustup`! Otherwise, unexpected things may' + info_ext -Msg 'happen. See: https://www.rust-lang.org/tools/install.¯¯¯¯¯¯¯¯¯¯¯¯' info_ext -Msg ' ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯' info -Msg 'If lazy.nvim failed to fetch any plugin(s), maunally execute `:Lazy sync` until everything is up-to-date.' Write-Host @' diff --git a/tutor/dots.tutor b/tutor/dots.tutor index 044595ef4..c4fe74a35 100644 --- a/tutor/dots.tutor +++ b/tutor/dots.tutor @@ -85,9 +85,9 @@ content in the right window and press enter to open it in buffer. Nvimdots also provide other find features. The most commonly used keymap maybe `fr`{normal} if you are used to editing files in different projects. It will list files you ever opened and sort them by "frecency" which used in firefox's -address bar. This feature utilizes "sqlite" to store the key-value pairs of -file path and its "frecency" value permanently at -**~/.local/share/nvim/file_frecency.sqlite3**. +address bar. This feature uses "Lua Bytecode" to store the key-value pairs of +file path and its "frecency" value permanently at: +**~/.local/share/nvim/file_frecency.bin**. You can press `fw`{normal} to search word in current work directory. It utilizes ripgrep to search and you can use it naturally as you use ripgrep.