diff options
| author | Raymaekers Luca <raymaekers.luca@gmail.com> | 2023-04-16 21:54:54 +0200 |
|---|---|---|
| committer | Raymaekers Luca <raymaekers.luca@gmail.com> | 2023-04-16 21:54:54 +0200 |
| commit | 102e7d997a40a7215b10686ce2b0d006d5a97c2e (patch) | |
| tree | 86449e1b494d7c209563f6870a5c7493528434aa /config/essentials/nvim | |
| parent | a58ae56e98a8d9fcbe7fc7beaa976a4d164ee99a (diff) | |
| parent | 0403da37e183e41d3b949b473038806059130815 (diff) | |
Merge branch 'main' of db:dotfiles
Diffstat (limited to 'config/essentials/nvim')
| -rw-r--r-- | config/essentials/nvim/after/plugin/luasnip.lua | 9 | ||||
| -rw-r--r-- | config/essentials/nvim/ftplugin/sh.lua | 6 | ||||
| -rw-r--r-- | config/essentials/nvim/lua/user/remap.lua | 2 | ||||
| -rw-r--r-- | config/essentials/nvim/templates/inp.sh | 7 | ||||
| -rw-r--r-- | config/essentials/nvim/templates/minp.sh | 9 |
5 files changed, 24 insertions, 9 deletions
diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua index 75e139b..df40b2f 100644 --- a/config/essentials/nvim/after/plugin/luasnip.lua +++ b/config/essentials/nvim/after/plugin/luasnip.lua @@ -138,7 +138,14 @@ ls.add_snippets("sh", { echo "\$1" >&2 } ]], {}), - parse("die", "die \"$1\"$0", {}), + parse("die", "die \"I: $1\"$0", {}), + s("inp", fmt( + [[ + test -z "${{{}:=$1}}" && + {}="$(cat /dev/stdin)" + echo "{}: ${}" 1>&2{} + ]], + { i(1), rep(1), rep(1), rep(1), i(0) })), }) ls.add_snippets("javascript", { diff --git a/config/essentials/nvim/ftplugin/sh.lua b/config/essentials/nvim/ftplugin/sh.lua index 4b66c75..9290c29 100644 --- a/config/essentials/nvim/ftplugin/sh.lua +++ b/config/essentials/nvim/ftplugin/sh.lua @@ -1,3 +1,5 @@ -vim.keymap.set("n", "<LocalLeader>t", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2\"<cr><cmd>setlocal nohls<cr>") -vim.keymap.set("n", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2: ${\\2}\"<cr><cmd>setlocal nohls<cr>") +vim.keymap.set("n", "<LocalLeader>t", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2\"<cr>") +vim.keymap.set("n", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2: $\\2\"<cr>") +vim.keymap.set("i", "<LocalLeader>t", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2\"<cr><esc>A") +vim.keymap.set("i", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1echo \"\\2: $\\2\"<cr><esc>A") vim.opt.formatoptions = "cqrnj" diff --git a/config/essentials/nvim/lua/user/remap.lua b/config/essentials/nvim/lua/user/remap.lua index 30e1e2d..14f73c8 100644 --- a/config/essentials/nvim/lua/user/remap.lua +++ b/config/essentials/nvim/lua/user/remap.lua @@ -83,7 +83,7 @@ vim.keymap.set("n", "<Leader><C-s>", "<cmd>setlocal spell!<cr>", { noremap = tru -- open terminal in file's parent director -- this needs to be asynchrous vim.keymap.set("n", "<Return>", function () - local cmd = "cd " .. vim.fn.expand("%:p:h") .. "; setsid st" + local cmd = "cd " .. vim.fn.expand("%:p:h") .. "; setsid $TERMINAL" -- asynchrous go brr vim.fn.jobstart(cmd, { on_exit = function(job_id, exit_code, event_type) end }) end, { noremap = true }) diff --git a/config/essentials/nvim/templates/inp.sh b/config/essentials/nvim/templates/inp.sh index ab04f7c..3507cd5 100644 --- a/config/essentials/nvim/templates/inp.sh +++ b/config/essentials/nvim/templates/inp.sh @@ -1,6 +1,3 @@ -#!/bin/sh - -test -z "${inp:=$1}" \ - && inp="$(cat /dev/stdin)" - +test -z "${inp:=$1}" && + inp="$(cat /dev/stdin)" echo "inp: ${inp}" 1>&2 diff --git a/config/essentials/nvim/templates/minp.sh b/config/essentials/nvim/templates/minp.sh new file mode 100644 index 0000000..d91d249 --- /dev/null +++ b/config/essentials/nvim/templates/minp.sh @@ -0,0 +1,9 @@ +if [ "$MENUCMD" ] && [ -z "${inp:=$1}" ] +then + inp="$($MENUCMD < /dev/null)" +else + echo "input:" >&2 + read inp +fi +test -z "$inp" && + exit 1 |