diff options
Diffstat (limited to 'config/essentials/nvim')
| -rw-r--r-- | config/essentials/nvim/after/plugin/luasnip.lua | 14 | ||||
| -rw-r--r-- | config/essentials/nvim/ftplugin/sh.lua | 8 | ||||
| -rw-r--r-- | config/essentials/nvim/lua/user/packer.lua | 2 | ||||
| -rw-r--r-- | config/essentials/nvim/lua/user/remap.lua | 10 | ||||
| -rw-r--r-- | config/essentials/nvim/lua/user/zk.lua | 5 |
5 files changed, 19 insertions, 20 deletions
diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua index 7ee274f..5657560 100644 --- a/config/essentials/nvim/after/plugin/luasnip.lua +++ b/config/essentials/nvim/after/plugin/luasnip.lua @@ -155,18 +155,14 @@ ls.add_snippets("sh", { stty \$old_stty_cfg } ]], {}), - parse("fdie", + parse("flogn", [[ - die () - { - echo "\$@" >&2 - } + logn () { >&2 printf '%s\n' "\$@"; } ]], {}), - s("die", fmt( + parse("flog", [[ - die "{}: {}"{} - ]], - { c(1, {t "I", t "E", t "W"}), i(2), i(0) })), + log () { >&2 printf '%s' "\$@"; } + ]], {}), s("inp", fmt( [[ test -z "${{{}:=$1}}" && diff --git a/config/essentials/nvim/ftplugin/sh.lua b/config/essentials/nvim/ftplugin/sh.lua index 01b20d6..e18170a 100644 --- a/config/essentials/nvim/ftplugin/sh.lua +++ b/config/essentials/nvim/ftplugin/sh.lua @@ -1,6 +1,6 @@ -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.keymap.set("n", "<LocalLeader>t", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1>\\&2 printf \"\\2\"<cr>") +vim.keymap.set("n", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1>\\&2 printf \"\\2: %s\\\\n\" \"$\\2\"<cr>") +vim.keymap.set("i", "<LocalLeader>t", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1>\\&2 printf \"\\2\"<cr><esc>A") +vim.keymap.set("i", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1>\\&2 printf \"\\2: %s\\\\n\" \"$\\2\"<cr><esc>A") vim.keymap.set({"i", "n"}, "<LocalLeader>v", "<esc>A)\"<esc>I\"$(<esc>I") vim.opt.formatoptions = "cqrnj" diff --git a/config/essentials/nvim/lua/user/packer.lua b/config/essentials/nvim/lua/user/packer.lua index c9e27a2..9351460 100644 --- a/config/essentials/nvim/lua/user/packer.lua +++ b/config/essentials/nvim/lua/user/packer.lua @@ -3,7 +3,7 @@ return require('packer').startup(function(use) -- files use { - 'nvim-telescope/telescope.nvim', tag = '0.1.1', + 'nvim-telescope/telescope.nvim', tag = '0.1.2', requires = { {'nvim-lua/plenary.nvim'} } } use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make' } diff --git a/config/essentials/nvim/lua/user/remap.lua b/config/essentials/nvim/lua/user/remap.lua index 0fe4164..c50d346 100644 --- a/config/essentials/nvim/lua/user/remap.lua +++ b/config/essentials/nvim/lua/user/remap.lua @@ -15,13 +15,9 @@ vim.keymap.set("i", "\\\\", "\\", { noremap = true }) vim.keymap.set("n", "gb", "<cmd>buffers<cr>:buffer<Space>", { noremap = true }) vim.keymap.set("n", "<Leader>q", "<cmd>q!<cr>", { noremap = true }) vim.keymap.set("n", "<Leader>Q", "<cmd>qa!<cr>", { noremap = true }) +-- close all except focused buffer +vim.keymap.set("n", "<leader>1", "<cmd>%bd|e#<cr>", { noremap = true }) --- Windows -vim.keymap.set("n", "<A-h>", "<C-W>h", { noremap = true }) -vim.keymap.set("n", "<A-j>", "<C-W>j", { noremap = true }) -vim.keymap.set("n", "<A-k>", "<C-W>k", { noremap = true }) -vim.keymap.set("n", "<A-l>", "<C-W>l", { noremap = true }) -vim.keymap.set("n", "<A-o>", "<C-W>o", { noremap = true }) -- command line vim.keymap.set("c", "<M-b>", "<C-Left>", { noremap = true }) vim.keymap.set("c", "<M-f>", "<C-Right>", { noremap = true }) @@ -34,6 +30,8 @@ vim.keymap.set("c", "<C-a>", "<Home>", { noremap = true }) vim.keymap.set("v", "J", "<cmd>m '>+1<cr>gv=gv<cr>", { noremap = true }) vim.keymap.set("v", "K", "<cmd>m '<-2<cr>gv=gv<cr>", { noremap = true }) +vim.keymap.set("n", "+", "<cmd>tabe .<cr>", { noremap = true }) + -- clipboard vim.keymap.set("n", "<Leader>y", "\"+y", { noremap = true }) diff --git a/config/essentials/nvim/lua/user/zk.lua b/config/essentials/nvim/lua/user/zk.lua index 613c8e5..8004238 100644 --- a/config/essentials/nvim/lua/user/zk.lua +++ b/config/essentials/nvim/lua/user/zk.lua @@ -50,6 +50,11 @@ require('telekasten').setup({ template_new_note = home .. "/" .. "templates/new_note.md", new_note_filename = "title", }, + NetworkEssentials = { + home = home .. "/" .. "NetworkEssentials", + template_new_note = home .. "/" .. "templates/new_note.md", + new_note_filename = "title", + }, C = { home = home .. "/" .. "C", template_new_note = home .. "/" .. "templates/new_note.md", |