diff --git a/laptop/config/keymaps.lua b/laptop/config/keymaps.lua index 3db447c..4ac2010 100644 --- a/laptop/config/keymaps.lua +++ b/laptop/config/keymaps.lua @@ -30,12 +30,13 @@ map('n', 'O', "Oj", { remap = false }) -- Use ,u for redo map('n', 'u', "", { remap = false }) --- Find files using fzf by ,f -map('n', 'f', ":Files", { remap = false }) - --- Move around buffers using ,j and ,k +-- Buffer related keymaps map('n', 'k', ":bnext", { remap = false }) map('n', 'j', ":bprevious", { remap = false }) +map('n', 'w', ":bdelete", { remap = false }) -- Clear search highlight by Esc in normal mode map('n', '', ':noh', { remap = false }) + +-- Find files using fzf by ,f +vim.keymap.set('n', 'f', ':Files', { remap = false, silent = true }) diff --git a/laptop/config/plugins.lua b/laptop/config/plugins.lua index 57aeaf7..2749ec1 100644 --- a/laptop/config/plugins.lua +++ b/laptop/config/plugins.lua @@ -62,8 +62,7 @@ require("lazy").setup( -- Formatter "stevearc/conform.nvim", "kylechui/nvim-surround", - "junegunn/fzf", - "junegunn/fzf.vim", + "ibhagwan/fzf-lua", "karb94/neoscroll.nvim", "hiphish/rainbow-delimiters.nvim", "linrongbin16/lsp-progress.nvim", diff --git a/laptop/plugin/fzf.lua b/laptop/plugin/fzf.lua new file mode 100644 index 0000000..74ac6d1 --- /dev/null +++ b/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() diff --git a/server/config/keymaps.lua b/server/config/keymaps.lua index 9cc2958..2015663 100644 --- a/server/config/keymaps.lua +++ b/server/config/keymaps.lua @@ -23,10 +23,13 @@ map('n', 'u', "", { remap = false }) -- Find files using fzf by ,f map('n', 'f', ":Files", { remap = false }) --- Move around buffers using ,j and ,k +-- Buffer related keymaps map('n', 'k', ":bnext", { remap = false }) map('n', 'j', ":bprevious", { remap = false }) +map('n', 'w', ":bdelete", { remap = false }) -- Clear search highlight by Esc in normal mode map('n', '', ':noh', { remap = false }) +-- Find files using fzf by ,f +vim.keymap.set('n', 'f', ':Files', { remap = false, silent = true }) diff --git a/server/config/plugins.lua b/server/config/plugins.lua index aae4f2e..23cc163 100644 --- a/server/config/plugins.lua +++ b/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", - "junegunn/fzf.vim", + "ibhagwan/fzf-lua", "karb94/neoscroll.nvim", }, { diff --git a/server/plugin/fzf.lua b/server/plugin/fzf.lua new file mode 100644 index 0000000..74ac6d1 --- /dev/null +++ b/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() diff --git a/server/plugin/lualine.lua b/server/plugin/lualine.lua index 7ee31c1..c25e909 100644 --- a/server/plugin/lualine.lua +++ b/server/plugin/lualine.lua @@ -1,13 +1,35 @@ -require("lualine").setup{ +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', }, tabline = { - lualine_a = {'buffers'}, + lualine_a = { 'buffers' }, lualine_b = {}, lualine_c = {}, - lualine_x = {}, - lualine_y = {'filename'}, - lualine_z = {'tabs'}, + lualine_x = { '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, +}) diff --git a/vps/config/keymaps.lua b/vps/config/keymaps.lua index 3430eda..0bb4828 100644 --- a/vps/config/keymaps.lua +++ b/vps/config/keymaps.lua @@ -21,10 +21,13 @@ map('n', 'u', "", { remap = false }) -- Find files using fzf by ,f map('n', 'f', ":Files", { remap = false }) --- Move around buffers using ,j and ,k +-- Buffer related keymaps map('n', 'k', ":bnext", { remap = false }) map('n', 'j', ":bprevious", { remap = false }) +map('n', 'w', ":bdelete", { remap = false }) -- Clear search highlight by Esc in normal mode map('n', '', ':noh', { remap = false }) +-- Find files using fzf by ,f +vim.keymap.set('n', 'f', ':Files', { remap = false, silent = true }) diff --git a/vps/config/plugins.lua b/vps/config/plugins.lua index 2a6439a..0077405 100644 --- a/vps/config/plugins.lua +++ b/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", - "junegunn/fzf.vim", + "ibhagwan/fzf-lua", "karb94/neoscroll.nvim", }, { diff --git a/vps/plugin/fzf.lua b/vps/plugin/fzf.lua new file mode 100644 index 0000000..74ac6d1 --- /dev/null +++ b/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() diff --git a/vps/plugin/lualine.lua b/vps/plugin/lualine.lua index 7ee31c1..c25e909 100644 --- a/vps/plugin/lualine.lua +++ b/vps/plugin/lualine.lua @@ -1,13 +1,35 @@ -require("lualine").setup{ +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', }, tabline = { - lualine_a = {'buffers'}, + lualine_a = { 'buffers' }, lualine_b = {}, lualine_c = {}, - lualine_x = {}, - lualine_y = {'filename'}, - lualine_z = {'tabs'}, + lualine_x = { '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, +})