Merge branch 'main' of db:dotfiles

9 files changed, 85 insertions, 26 deletions

diff --git a/config/essentials/nvim/after/plugin/colors.lua b/config/essentials/nvim/after/plugin/colors.lua
index a7dc515..048f60d 100644
--- a/config/essentials/nvim/after/plugin/colors.lua
+++ b/config/essentials/nvim/after/plugin/colors.lua
@@ -1,19 +1,21 @@
--- function ColorMyPencils(color)
--- 	color = color or "pywal"
--- 	vim.cmd.colorscheme(color)
--- 	-- vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
--- 	-- vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
--- 	-- vim.cmd.highlight("SignColumn guibg=none")
-
--- 	-- vim.g.nord_uniform_diff_background = true
--- 	-- vim.g.nord_contrast = true
--- 	-- vim.g.nord_borders = true
--- 	-- local highlights = require("nord").bufferline.highlights({
--- 	-- 	italic = true,
--- 	-- 	bold = true,
--- 	-- })
--- end
--- ColorMyPencils()
---
-local pywal16 = require('pywal16')
-pywal16.setup()
+ function ColorMyPencils(color)
+	if color == "nord" then
+		vim.cmd.colorscheme(color)
+		vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
+		vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
+		vim.cmd.highlight("SignColumn guibg=none")
+		vim.g.nord_uniform_diff_background = true
+		vim.g.nord_contrast = true
+		vim.g.nord_borders = true
+		local highlights = require("nord").bufferline.highlights({
+			italic = true,
+			bold = true,
+		})
+	elseif color == "pywal" then
+		local pywal16 = require('pywal16')
+		pywal16.setup()
+	else
+		vim.cmd("colorscheme " .. color)
+	end
+end
+ColorMyPencils("nord")
diff --git a/config/essentials/nvim/after/plugin/luasnip.lua b/config/essentials/nvim/after/plugin/luasnip.lua
index e692d37..d1da9b3 100644
--- a/config/essentials/nvim/after/plugin/luasnip.lua
+++ b/config/essentials/nvim/after/plugin/luasnip.lua
@@ -72,6 +72,11 @@ ls.add_snippets("html", {
 	</html>
 	]],
 	{i(1, "title"), i(2), i(3, "Header"), i(0)})),
