From abfdda1db013f8888c66442e9eddcf3b7b9f65a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Dudr?= Date: Mon, 30 Oct 2023 23:02:25 +0100 Subject: [PATCH] ... --- .../nvim/lua/configs/packages/luasnip.lua | 49 ++++++++++++++----- dot_config/zsh/include/functions.zsh | 11 +++++ private_dot_gnupg/gpg-agent.conf | 1 + 3 files changed, 48 insertions(+), 13 deletions(-) create mode 100644 private_dot_gnupg/gpg-agent.conf diff --git a/dot_config/nvim/lua/configs/packages/luasnip.lua b/dot_config/nvim/lua/configs/packages/luasnip.lua index d6f616e..0cf37b6 100644 --- a/dot_config/nvim/lua/configs/packages/luasnip.lua +++ b/dot_config/nvim/lua/configs/packages/luasnip.lua @@ -1,11 +1,7 @@ -return { +local M = { 'L3MON4D3/LuaSnip', - config = function() - require('luasnip.loaders.from_vscode').lazy_load() - require('luasnip.loaders.from_snipmate').lazy_load() - end, dependencies = { - 'rafamadriz/friendly-snippets' + 'rafamadriz/friendly-snippets', }, keys = { { @@ -13,13 +9,40 @@ return { function() return require('luasnip').jumpable(1) and 'luasnip-jump-next' or '' end, - expr = true, remap = true, silent = true, mode = 'i', + expr = true, + remap = true, + silent = true, + mode = 'i', }, - { '', function() require('luasnip').jump(1) end, mode = 's' }, - { '', function() require('luasnip').jump( -1) end, mode = { 'i', 's' } }, - -- { '', - -- function() return require('luasnip').choice_active() and 'luasnip-next-choice' or '' end, - -- mode = 'i', remap = true, expr = true, - -- }, + { '', function() require('luasnip').jump(1) end, mode = 's' }, + { '', function() require('luasnip').jump(-1) end, mode = { 'i', 's' } }, + { '', function () require("luasnip").change_choice(-1) end, mode = { 'i', 's'}}, + { '', function () require("luasnip").change_choice(1) end, mode = { 'i', 's'}}, }, } + +function M.config() + require('luasnip.loaders.from_vscode').lazy_load() + require('luasnip.loaders.from_snipmate').lazy_load() + require('luasnip.loaders.from_lua').lazy_load() + + local types = require('luasnip.util.types') + + local ls = require('luasnip') + ls.setup({ + ext_opts = { + [types.choiceNode] = { + active = { + virt_text = { { '●', 'GruvboxOrange' } }, + }, + }, + [types.insertNode] = { + active = { + virt_text = { { '●', 'GruvboxBlue' } }, + }, + }, + }, + }) +end + +return M diff --git a/dot_config/zsh/include/functions.zsh b/dot_config/zsh/include/functions.zsh index be99723..0a2e928 100644 --- a/dot_config/zsh/include/functions.zsh +++ b/dot_config/zsh/include/functions.zsh @@ -46,3 +46,14 @@ inplace() { cp $file $tmp $@ < $tmp > $file } + +refresh() { + local d=$HOME/.cache/zsh/ + if ! [[ -d $d ]] + then + echo "$d is not dir" >&2 + exit 1 + fi + rm -rf $d/* + exec zsh +} diff --git a/private_dot_gnupg/gpg-agent.conf b/private_dot_gnupg/gpg-agent.conf new file mode 100644 index 0000000..3b30677 --- /dev/null +++ b/private_dot_gnupg/gpg-agent.conf @@ -0,0 +1 @@ +pinentry-program /usr/bin/pinentry-rofi