Merge remote-tracking branch 'refs/remotes/origin/main'

2 files changed, 21 insertions, 4 deletions

diff --git a/config/essentials/nvim/ftplugin/java.lua b/config/essentials/nvim/ftplugin/java.lua
index bf806b5..eeaff47 100644
--- a/config/essentials/nvim/ftplugin/java.lua
+++ b/config/essentials/nvim/ftplugin/java.lua
@@ -1,2 +1,3 @@
-vim.keymap.set("n", "<LocalLeader>t", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1System.out.println(\\2);<cr><cmd>setlocal nohls<cr>")
-vim.keymap.set("i", "<LocalLeader>t", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1System.out.println(\\2);<cr><cmd>setlocal nohls<cr><esc>A")
+vim.keymap.set({"n", "i"}, "<LocalLeader>t", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1System.out.print(\"\\2\");<cr>")
+vim.keymap.set({"n", "i"}, "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1System.out.print(\"\\2: \" + \\2);<cr>")
+vim.keymap.set({"n", "i"}, "<LocalLeader>l", "<cmd>s/print(/println(/<cr>")
diff --git a/config/essentials/nvim/ftplugin/telekasten.lua b/config/essentials/nvim/ftplugin/telekasten.lua
index 83156f6..c407b25 100644
--- a/config/essentials/nvim/ftplugin/telekasten.lua
+++ b/config/essentials/nvim/ftplugin/telekasten.lua
@@ -1,6 +1,5 @@
-vim.keymap.set("i", "(", "()<Left>")
-vim.keymap.set("i", "[", "[]<Left>")
 vim.opt.spell = true
+vim.opt.textwidth = 65
 
 -- syntax highlighting
 vim.cmd("hi tklink ctermfg=72 guifg=#81a1c1 cterm=bold,underline gui=bold,underline")
@@ -9,3 +8,20 @@ vim.cmd("hi tkHighlight ctermbg=yellow ctermfg=red cterm=bold guibg=#ebcb8b guif
 vim.cmd("hi link CalNavi CalRuler")
 vim.cmd("hi tkTagSep ctermfg=gray guifg=gray")
 vim.cmd("hi tkTag ctermfg=175 guifg=#d3869B")
+
+vim.keymap.set("i", "(", "()<Left>")
+vim.keymap.set("i", "[", "[]<Left>")
+
+vim.keymap.set("n", "<LocalLeader>a", "<cmd>Telekasten show_tags<cr>")
+vim.keymap.set("n", "<LocalLeader>b", "<cmd>Telekasten show_backlinks<cr>")
+vim.keymap.set("n", "<LocalLeader>c", "<cmd>Telekasten show_calendar<cr>")
+vim.keymap.set("n", "<LocalLeader>C", "<cmd>CalendarT<cr>")
+vim.keymap.set({"n", "i"}, "<LocalLeader>i", "<cmd>Telekasten insert_link<cr>")
+vim.keymap.set({"n", "i"}, "<LocalLeader>I", "<cmd>Telekasten insert_img_link<cr>")
+vim.keymap.set("n", "<LocalLeader>F", "<cmd>Telekasten find_friends<cr>")
+vim.keymap.set("n", "<LocalLeader>r", "<cmd>Telekasten rename_note<cr>")
+vim.keymap.set({"n", "i"}, "<LocalLeader>t", "<cmd>Telekasten toggle_todo<cr>")
+vim.keymap.set("n", "<LocalLeader>y", "<cmd>Telekasten yank_notelink<cr>")
+vim.keymap.set("n", "<LocalLeader>z", "<cmd>Telekasten follow_link<cr>")
+
+vim.keymap.set("i", "<LocalLeader>l", "<esc>I![<esc>A]()<left><C-r>+<esc>")