From b037e1a9c46fd6bddfea0e709eba828ed2717269 Mon Sep 17 00:00:00 2001 From: Nawfal bin Mohmad Rouyan Date: Thu, 8 Jul 2021 13:12:04 +0800 Subject: Fix terminal window navigation keymaps (#776) Missing '>' for --- lua/keymappings.lua | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'lua') diff --git a/lua/keymappings.lua b/lua/keymappings.lua index 46247c4c..580595ee 100644 --- a/lua/keymappings.lua +++ b/lua/keymappings.lua @@ -5,15 +5,15 @@ vim.api.nvim_set_keymap("n", "", "k", { silent = true }) vim.api.nvim_set_keymap("n", "", "l", { silent = true }) -- Terminal window navigation -vim.api.nvim_set_keymap("t", "", "h", {silent = true, noremap = true}) -vim.api.nvim_set_keymap("t", "", "j", {silent = true, noremap = true}) -vim.api.nvim_set_keymap("t", "", "k", {silent = true, noremap = true}) -vim.api.nvim_set_keymap("t", "", "l", {silent = true, noremap = true}) -vim.api.nvim_set_keymap("i", "", "h", {silent = true, noremap = true}) -vim.api.nvim_set_keymap("i", "", "j", {silent = true, noremap = true}) -vim.api.nvim_set_keymap("i", "", "k", {silent = true, noremap = true}) -vim.api.nvim_set_keymap("i", "", "l", {silent = true, noremap = true}) -vim.api.nvim_set_keymap("t", "", "", {silent = true, noremap = true}) +vim.api.nvim_set_keymap("t", "", "h", {silent = true, noremap = true}) +vim.api.nvim_set_keymap("t", "", "j", {silent = true, noremap = true}) +vim.api.nvim_set_keymap("t", "", "k", {silent = true, noremap = true}) +vim.api.nvim_set_keymap("t", "", "l", {silent = true, noremap = true}) +vim.api.nvim_set_keymap("i", "", "h", {silent = true, noremap = true}) +vim.api.nvim_set_keymap("i", "", "j", {silent = true, noremap = true}) +vim.api.nvim_set_keymap("i", "", "k", {silent = true, noremap = true}) +vim.api.nvim_set_keymap("i", "", "l", {silent = true, noremap = true}) +vim.api.nvim_set_keymap("t", "", "", {silent = true, noremap = true}) -- TODO fix this -- resize with arrows -- cgit v1.2.3 From 2ddf9dae3e5132c384a3ec9a355e18e5e35aa607 Mon Sep 17 00:00:00 2001 From: Uzaaft <48220549+Uzaaft@users.noreply.github.com> Date: Thu, 8 Jul 2021 10:44:46 +0200 Subject: Update lv-telescope init.lua Fix issue with deprecated config line. Ref: telescope.changelog-839. --- lua/lv-telescope/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua') diff --git a/lua/lv-telescope/init.lua b/lua/lv-telescope/init.lua index 8175a7ed..2c89520d 100644 --- a/lua/lv-telescope/init.lua +++ b/lua/lv-telescope/init.lua @@ -36,7 +36,7 @@ telescope.setup { file_sorter = require("telescope.sorters").get_fzy_sorter, file_ignore_patterns = {}, generic_sorter = require("telescope.sorters").get_generic_fuzzy_sorter, - shorten_path = true, + path_display = "shorten, winblend = 0, border = {}, borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" }, -- cgit v1.2.3 From e1bba492b316676d3374c34177a08d7206f06acf Mon Sep 17 00:00:00 2001 From: Uzaaft <48220549+Uzaaft@users.noreply.github.com> Date: Thu, 8 Jul 2021 10:47:04 +0200 Subject: Update init.lua Fixed issue with formatting --- lua/lv-telescope/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua') diff --git a/lua/lv-telescope/init.lua b/lua/lv-telescope/init.lua index 2c89520d..7f1b0d4d 100644 --- a/lua/lv-telescope/init.lua +++ b/lua/lv-telescope/init.lua @@ -36,7 +36,7 @@ telescope.setup { file_sorter = require("telescope.sorters").get_fzy_sorter, file_ignore_patterns = {}, generic_sorter = require("telescope.sorters").get_generic_fuzzy_sorter, - path_display = "shorten, + path_display = {"shorten_path"}, winblend = 0, border = {}, borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" }, -- cgit v1.2.3 From 4e38d232db90edd5e77b7fb7e03f99644bd00367 Mon Sep 17 00:00:00 2001 From: Uzaaft <48220549+Uzaaft@users.noreply.github.com> Date: Thu, 8 Jul 2021 12:22:15 +0200 Subject: Rewrote parameter value to shorten. --- lua/lv-telescope/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua') diff --git a/lua/lv-telescope/init.lua b/lua/lv-telescope/init.lua index 7f1b0d4d..51fc24e5 100644 --- a/lua/lv-telescope/init.lua +++ b/lua/lv-telescope/init.lua @@ -36,7 +36,7 @@ telescope.setup { file_sorter = require("telescope.sorters").get_fzy_sorter, file_ignore_patterns = {}, generic_sorter = require("telescope.sorters").get_generic_fuzzy_sorter, - path_display = {"shorten_path"}, + path_display = {"shorten"}, winblend = 0, border = {}, borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" }, -- cgit v1.2.3 From 84d6ea7a6302a916a38af262685db03902ce4866 Mon Sep 17 00:00:00 2001 From: Abouzar Parvan Date: Thu, 8 Jul 2021 15:37:51 +0430 Subject: you can disable clipboard (#783) --- lua/default-config.lua | 1 + lua/settings.lua | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'lua') diff --git a/lua/default-config.lua b/lua/default-config.lua index 45e93302..b88b5af4 100644 --- a/lua/default-config.lua +++ b/lua/default-config.lua @@ -8,6 +8,7 @@ O = { auto_close_tree = 0, auto_complete = true, colorscheme = "lunar", + clipboard = "unnamedplus", hidden_files = true, wrap_lines = false, number = true, diff --git a/lua/settings.lua b/lua/settings.lua index 3bf5d338..e1da3965 100644 --- a/lua/settings.lua +++ b/lua/settings.lua @@ -22,7 +22,7 @@ vim.g.colors_name = O.colorscheme --- SETTINGS --- opt.backup = false -- creates a backup file -opt.clipboard = "unnamedplus" -- allows neovim to access the system clipboard +opt.clipboard = O.clipboard -- allows neovim to access the system clipboard opt.cmdheight = O.cmdheight -- more space in the neovim command line for displaying messages opt.colorcolumn = "99999" -- fix indentline for now opt.completeopt = { "menuone", "noselect" } -- cgit v1.2.3 From 3ec856a78d0e00f93110d57d908ea5c39aa081ae Mon Sep 17 00:00:00 2001 From: Gruak <43846312+Gruak@users.noreply.github.com> Date: Thu, 8 Jul 2021 17:09:43 +0200 Subject: add scrolloff config option --- lua/default-config.lua | 1 + lua/settings.lua | 1 + 2 files changed, 2 insertions(+) (limited to 'lua') diff --git a/lua/default-config.lua b/lua/default-config.lua index b88b5af4..87a9e99b 100644 --- a/lua/default-config.lua +++ b/lua/default-config.lua @@ -17,6 +17,7 @@ O = { cmdheight = 2, cursorline = true, shell = "bash", + scrolloff = 0, timeoutlen = 100, nvim_tree_disable_netrw = 0, ignore_case = true, diff --git a/lua/settings.lua b/lua/settings.lua index e1da3965..044708b9 100644 --- a/lua/settings.lua +++ b/lua/settings.lua @@ -34,6 +34,7 @@ opt.hlsearch = O.hl_search -- highlight all matches on previous search pattern opt.ignorecase = O.ignore_case -- ignore case in search patterns opt.mouse = "a" -- allow the mouse to be used in neovim opt.pumheight = 10 -- pop up menu height +opt.scrolloff = O.scrolloff -- minimal number of screen lines to keep above and below the cursor opt.showmode = false -- we don't need to see things like -- INSERT -- anymore opt.showtabline = 2 -- always show tabs opt.smartcase = O.smart_case -- smart case -- cgit v1.2.3 From 53fed9d65538e0b9dcad6f32cca63b1d445a76dd Mon Sep 17 00:00:00 2001 From: "hui.liu" Date: Fri, 9 Jul 2021 00:35:41 +0800 Subject: Check lsp client is active for all language files (#790) --- lua/lv-utils/init.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'lua') diff --git a/lua/lv-utils/init.lua b/lua/lv-utils/init.lua index 3546d13c..e22524d7 100644 --- a/lua/lv-utils/init.lua +++ b/lua/lv-utils/init.lua @@ -8,6 +8,16 @@ function lv_utils.reload_lv_config() vim.cmd ":PackerInstall" end +function lv_utils.check_lsp_client_active(name) + local clients = vim.lsp.get_active_clients() + for _, client in pairs(clients) do + if client.name == name then + return true + end + end + return false +end + function lv_utils.define_augroups(definitions) -- {{{1 -- Create autocommand groups based on the passed definitions -- -- cgit v1.2.3 From d9fc6ec826da6330b243fe200eedbebd16dbbd98 Mon Sep 17 00:00:00 2001 From: Henrik Nilsson <43480919+Henrik-N@users.noreply.github.com> Date: Thu, 8 Jul 2021 18:58:22 +0200 Subject: User config option to change Rust inline hint/param prefixes (#774) * User configurable Rust inline hint prefixes * Ordered the language list * Rust param hints and ordered lang list --- lua/default-config.lua | 131 +++++++++++++++++++++++++------------------------ 1 file changed, 66 insertions(+), 65 deletions(-) (limited to 'lua') diff --git a/lua/default-config.lua b/lua/default-config.lua index 87a9e99b..ea2642c2 100644 --- a/lua/default-config.lua +++ b/lua/default-config.lua @@ -101,76 +101,76 @@ O = { }, lang = { - python = { - linter = "", - isort = false, + cmake = {}, + clang = { diagnostics = { virtual_text = { spacing = 0, prefix = "" }, signs = true, underline = true, }, - analysis = { - type_checking = "basic", - auto_search_paths = true, - use_library_code_types = true, - }, + cross_file_rename = true, + header_insertion = "never", + }, + css = { + virtual_text = true, }, dart = { sdk_path = "/usr/lib/dart/bin/snapshots/analysis_server.dart.snapshot", }, - lua = { + docker = {}, + efm = {}, + elm = {}, + emmet = { active = true }, + elixir = {}, + graphql = {}, + go = {}, + html = {}, + java = {}, + json = { diagnostics = { virtual_text = { spacing = 0, prefix = "" }, signs = true, underline = true, }, }, - sh = { - -- @usage can be 'shellcheck' - linter = "", - -- @usage can be 'shfmt' + kotlin = {}, + latex = {}, + lua = { diagnostics = { virtual_text = { spacing = 0, prefix = "" }, signs = true, underline = true, }, }, - tsserver = { - -- @usage can be 'eslint' - linter = "", - diagnostics = { - virtual_text = { spacing = 0, prefix = "" }, - signs = true, - underline = true, + php = { + format = { + format = { + default = "psr12", + }, + }, + environment = { + php_version = "7.4", }, - }, - json = { diagnostics = { virtual_text = { spacing = 0, prefix = "" }, signs = true, underline = true, }, + filetypes = { "php", "phtml" }, }, - tailwindcss = { - active = false, - filetypes = { - "html", - "css", - "scss", - "javascript", - "javascriptreact", - "typescript", - "typescriptreact", - }, - }, - clang = { + python = { + linter = "", + isort = false, diagnostics = { virtual_text = { spacing = 0, prefix = "" }, signs = true, underline = true, }, - cross_file_rename = true, - header_insertion = "never", + analysis = { + type_checking = "basic", + auto_search_paths = true, + use_library_code_types = true, + }, }, ruby = { diagnostics = { @@ -180,14 +180,11 @@ O = { }, filetypes = { "rb", "erb", "rakefile", "ruby" }, }, - go = {}, - elixir = {}, - vim = {}, - yaml = {}, - terraform = {}, rust = { rust_tools = { active = false, + parameter_hints_prefix = "<-", + other_hints_prefix = "=>", -- prefix for all the other hints (type, chaining) }, linter = "", diagnostics = { @@ -196,37 +193,41 @@ O = { underline = true, }, }, - svelte = {}, - - php = { - format = { - format = { - default = "psr12", - }, + sh = { + -- @usage can be 'shellcheck' + linter = "", + -- @usage can be 'shfmt' + diagnostics = { + virtual_text = { spacing = 0, prefix = "" }, + signs = true, + underline = true, }, - environment = { - php_version = "7.4", + }, + svelte = {}, + tailwindcss = { + active = false, + filetypes = { + "html", + "css", + "scss", + "javascript", + "javascriptreact", + "typescript", + "typescriptreact", }, + }, + terraform = {}, + tsserver = { + -- @usage can be 'eslint' + linter = "", diagnostics = { virtual_text = { spacing = 0, prefix = "" }, signs = true, underline = true, }, - filetypes = { "php", "phtml" }, - }, - latex = {}, - kotlin = {}, - html = {}, - elm = {}, - emmet = { active = true }, - graphql = {}, - efm = {}, - docker = {}, - cmake = {}, - java = {}, - css = { - virtual_text = true, }, + vim = {}, + yaml = {}, }, dashboard = { -- cgit v1.2.3 From 10755d3d4ebf67e37f59a38d5bab944a7ec95594 Mon Sep 17 00:00:00 2001 From: maminou <83711649+pulme@users.noreply.github.com> Date: Thu, 8 Jul 2021 18:19:21 +0100 Subject: added quit and save for which key (#788) --- lua/lv-which-key/init.lua | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'lua') diff --git a/lua/lv-which-key/init.lua b/lua/lv-which-key/init.lua index dbcbb9ae..ee664e4b 100644 --- a/lua/lv-which-key/init.lua +++ b/lua/lv-which-key/init.lua @@ -84,6 +84,12 @@ vim.api.nvim_set_keymap("v", "/", ":CommentToggle", { noremap = true -- close buffer vim.api.nvim_set_keymap("n", "c", ":BufferClose", { noremap = true, silent = true }) +-- Save +vim.api.nvim_set_keymap("n", "w", ":w!", { noremap = true, silent = true }) + +-- Quit +vim.api.nvim_set_keymap("n", "q", ":q!", { noremap = true, silent = true }) + -- open lv-config vim.api.nvim_set_keymap( "n", @@ -93,7 +99,8 @@ vim.api.nvim_set_keymap( ) local mappings = { - + ["w"] = "Save", + ["q"] = "Quit", ["."] = "LunarConfig", ["/"] = "Comment", ["c"] = "Close Buffer", -- cgit v1.2.3 From 4f372bb3b77f5bc60aa14fdaf2b9687414fc981a Mon Sep 17 00:00:00 2001 From: rebuilt Date: Thu, 8 Jul 2021 23:12:48 +0200 Subject: call colorschemes only after they get installed (#798) --- lua/settings.lua | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'lua') diff --git a/lua/settings.lua b/lua/settings.lua index 044708b9..78e9e777 100644 --- a/lua/settings.lua +++ b/lua/settings.lua @@ -11,21 +11,17 @@ cmd "set inccommand=split" cmd "set iskeyword+=-" cmd "set whichwrap+=<,>,[,],h,l" if O.transparent_window then - cmd "au ColorScheme * hi Normal ctermbg=none guibg=none" - cmd "au ColorScheme * hi SignColumn ctermbg=none guibg=none" + cmd "au ColorScheme * hi Normal ctermbg=none guibg=none" + cmd "au ColorScheme * hi SignColumn ctermbg=none guibg=none" end ---- COLORSCHEME --- - -vim.g.colors_name = O.colorscheme - --- SETTINGS --- opt.backup = false -- creates a backup file opt.clipboard = O.clipboard -- allows neovim to access the system clipboard opt.cmdheight = O.cmdheight -- more space in the neovim command line for displaying messages opt.colorcolumn = "99999" -- fix indentline for now -opt.completeopt = { "menuone", "noselect" } +opt.completeopt = {"menuone", "noselect"} opt.conceallevel = 0 -- so that `` is visible in markdown files opt.fileencoding = "utf-8" -- the encoding written to a file opt.guifont = "monospace:h17" -- the font used in graphical neovim applications -- cgit v1.2.3