Merge branch 'main' of db:dotfiles

6 files changed, 18 insertions, 13 deletions

diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua
index 3f607ab..70d7570 100644
--- a/config/essentials/nvim/after/plugin/luasnip.lua
+++ b/config/essentials/nvim/after/plugin/luasnip.lua
@@ -143,6 +143,7 @@ ls.add_snippets("java", {
 
 ls.add_snippets("sh", {
 	s("TD", t "THISDIR=\"$(dirname \"$(readlink -f \"$0\")\")\""),
+	parse("pf", ">&2 printf '$1\\n'$0", {}),
 	parse("fn", "$1 ()\n{\n\t$2\n}$0", {}),
 	-- Functions
 	parse("rchar",
diff --git a/config/essentials/nvim/ftplugin/telekasten.lua b/config/essentials/nvim/ftplugin/telekasten.lua
index 9454cc1..2781b12 100644
--- a/config/essentials/nvim/ftplugin/telekasten.lua
+++ b/config/essentials/nvim/ftplugin/telekasten.lua
@@ -21,6 +21,6 @@ vim.keymap.set("n", "<LocalLeader>r", require("telekasten").rename_note)
 vim.keymap.set("n", "<LocalLeader>t", require("telekasten").toggle_todo)
 vim.keymap.set("i", "<LocalLeader>t", "<cmd>Telekasten toggle_todo<cr><Esc>A")
 vim.keymap.set("n", "<LocalLeader>y", require("telekasten").yank_notelink)
-vim.keymap.set("n", "<LocalLeader>z", require("telekasten").follow_link)
+vim.keymap.set("n", "<Return>", require("telekasten").follow_link)
 
 vim.keymap.set("i", "<LocalLeader>l", "<esc>I[<esc>A]()<left><C-r>+<esc>A")
diff --git a/config/essentials/nvim/lua/user/remap.lua b/config/essentials/nvim/lua/user/remap.lua
index c50d346..e194ffa 100644
--- a/config/essentials/nvim/lua/user/remap.lua
+++ b/config/essentials/nvim/lua/user/remap.lua
@@ -79,13 +79,13 @@ vim.keymap.set("n", "<Leader>P", "<cmd>PackerSync<cr>", { noremap = true })
 -- spelling
 vim.keymap.set("n", "<Leader><C-s>", "<cmd>setlocal spell!<cr>", { noremap = true })
 
--- 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 $TERMINAL"
-	-- asynchrous go brr
-    vim.fn.jobstart(cmd, { on_exit = function(job_id, exit_code, event_type) end })
-end, { noremap = true })
+-- -- 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 $TERMINAL"
+-- 	-- asynchrous go brr
+--     vim.fn.jobstart(cmd, { on_exit = function(job_id, exit_code, event_type) end })
+-- end, { noremap = true })
 
 
 -- clear registers
diff --git a/config/essentials/nvim/lua/user/zk.lua b/config/essentials/nvim/lua/user/zk.lua
index 989560a..7e15fa3 100644
--- a/config/essentials/nvim/lua/user/zk.lua
+++ b/config/essentials/nvim/lua/user/zk.lua
@@ -56,6 +56,11 @@ require("telekasten").setup({
 			template_new_note = home .. "/" .. "templates/new_note.md",
 			new_note_filename = "title",
 		},
+		SoftwareDesign = {
+			home = home .. "/" .. "SoftwareDesign",
+			template_new_note = home .. "/" .. "templates/new_note.md",
+			new_note_filename = "title",
+		},
 		BusinessCommunication = {
 			home = home .. "/" .. "BusinessCommunication",
 			template_new_note = home .. "/" .. "templates/new_note.md",
@@ -86,8 +91,8 @@ require("telekasten").setup({
 			template_new_note = home .. "/" .. "templates/new_note.md",
 			new_note_filename = "title",
 		},
-		SoftwareDesign2 = {
-			home = home .. "/" .. "SoftwareDesign2",
+		SoftwareDesignAndQualityAssurance = {
+			home = home .. "/" .. "SoftwareDesignAndQualityAssurance",
 			template_new_note = home .. "/" .. "templates/new_note.md",
 			new_note_filename = "title",
 		},
diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index a5b20e3..7fa61c7 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -28,7 +28,6 @@ compinit
 . $ZDOTDIR/functions.zsh
 . $ZDOTDIR/aliases.sh
 
-local PLUGPATH
 for file in /{etc,usr/lib}/os-release
 do [ -f "$file" ] && . "$file" && break
 done
diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/zsh/aliases.sh
index 4aff77e..db5bd4f 100644
--- a/config/essentials/zsh/aliases.sh
+++ b/config/essentials/zsh/aliases.sh
@@ -206,8 +206,8 @@ alias esl='$EDITOR ~/proj/suckless/slock/config.def.h'
 alias esls='$EDITOR ~/proj/suckless/slstatus/config.def.h'
 alias ehy='$EDITOR ~/.config/hypr/hyprland.conf'
 alias ehyb='$EDITOR ~/.config/hypr/binds.conf'
-alias ewbj='$EDITOR ~/src/dotfiles/config/hyprland/waybar/config.jsonc'
-alias ewbs='$EDITOR ~/src/dotfiles/config/hyprland/waybar/style.css'
+alias ewbj='$EDITOR ~/.config/waybar/config.jsonc'
+alias ewbs='$EDITOR ~/.config/waybar/style.css'
 alias cfd='$EDITOR config.def.h'
 # /# quick cd
jV}k:!sort -t "'" -k 2

 alias cdl='cd ~/dl'