diff options
Diffstat (limited to 'config/essentials')
| -rw-r--r-- | config/essentials/nvim/after/plugin/luasnip.lua | 3 | ||||
| -rw-r--r-- | config/essentials/nvim/ftplugin/telekasten.lua | 1 | ||||
| -rw-r--r-- | config/essentials/nvim/lua/user/remap.lua | 3 | ||||
| -rw-r--r-- | config/essentials/nvim/lua/user/zk.lua | 20 | ||||
| -rw-r--r-- | config/essentials/zsh/.zshrc | 6 |
5 files changed, 18 insertions, 15 deletions
diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua index 70d7570..319a68c 100644 --- a/config/essentials/nvim/after/plugin/luasnip.lua +++ b/config/essentials/nvim/after/plugin/luasnip.lua @@ -213,7 +213,8 @@ ls.add_snippets("cs", { ls.add_snippets("telekasten", { --link - s("ln", fmt( + parse("ln", "[[$0]]", {}), + s("cln", fmt( [[ [{}]({}){} ]], diff --git a/config/essentials/nvim/ftplugin/telekasten.lua b/config/essentials/nvim/ftplugin/telekasten.lua index 2781b12..c180777 100644 --- a/config/essentials/nvim/ftplugin/telekasten.lua +++ b/config/essentials/nvim/ftplugin/telekasten.lua @@ -24,3 +24,4 @@ vim.keymap.set("n", "<LocalLeader>y", require("telekasten").yank_notelink) vim.keymap.set("n", "<Return>", require("telekasten").follow_link) vim.keymap.set("i", "<LocalLeader>l", "<esc>I[<esc>A]()<left><C-r>+<esc>A") +vim.keymap.set("n", "<LocalLeader>l", "I[[<esc>A]]<esc>") diff --git a/config/essentials/nvim/lua/user/remap.lua b/config/essentials/nvim/lua/user/remap.lua index e194ffa..fadca21 100644 --- a/config/essentials/nvim/lua/user/remap.lua +++ b/config/essentials/nvim/lua/user/remap.lua @@ -77,7 +77,8 @@ end, { noremap = true }) 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 }) +vim.keymap.set("n", "<C-s>s", "<cmd>setlocal spell!<cr>", { noremap = true }) +vim.keymap.set("n", "<C-s>g", "z=1<cr><cr>", { noremap = true }) -- -- open terminal in file's parent director -- -- this needs to be asynchrous diff --git a/config/essentials/nvim/lua/user/zk.lua b/config/essentials/nvim/lua/user/zk.lua index 7e15fa3..98476ca 100644 --- a/config/essentials/nvim/lua/user/zk.lua +++ b/config/essentials/nvim/lua/user/zk.lua @@ -48,52 +48,52 @@ require("telekasten").setup({ }, BusinessEnglish = { home = home .. "/" .. "BusinessEnglish", - template_new_note = home .. "/" .. "templates/new_note.md", + template_new_note = home .. "/" .. "templates/school.md", new_note_filename = "title", }, DataEssentials = { home = home .. "/" .. "DataEssentials", - template_new_note = home .. "/" .. "templates/new_note.md", + template_new_note = home .. "/" .. "templates/school.md", new_note_filename = "title", }, SoftwareDesign = { home = home .. "/" .. "SoftwareDesign", - template_new_note = home .. "/" .. "templates/new_note.md", + template_new_note = home .. "/" .. "templates/school.md", new_note_filename = "title", }, BusinessCommunication = { home = home .. "/" .. "BusinessCommunication", - template_new_note = home .. "/" .. "templates/new_note.md", + template_new_note = home .. "/" .. "templates/school.md", new_note_filename = "title", }, AIEssentials = { home = home .. "/" .. "AIEssentials", - template_new_note = home .. "/" .. "templates/new_note.md", + template_new_note = home .. "/" .. "templates/school.md", new_note_filename = "title", }, NETEssentials = { home = home .. "/" .. "NETEssentials", - template_new_note = home .. "/" .. "templates/new_note.md", + template_new_note = home .. "/" .. "templates/school.md", new_note_filename = "title", }, iTalent = { home = home .. "/" .. "iTalent", - template_new_note = home .. "/" .. "templates/new_note.md", + template_new_note = home .. "/" .. "templates/school.md", new_note_filename = "title", }, ScalingNetworks = { home = home .. "/" .. "ScalingNetworks", - template_new_note = home .. "/" .. "templates/new_note.md", + template_new_note = home .. "/" .. "templates/school.md", new_note_filename = "title", }, RoutingSwitchingEssentials = { home = home .. "/" .. "RoutingSwitchingEssentials", - template_new_note = home .. "/" .. "templates/new_note.md", + template_new_note = home .. "/" .. "templates/school.md", new_note_filename = "title", }, SoftwareDesignAndQualityAssurance = { home = home .. "/" .. "SoftwareDesignAndQualityAssurance", - template_new_note = home .. "/" .. "templates/new_note.md", + template_new_note = home .. "/" .. "templates/school.md", new_note_filename = "title", }, C = { diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index 3f2d7f4..76ff87f 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -115,9 +115,9 @@ RPROMPT='%F{blue}$(parse_git_remote)%f%F{red}$(parse_git_status)%f%F{green}$(par setopt prompt_subst parse_git_remote() { - git branch -v 2>/dev/null | - grep '^\*' | cut -f2 -d'[' | cut -f1 -d' ' | - sed 's/ahead/↑ /;s/behind/↓ /;s/\*//' + git branch -v 2> /dev/null | + awk -F '[][]' '/^\*/ {print $2}' | + sed 's/ahead/↑ /;s/behind/↓ /;s/[^↓↑]*/ /g' } parse_git_branch() { git symbolic-ref --short HEAD 2> /dev/null || git rev-parse --short HEAD 2> /dev/null |