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

6 files changed, 56 insertions, 31 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>")
diff --git a/config/essentials/nvim/lua/tlast/remap.lua b/config/essentials/nvim/lua/tlast/remap.lua
index 6deb099..0e2e813 100644
--- a/config/essentials/nvim/lua/tlast/remap.lua
+++ b/config/essentials/nvim/lua/tlast/remap.lua
@@ -28,6 +28,10 @@ vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "<A-j>", "<C-W>j")
 vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "<A-k>", "<C-W>k")
 vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "<A-l>", "<C-W>l")
 vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "<A-o>", "<C-W>o")
+-- command line
+vim.keymap.set("c", "<M-b>", "<C-Left>")
+vim.keymap.set("c", "<M-f>", "<C-Right>")
+vim.keymap.set("c", "<M-d>", "<C-Right><C-w>")
 
 -- move visual selection up/down wards
 vim.keymap.set("v", "J",  "<CMD>m '>+1<CR>gv=gv")
@@ -90,3 +94,16 @@ vim.keymap.set("n", "<Return>", function ()
         end
     })
 end)
+
+
+-- clear registers
+vim.keymap.set("n", "<Leader>rc", function ()
+	local regs = {'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+				  'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+				  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+				  'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+				  '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '/', '-', '"'}
+	for _, r in ipairs(regs) do
+	  vim.fn.setreg(r, {})
+	end
+end)
diff --git a/config/essentials/nvim/lua/tlast/set.lua b/config/essentials/nvim/lua/tlast/set.lua
index 7b72784..a89e2e3 100644
--- a/config/essentials/nvim/lua/tlast/set.lua
+++ b/config/essentials/nvim/lua/tlast/set.lua
@@ -28,7 +28,6 @@ vim.opt.encoding = "utf-8"
 
 vim.opt.smartindent = true
 vim.opt.scrolloff = 8
-vim.opt.textwidth = 74
 
 vim.opt.ignorecase = true
 vim.opt.smartcase = true
diff --git a/config/essentials/nvim/lua/tlast/zk.lua b/config/essentials/nvim/lua/tlast/zk.lua
index 8a3da94..a3cdefb 100644
--- a/config/essentials/nvim/lua/tlast/zk.lua
+++ b/config/essentials/nvim/lua/tlast/zk.lua
@@ -41,29 +41,16 @@ require('telekasten').setup({
 	follow_url_fallback = nil,
 })
 
-vim.keymap.set("n", "<leader>z", require('telekasten').panel)
--- vim.keymap.set("n", "<leader>zC", vim.cmd("CalendarT"))
-vim.keymap.set("n", "<leader>zF", require('telekasten').find_friends)
-vim.keymap.set("n", "<leader>zN", require('telekasten').new_templated_note)
-vim.keymap.set("n", "<leader>zT", require('telekasten').goto_today)
-vim.keymap.set("n", "<leader>zW", require('telekasten').goto_thisweek)
-vim.keymap.set("n", "<leader>za", require('telekasten').show_tags)
-vim.keymap.set("n", "<leader>zb", require('telekasten').show_backlinks)
-vim.keymap.set("n", "<leader>zc", require('telekasten').show_calendar)
-vim.keymap.set("n", "<leader>zd", require('telekasten').find_daily_notes)
-vim.keymap.set("n", "<leader>zf", require('telekasten').find_notes)
-vim.keymap.set("n", "<leader>zg", require('telekasten').search_notes)
-vim.keymap.set("n", "<leader>zm", require('telekasten').browse_media)
-vim.keymap.set("n", "<leader>zn", require('telekasten').new_note)
-vim.keymap.set("n", "<leader>zp", require('telekasten').preview_img)
-vim.keymap.set("n", "<leader>zr", require('telekasten').rename_note)
-vim.keymap.set("n", "<leader>zs", require('telekasten').switch_vault)
-vim.keymap.set("n", "<leader>zw", require('telekasten').find_weekly_notes)
-vim.keymap.set("n", "<leader>zy", require('telekasten').yank_notelink)
-vim.keymap.set("n", "<leader>#", require('telekasten').show_tags)
-
-vim.keymap.set("n", "<LocalLeader>z", require('telekasten').follow_link)
-vim.keymap.set("i", "<LocalLeader>l", "<esc>I![<esc>A]()<left><C-r>+<esc>")
-vim.keymap.set({"n", "i"}, "<LocalLeader>i", "<CMD>lua require('telekasten').insert_link()<CR>")
-vim.keymap.set({"n", "i"}, "<LocalLeader>I", "<CMD>lua require('telekasten').insert_img_link<CR>")
-vim.keymap.set({"n", "i"}, "<LocalLeader>t", "<CMD>lua require('telekasten').toggle_todo<CR>")
+vim.keymap.set("n", "<leader>z", "<cmd>Telekasten panel<cr>")
+vim.keymap.set("n", "<leader>zN", "<cmd>Telekasten new_templated_note<cr>")
+vim.keymap.set("n", "<leader>zT", "<cmd>Telekasten goto_today<cr>")
+vim.keymap.set("n", "<leader>zW", "<cmd>Telekasten goto_thisweek<cr>")
+vim.keymap.set("n", "<leader>zd", "<cmd>Telekasten find_daily_notes<cr>")
+vim.keymap.set("n", "<leader>zf", "<cmd>Telekasten find_notes<cr>")
+vim.keymap.set("n", "<leader>zg", "<cmd>Telekasten search_notes<cr>")
+vim.keymap.set("n", "<leader>zm", "<cmd>Telekasten browse_media<cr>")
+vim.keymap.set("n", "<leader>zn", "<cmd>Telekasten new_note<cr>")
+vim.keymap.set("n", "<leader>zp", "<cmd>Telekasten preview_img<cr>")
+vim.keymap.set("n", "<leader>zs", "<cmd>Telekasten switch_vault<cr>")
+vim.keymap.set("n", "<leader>zw", "<cmd>Telekasten find_weekly_notes<cr>")
+vim.keymap.set("n", "<leader>#", "<cmd>Telekasten show_tags<cr>")
diff --git a/config/essentials/nvim/templates/main.java b/config/essentials/nvim/templates/main.java
new file mode 100644
index 0000000..04d1154
--- /dev/null
+++ b/config/essentials/nvim/templates/main.java
@@ -0,0 +1,5 @@
+public class Main {
+	public static void main (String[] args) {
+		// some code
+	}
+}