chg: Switched to fzf-lua

laptop/config/keymaps.lua

@@ -30,12 +30,13 @@ map('n', '<leader>O', "O<Esc>j", { remap = false })
 -- Use ,u for redo
 map('n', '<leader>u', "<c-r>", { remap = false })
 
--- Find files using fzf by ,f
+-- Buffer related keymaps
-map('n', '<leader>f', ":Files<cr>", { remap = false })
-
--- Move around buffers using ,j and ,k
 map('n', '<leader>k', ":bnext<cr>", { remap = false })
 map('n', '<leader>j', ":bprevious<cr>", { remap = false })
+map('n', '<leader>w', ":bdelete<cr>", { remap = false })
 
 -- Clear search highlight by Esc in normal mode
 map('n', '<Esc>', ':noh<cr>', { remap = false })
+
+-- Find files using fzf by ,f
+vim.keymap.set('n', '<leader>f', ':Files<cr>', { remap = false, silent = true })

laptop/config/plugins.lua

@@ -62,8 +62,7 @@ require("lazy").setup(
         -- Formatter
         "stevearc/conform.nvim",
         "kylechui/nvim-surround",
-        "junegunn/fzf",
+        "ibhagwan/fzf-lua",
-        "junegunn/fzf.vim",
         "karb94/neoscroll.nvim",
         "hiphish/rainbow-delimiters.nvim",
         "linrongbin16/lsp-progress.nvim",

laptop/plugin/fzf.lua

@@ -0,0 +1,16 @@
+local fzf = require("fzf-lua")
+
+-- Default settings for fzf-lua
+fzf.setup({
+    actions = {
+        files = {
+            ['default'] = fzf.actions.file_tabedit,
+        },
+    },
+    files = {
+        cmd = "rg --files",
+    },
+})
+
+-- Setup the familiar fzf.nvim commands
+fzf.setup_fzfvim_cmds()

server/config/keymaps.lua

@@ -23,10 +23,13 @@ map('n', '<leader>u', "<c-r>", { remap = false })
 -- Find files using fzf by ,f
 map('n', '<leader>f', ":Files<cr>", { remap = false })
 
--- Move around buffers using ,j and ,k
+-- Buffer related keymaps
 map('n', '<leader>k', ":bnext<cr>", { remap = false })
 map('n', '<leader>j', ":bprevious<cr>", { remap = false })
+map('n', '<leader>w', ":bdelete<cr>", { remap = false })
 
 -- Clear search highlight by Esc in normal mode
 map('n', '<Esc>', ':noh<cr>', { remap = false })
 
+-- Find files using fzf by ,f
+vim.keymap.set('n', '<leader>f', ':Files<cr>', { remap = false, silent = true })

server/config/plugins.lua

@@ -49,8 +49,7 @@ require("lazy").setup(
     -- Syntax highlighting for Fish scripts
     "khaveesh/vim-fish-syntax",
     "kylechui/nvim-surround",
-    "junegunn/fzf",
+    "ibhagwan/fzf-lua",
-    "junegunn/fzf.vim",
     "karb94/neoscroll.nvim",
     },
     {

server/plugin/fzf.lua

@@ -0,0 +1,16 @@
+local fzf = require("fzf-lua")
+
+-- Default settings for fzf-lua
+fzf.setup({
+    actions = {
+        files = {
+            ['default'] = fzf.actions.file_tabedit,
+        },
+    },
+    files = {
+        cmd = "rg --files",
+    },
+})
+
+-- Setup the familiar fzf.nvim commands
+fzf.setup_fzfvim_cmds()

server/plugin/lualine.lua

@@ -1,3 +1,9 @@
+local function counts()
+    local lc = vim.fn.line('$')
+    local wc = vim.fn.wordcount().words
+    return string.format('%d L, %d W', lc, wc)
+end
+
 require("lualine").setup {
     options = {
         theme = 'moonfly',
@@ -6,8 +12,24 @@ require("lualine").setup{
         lualine_a = { 'buffers' },
         lualine_b = {},
         lualine_c = {},
-        lualine_x = {},
+        lualine_x = { 'filename' },
-        lualine_y = {'filename'},
+        lualine_y = { counts },
         lualine_z = { 'tabs' },
     },
+    sections = {
+        lualine_a = { 'mode' },
+        lualine_b = { 'branch', 'diff', 'diagnostics' },
+        lualine_c = { 'filename' },
+        lualine_x = { 'encoding', 'fileformat', 'filetype' },
+        lualine_y = { 'progress' },
+        lualine_z = { 'location' }
+    },
 }
+
+-- listen lsp-progress event and refresh lualine
+vim.api.nvim_create_augroup("lualine_augroup", { clear = true })
+vim.api.nvim_create_autocmd("User", {
+    group = "lualine_augroup",
+    pattern = "LspProgressStatusUpdated",
+    callback = require("lualine").refresh,
+})

vps/config/keymaps.lua

@@ -21,10 +21,13 @@ map('n', '<leader>u', "<c-r>", { remap = false })
 -- Find files using fzf by ,f
 map('n', '<leader>f', ":Files<cr>", { remap = false })
 
--- Move around buffers using ,j and ,k
+-- Buffer related keymaps
 map('n', '<leader>k', ":bnext<cr>", { remap = false })
 map('n', '<leader>j', ":bprevious<cr>", { remap = false })
+map('n', '<leader>w', ":bdelete<cr>", { remap = false })
 
 -- Clear search highlight by Esc in normal mode
 map('n', '<Esc>', ':noh<cr>', { remap = false })
 
+-- Find files using fzf by ,f
+vim.keymap.set('n', '<leader>f', ':Files<cr>', { remap = false, silent = true })

vps/config/plugins.lua

@@ -49,8 +49,7 @@ require("lazy").setup(
     -- Syntax highlighting for Fish scripts
     "khaveesh/vim-fish-syntax",
     "kylechui/nvim-surround",
-    "junegunn/fzf",
+    "ibhagwan/fzf-lua",
-    "junegunn/fzf.vim",
     "karb94/neoscroll.nvim",
     },
     {

vps/plugin/fzf.lua

@@ -0,0 +1,16 @@
+local fzf = require("fzf-lua")
+
+-- Default settings for fzf-lua
+fzf.setup({
+    actions = {
+        files = {
+            ['default'] = fzf.actions.file_tabedit,
+        },
+    },
+    files = {
+        cmd = "rg --files",
+    },
+})
+
+-- Setup the familiar fzf.nvim commands
+fzf.setup_fzfvim_cmds()

vps/plugin/lualine.lua

@@ -1,3 +1,9 @@
+local function counts()
+    local lc = vim.fn.line('$')
+    local wc = vim.fn.wordcount().words
+    return string.format('%d L, %d W', lc, wc)
+end
+
 require("lualine").setup {
     options = {
         theme = 'moonfly',
@@ -6,8 +12,24 @@ require("lualine").setup{
         lualine_a = { 'buffers' },
         lualine_b = {},
         lualine_c = {},
-        lualine_x = {},
+        lualine_x = { 'filename' },
-        lualine_y = {'filename'},
+        lualine_y = { counts },
         lualine_z = { 'tabs' },
     },
+    sections = {
+        lualine_a = { 'mode' },
+        lualine_b = { 'branch', 'diff', 'diagnostics' },
+        lualine_c = { 'filename' },
+        lualine_x = { 'encoding', 'fileformat', 'filetype' },
+        lualine_y = { 'progress' },
+        lualine_z = { 'location' }
+    },
 }
+
+-- listen lsp-progress event and refresh lualine
+vim.api.nvim_create_augroup("lualine_augroup", { clear = true })
+vim.api.nvim_create_autocmd("User", {
+    group = "lualine_augroup",
+    pattern = "LspProgressStatusUpdated",
+    callback = require("lualine").refresh,
+})