+	s("sty", fmt(
+	[[
+	<link rel="stylesheet" type="text/css" href="{}">{}
+	]],
+	{ i(1), i(0) })),
 })
 
 ls.add_snippets("java", {
@@ -137,6 +142,7 @@ ls.add_snippets("java", {
 })
 
 ls.add_snippets("sh", {
+	s("TD", t "THISDIR=$(dirname $(readlink -f \"$0\"))"),
 	parse("fn", "$1 ()\n{\n\t$2\n}$0", {}),
 	parse("fdie",
 	[[
@@ -161,7 +167,32 @@ ls.add_snippets("sh", {
 
 ls.add_snippets("javascript", {
 	-- print
-	s("pt", fmt("console.log({}){}", { i(1, "\"Hello World!\"") , i(0) })),
+	s("pt", fmt("console.log({});{}", { i(1, "\"Hello World!\"") , i(0) })),
+	s("rq", fmt("const {} = require('{}');", { i(1), rep(1) })),
+	s("dbconn", fmt(
+	[[
+		let conn = null;
+		try {{
+			conn = await dbConnect();{}
+			conn.end()
+		}} catch(err) {{
+			console.error('Error:', err);
+		}}
+	]],
+	{ i(0) })),
+	s("apr", fmt(
+	[[
+	app.get('{}', (req, res) => {{
+		{}
+	}});{}
+	]],
+	{ i(1), i(2, "res.send(\"Hello world!\")"), i(0) })),
+	s("cerr", t "console.error('Error:', err);"),
+	s("gel", fmt(
+	[[
+	let {} = document.getElementById('{}');{}
+	]],
+	{ i(1), rep(1), i(0) })),
 })
 
 ls.add_snippets("telekasten", {
diff --git a/config/essentials/nvim/ftplugin/javascript.lua b/config/essentials/nvim/ftplugin/javascript.lua
index c6869e1..3a52ffb 100644
--- a/config/essentials/nvim/ftplugin/javascript.lua
+++ b/config/essentials/nvim/ftplugin/javascript.lua
@@ -1,4 +1,4 @@
 vim.keymap.set("n", "<LocalLeader>t", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1console.log(\\2);<cr><cmd>setlocal nohls<cr>")
-vim.keymap.set("n", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1console.log(`\\2: ${\\2}`);<cr><cmd>setlocal nohls<cr><esc>")
+vim.keymap.set("n", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1console.log('\\2:', \\2);<cr><cmd>setlocal nohls<cr><esc>")
 vim.keymap.set("i", "<LocalLeader>t", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1console.log(\\2);<cr><cmd>setlocal nohls<cr><esc>A")
-vim.keymap.set("i", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1console.log(`\\2: ${\\2}`);<cr><cmd>setlocal nohls<cr><esc>A")
+vim.keymap.set("i", "<LocalLeader>i", "<cmd>s/\\(\\s*\\)\\(.*\\)/\\1console.log('\\2:', \\2);<cr><cmd>setlocal nohls<cr><esc>A")
diff --git a/config/essentials/nvim/ftplugin/telekasten.lua b/config/essentials/nvim/ftplugin/telekasten.lua
index c920492..622972f 100644
--- a/config/essentials/nvim/ftplugin/telekasten.lua
+++ b/config/essentials/nvim/ftplugin/telekasten.lua
@@ -10,9 +10,6 @@ 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>")
diff --git a/config/essentials/nvim/lua/user/aucommands.vim b/config/essentials/nvim/lua/user/aucommands.vim
index 79ffc36..873f9c9 100644
--- a/config/essentials/nvim/lua/user/aucommands.vim
+++ b/config/essentials/nvim/lua/user/aucommands.vim
@@ -21,3 +21,15 @@ autocmd BufReadPost *
 
 " Makes vim-commentary work
 autocmd FileType dosini setlocal commentstring=#\ %s
+
+funct! Filter(command)
+    redir =>output
+    silent exec a:command
+    redir END
+    let @o = output
+    execute "put o"
+	redraw!
+    return ''
+endfunct!
+
+nnoremap <Leader>F :silent call Filter('g/')<left><Left>
diff --git a/config/essentials/nvim/lua/user/cmp/sql.lua b/config/essentials/nvim/lua/user/cmp/sql.lua
new file mode 100644
index 0000000..71f6bdf
--- /dev/null
+++ b/config/essentials/nvim/lua/user/cmp/sql.lua
@@ -0,0 +1 @@
+require'lspconfig'.sqlls.setup{}
diff --git a/config/essentials/nvim/lua/user/packer.lua b/config/essentials/nvim/lua/user/packer.lua
index a38dcd9..c9e27a2 100644
--- a/config/essentials/nvim/lua/user/packer.lua
+++ b/config/essentials/nvim/lua/user/packer.lua
@@ -13,7 +13,7 @@ return require('packer').startup(function(use)
 	use('theprimeagen/harpoon')
 
 	-- colors
-	-- use('shaunsingh/nord.nvim')
+	use('shaunsingh/nord.nvim')
 	use { 'uZer/pywal16.nvim', as = 'pywal16' }
 	use('norcalli/nvim-colorizer.lua')
 
@@ -39,6 +39,8 @@ return require('packer').startup(function(use)
 	use('renerocksai/calendar-vim')
 	use('ojroques/vim-oscyank', {branch = "main"})
 	use("potamides/pantran.nvim")
+	use('alx741/vinfo')
+	use('github/copilot.vim')
 
 	-- objects
 	use('michaeljsmith/vim-indent-object')
diff --git a/config/essentials/nvim/lua/user/remap.lua b/config/essentials/nvim/lua/user/remap.lua
index 25052f7..0fe4164 100644
--- a/config/essentials/nvim/lua/user/remap.lua
+++ b/config/essentials/nvim/lua/user/remap.lua
@@ -64,6 +64,7 @@ vim.keymap.set("n", "<Leader>x", "<cmd>!chmod +x %<cr>", { noremap = true, silen
 -- replace
 vim.keymap.set("n", "<Leader>sf", [[:%s/\<<C-r><C-w>\>/<C-r><C-w><C-w>/gI<Left><Left><Left>]])
 vim.keymap.set("n", "<Leader>sl", [[:s/\<<C-r><C-w>\>/<C-r><C-w><C-w>/gI<Left><Left><Left>]])
+vim.keymap.set("n", "<LocalLeader>f", "<cmd>.!fold -w 80 -s<cr>")
 
 -- write
 vim.keymap.set("n", "<LocalLeader>w", "<cmd>write<cr>", { noremap = true })
diff --git a/config/essentials/nvim/lua/user/zk.lua b/config/essentials/nvim/lua/user/zk.lua
index 9de8b87..e1c9bcc 100644
--- a/config/essentials/nvim/lua/user/zk.lua
+++ b/config/essentials/nvim/lua/user/zk.lua
@@ -39,6 +39,18 @@ require('telekasten').setup({
 	rename_update_links = true,
 	media_previewer = "telescope-media-files",
 	follow_url_fallback = nil,
+	vaults = {
+		SoftwareDesign = {
+			home = home .. "/" .. "SoftwareDesign",
+			template_new_note = home .. "/" .. "templates/new_note.md",
+			new_note_filename = "title",
+		},
+		businessIT = {
+			home = home .. "/" .. "businessIT",
+			template_new_note = home .. "/" .. "templates/new_note.md",
+			new_note_filename = "title",
+		}
+	}
 })
 
 vim.keymap.set("n", "<leader>z", "<cmd>Telekasten panel<cr>")
@@ -53,5 +65,6 @@ 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>zt", "<cmd>Telekasten panel<cr>")
 vim.keymap.set("n", "<leader>zw", "<cmd>Telekasten find_weekly_notes<cr>")
 vim.keymap.set("n", "<leader>#", "<cmd>Telekasten show_tags<cr>")