From c2b66111fddbb9f6acb8c196dc14721302683efe Mon Sep 17 00:00:00 2001 From: Henrik Bakken Date: Mon, 13 Dec 2021 02:07:01 +0100 Subject: [PATCH] updates nvim:cmp+edgedb and ranger --- nvim/init.lua | 47 ++++++++++++++++++++++++++++------------------- ranger/rc.conf | 2 +- 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/nvim/init.lua b/nvim/init.lua index 8c8b594..b4b1733 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -307,6 +307,9 @@ require("packer").startup { end } + -- edgedb syntax highlighting + use {"edgedb/edgedb-vim"} + -- flashing cursor on move use { "danilamihailov/beacon.nvim", @@ -550,7 +553,7 @@ require("packer").startup { config = function() local cmp = require("cmp") cmp.setup({ - experimental = {native_menu = true}, + experimental = {native_menu = true}, mapping = { [''] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert @@ -558,26 +561,32 @@ require("packer").startup { [''] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }), - [''] = cmp.mapping.select_next_item({ - behavior = cmp.SelectBehavior.Insert + [''] = cmp.mapping({ + c = function(fallback) + if #cmp.core:get_sources() > 0 and not cmp.get_config().experimental.native_menu then + if cmp.visible() then + cmp.select_next_item() + else + cmp.complete() + end + else + fallback() + end + end, }), - [''] = cmp.mapping.select_prev_item({ - behavior = cmp.SelectBehavior.Insert + [''] = cmp.mapping({ + c = function(fallback) + if #cmp.core:get_sources() > 0 and not cmp.get_config().experimental.native_menu then + if cmp.visible() then + cmp.select_prev_item() + else + cmp.complete() + end + else + fallback() + end + end, }), - [''] = cmp.mapping.select_next_item({ - behavior = cmp.SelectBehavior.Select - }), - [''] = cmp.mapping.select_prev_item({ - behavior = cmp.SelectBehavior.Select - }), - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.close(), - [''] = cmp.mapping.confirm({ - behavior = cmp.ConfirmBehavior.Replace, - select = true - }) }, sources = { {name = "nvim_lsp"}, diff --git a/ranger/rc.conf b/ranger/rc.conf index 3fcb2df..38e9bab 100644 --- a/ranger/rc.conf +++ b/ranger/rc.conf @@ -210,7 +210,7 @@ set metadata_deep_search false set clear_filters_on_dir_change false # Disable displaying line numbers in main column -set line_numbers false +set line_numbers relative # =================================================================== # == Local Options