Merge branch 'main' of db:dotfiles

4 files changed, 10 insertions, 32 deletions

diff --git a/config/essentials/nvim/lua/user/init.lua b/config/essentials/nvim/lua/user/init.lua
index f195e4f..de96b5c 100644
--- a/config/essentials/nvim/lua/user/init.lua
+++ b/config/essentials/nvim/lua/user/init.lua
@@ -1,8 +1,8 @@
-require("user.lazy")
+require("user.packer")
 require("user.remap")
 require("user.treesitter")
 require("user.set")
-require("user.cmp")
+-- require("user.cmp")
 require("user.zk")
 require("user.live-server")
 vim.cmd.source(vim.fn.stdpath("config") .. "/lua/user/aucommands.vim")
diff --git a/config/essentials/nvim/lua/user/packer.lua b/config/essentials/nvim/lua/user/packer.lua
index 8091d85..edb763d 100644
--- a/config/essentials/nvim/lua/user/packer.lua
+++ b/config/essentials/nvim/lua/user/packer.lua
@@ -42,7 +42,7 @@ return require('packer').startup(function(use)
 	use('ojroques/vim-oscyank', { branch = "main" })
 	use("potamides/pantran.nvim")
 	use('alx741/vinfo')
-	use('sheerun/vim-polyglot')
+	-- use('sheerun/vim-polyglot') TODO: fix error conflicting with telekasten
 	-- use('github/copilot.vim')
 	--
 	use {
diff --git a/config/essentials/nvim/lua/user/treesitter.lua b/config/essentials/nvim/lua/user/treesitter.lua
index 5b1fc5e..2355215 100644
--- a/config/essentials/nvim/lua/user/treesitter.lua
+++ b/config/essentials/nvim/lua/user/treesitter.lua
@@ -9,36 +9,9 @@ require'nvim-treesitter.configs'.setup {
   -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
   auto_install = true,
 
-  -- List of parsers to ignore installing (or "all")
-  ignore_install = { "javascript" },
+  indent = { enable = on },
 
-  ---- If you need to change the installation directory of the parsers (see -> Advanced Setup)
-  -- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")!
-  indent = {
-      enable = on
-  },
+  highlight = { enable = true, },
 
-  highlight = {
-    enable = true,
-
-    -- NOTE: these are the names of the parsers and not the filetype. (for example if you want to
-    -- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is
-    -- the name of the parser)
-    -- list of language that will be disabled
-    disable = { "c", "rust" },
-    -- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files
-    disable = function(lang, buf)
-        local max_filesize = 100 * 1024 -- 100 KB
-        local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
-        if ok and stats and stats.size > max_filesize then
-            return true
-        end
-    end,
-
-    -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-    -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-    -- Using this option may slow down your editor, and you may see some duplicate highlights.
-    -- Instead of true it can also be a list of languages
     additional_vim_regex_highlighting = false,
-  },
 }
diff --git a/config/essentials/nvim/lua/user/zk.lua b/config/essentials/nvim/lua/user/zk.lua
index 98476ca..3641025 100644
--- a/config/essentials/nvim/lua/user/zk.lua
+++ b/config/essentials/nvim/lua/user/zk.lua
@@ -41,6 +41,11 @@ require("telekasten").setup({
 	media_previewer = "telescope-media-files",
 	follow_url_fallback = nil,
 	vaults = {
+		Ideas = {
+			home = home .. "/" .. "Ideas",
+			template_new_note = home .. "/" .. "templates/new_note.md",
+			new_note_filename = "title",
+		},
 		Driving = {
 			home = home .. "/" .. "Driving",
 			template_new_note = home .. "/" .. "templates/new_note.md",