From 1f2c2dd3803f587b065f4a357b030aaa5dfeec5c Mon Sep 17 00:00:00 2001 From: scbj Date: Mon, 13 Jan 2025 17:37:31 +0100 Subject: [PATCH] . --- bashrc/.bashrc | 1 + misc/scripts/navigate_bash_setup.sh | 22 +++++++++++++++++++ navigate/.config/navigate/navigate.conf | 12 +++++----- .../nvim/lua/plugins/autocompletion.lua | 8 ++----- 4 files changed, 31 insertions(+), 12 deletions(-) create mode 100644 misc/scripts/navigate_bash_setup.sh diff --git a/bashrc/.bashrc b/bashrc/.bashrc index 1220d2f..8dd1c0d 100644 --- a/bashrc/.bashrc +++ b/bashrc/.bashrc @@ -65,6 +65,7 @@ source ~/.bash_alias ## source custom functions for specific purposes script_path=${HOME}/dotfiles/misc/scripts/ source_list=() +source_list+=("${script_path}/navigate_bash_setup.sh") source_list+=("${script_path}/colors.sh") source_list+=("${script_path}/dunst.sh") diff --git a/misc/scripts/navigate_bash_setup.sh b/misc/scripts/navigate_bash_setup.sh new file mode 100644 index 0000000..e10a957 --- /dev/null +++ b/misc/scripts/navigate_bash_setup.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +__call_navigate() { + arg_pid=" --pid $$ " + eval "$(navigate ${arg_pid} $@)" +} + +push() { + __call_navigate "push $@" +} + +pop() { + __call_navigate "pop $@" +} + +stack() { + __call_navigate "stack $@" +} + +book() { + __call_navigate "bookmark $@" +} diff --git a/navigate/.config/navigate/navigate.conf b/navigate/.config/navigate/navigate.conf index dc85706..04154ce 100644 --- a/navigate/.config/navigate/navigate.conf +++ b/navigate/.config/navigate/navigate.conf @@ -9,9 +9,9 @@ bookmarks_separator = " - " align_separators = true [styles] -stack_number = "default" -stack_separator = "cyan" -stack_path = "default" -bookmarks_name = "default" -bookmarks_seperator = "cyan" -bookmarks_path = "default" +stack_number_style = "default" +stack_separator_style = "cyan" +stack_path_style = "default" +bookmarks_name_style = "default" +bookmarks_seperator_style = "cyan" +bookmarks_path_style = "default" diff --git a/nvim/.config/nvim/lua/plugins/autocompletion.lua b/nvim/.config/nvim/lua/plugins/autocompletion.lua index cdee6eb..74262af 100644 --- a/nvim/.config/nvim/lua/plugins/autocompletion.lua +++ b/nvim/.config/nvim/lua/plugins/autocompletion.lua @@ -96,18 +96,14 @@ return { -- Select next/previous item with Tab / Shift + Tab [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_locally_jumpable() then + if luasnip.expand_or_locally_jumpable() then luasnip.expand_or_jump() else fallback() end end, { "i", "s" }), [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.locally_jumpable(-1) then + if luasnip.locally_jumpable(-1) then luasnip.jump(-1) else fallback()