fixed blink dependancy and removed unused plugins

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1775423009,
+        "lastModified": 1777578337,
-        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
+        "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
+        "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab",
         "type": "github"
       },
       "original": {

flake.nix

@@ -11,11 +11,11 @@
       system = "x86_64-linux"; # change if needed
       pkgs = import nixpkgs { inherit system; };
       pkgList = with pkgs; [
-
         # LSPs
         lua-language-server
         vscode-langservers-extracted
-        emmet-ls
+        emmet-language-server
+        svelte-language-server
         rust-analyzer
         ast-grep
         prettier

init.lua

@@ -1,6 +1,10 @@
 vim.g.mapleader = " "
 vim.g.maplocalleader = ","
 
+-- Scrolloff
+local scrolloff = math.floor(vim.o.lines / 2) - 3
+vim.opt.scrolloff = scrolloff
+
 require("plugins.init")
 require("config.autocmd")
 require("config.binds")
@@ -39,9 +43,6 @@ vim.opt.incsearch = true
 -- Nowrap
 vim.opt.wrap = false
 
--- Scrolloff
-vim.opt.scrolloff = math.floor(vim.o.lines / 2) - 3
-
 -- Indent
 vim.o.autoindent = true
 

lua/config/autocmd.lua

@@ -27,6 +27,13 @@ vim.api.nvim_create_autocmd("VimEnter", {
 	end,
 })
 
+vim.api.nvim_create_autocmd("FileType", {
+	pattern = { "svelte" },
+	callback = function()
+		vim.treesitter.start()
+	end,
+})
+
 local cursorline_group = vim.api.nvim_create_augroup("CursorLineControl", { clear = true })
 
 vim.api.nvim_create_autocmd({ "WinEnter", "BufEnter" }, {
@@ -42,3 +49,34 @@ vim.api.nvim_create_autocmd({ "WinLeave" }, {
 		vim.opt_local.cursorline = false
 	end,
 })
+
+local group = vim.api.nvim_create_augroup("autosave", {})
+
+-- Notification to say when a file is saved by autosave
+vim.api.nvim_create_autocmd("User", {
+	pattern = "AutoSaveWritePre",
+	group = group,
+	callback = function(opts)
+		if opts.data.saved_buffer ~= nil then
+			local filename = vim.fn.expand("%:t")
+			print("Saved '" .. filename .. "' at " .. vim.fn.strftime("%H:%M:%S"))
+		end
+	end,
+})
+
+-- Notification when enabling/disabling autosave for a buffer
+vim.api.nvim_create_autocmd("User", {
+	pattern = "AutoSaveEnable",
+	group = group,
+	callback = function()
+		print("AutoSave enabled")
+	end,
+})
+
+vim.api.nvim_create_autocmd("User", {
+	pattern = "AutoSaveDisable",
+	group = group,
+	callback = function()
+		print("AutoSave disabled")
+	end,
+})

lua/config/binds.lua

@@ -27,6 +27,7 @@ end
 Keymap("i", "<C-BS>", "<C-W>") -- C-Backscpace for whole words
 
 Keymap("n", "<leader>d", "<cmd>lua vim.diagnostic.open_float()<CR>") -- Diagnostics for Linter
+Keymap("n", "gd", "<cmd>lua vim.lsp.buf.definition()<CR>") -- Diagnostics for Linter
 
 -- Flash keymaps
 Keymap("n", "ss", function()
@@ -41,3 +42,63 @@ end)
 Keymap("n", "<leader>R", function()
 	require("flash").treesitter_search()
 end)
+
+-- Mini Session Keybinds
+Keymap("n", "<leader>qj", function() -- quit and save session local
+	require("mini.sessions").write(".session")
+	vim.cmd("wqa")
+end)
+
+Keymap("n", "<leader>qd", function() -- quit and delete session
+	require("mini.sessions").delete(".session")
+	vim.cmd("wqa")
+end)
+
+-- Telescope
+
+local builtin = require("telescope.builtin")
+
+Keymap("n", "<leader>ff", function()
+	builtin.find_files({ hidden = true })
+end)
+
+Keymap("n", "<space>fn", function()
+	local full_path = vim.api.nvim_buf_get_name(0)
+	local dir = vim.fn.fnamemodify(full_path, ":h")
+	require("telescope").extensions.file_browser.file_browser({
+		path = dir,
+	})
+end)
+
+Keymap("n", "<space>fs", function() -- select sessions
+	MiniSessions.select()
+end)
+
+Keymap("n", "<space>fd", function() -- select sessions
+	MiniSessions.select("delete")
+end)
+
+Keymap("n", "<leader>fg", function()
+	builtin.live_grep({ hidden = true })
+end)
+
+Keymap("n", "<leader>fb", function()
+	builtin.buffers({ show_all_buffers = true })
+end)
+
+-- Tab binds
+Keymap("n", "<C-T>l", function()
+	vim.cmd("tabnext")
+end)
+
+Keymap("n", "<C-T>h", function()
+	vim.cmd("tabprevious")
+end)
+
+Keymap("n", "<C-T>j", function()
+	vim.cmd("tabnew")
+end)
+
+Keymap("n", "<C-T>q", function()
+	vim.cmd("tabclose")
+end)

lua/plugins/completion/conform.lua

@@ -7,6 +7,9 @@ require("conform").setup({
 	formatters_by_ft = {
 		lua = { "stylua" },
 		javascript = { "prettier" },
+		typescript = { "prettier" },
+		html = { "prettier" },
+		svelte = { "prettier" },
 		python = { "black" },
 		nix = { "nixfmt" },
 		css = { "prettier" },

lua/plugins/completion/lspconfig.lua

@@ -1,7 +1,7 @@
 vim.pack.add({
 	{ src = "https://github.com/neovim/nvim-lspconfig", name = "lspconfig" },
 	{ src = "https://github.com/saghen/blink.cmp", name = "blink" },
-	{ src = "https://github.com/folke/lazydev.nvim", name = "lazydev" },
+	{ src = "https://github.com/saghen/blink.lib", name = "blink-lib" },
 })
 
 vim.lsp.config("lua_ls", {
@@ -18,25 +18,31 @@ vim.lsp.config("lua_ls", {
 		},
 	},
 })
-vim.lsp.config("emmet_ls", {
+-- vim.lsp.config("emmet_language_server", {
-	-- 			capabilities = require("cmp_nvim_lsp").default_capabilities(),
+-- 	-- 			capabilities = require("cmp_nvim_lsp").default_capabilities(),
-	filetypes = { "html", "css", "javascriptreact", "typescriptreact" },
+-- 	filetypes = { "html", "css", "javascriptreact", "typescriptreact" },
-	init_options = {
+-- 	init_options = {
-		html = {
+-- 		preferences = {},
-			options = {
+-- 		show_expanded_abbreviation = "always",
-				["bem.enabled"] = true,
+-- 		show_abbreviation_suggestions = true,
-			},
+-- 		show_suggestions_as_snippets = true,
-		},
+-- 		html = {
-	},
+-- 			options = {
-})
+-- 				["bem.enabled"] = true,
+-- 				["output.selfClosingStyle"] = "xhtml",
+-- 			},
+-- 		},
+-- 	},
+-- })
 vim.lsp.enable({
 	"lua_ls",
 	"ts_ls",
 	"pylsp",
 	"cssls",
+	"svelte",
 	"nixd",
 	"rust_analyzer",
-	"emmet_ls",
+	"emmet_language_server",
 })
 
 vim.o.pumborder = "rounded"
@@ -81,9 +87,26 @@ require("blink.cmp").setup({
 	},
 })
 
-vim.api.nvim_create_autocmd("FileType", {
+vim.api.nvim_create_autocmd("FileType", { -- Lazy load lazydev when in lua file (no pun intended)
 	pattern = "lua",
 	callback = function()
+		vim.pack.add({
+			{ src = "https://github.com/folke/lazydev.nvim", name = "lazydev" },
+		})
 		require("lazydev").setup()
+		require("blink.cmp").setup({ -- Reload blink with lazydev as a source
+			sources = {
+				-- add lazydev to your completion providers
+				default = { "lazydev", "lsp", "path", "snippets", "buffer" },
+				providers = {
+					lazydev = {
+						name = "LazyDev",
+						module = "lazydev.integrations.blink",
+						-- make lazydev completions top priority (see `:h blink.cmp`)
+						score_offset = 100,
+					},
+				},
+			},
+		})
 	end,
 })

lua/plugins/completion/treesitter.lua

@@ -8,6 +8,7 @@ require("nvim-treesitter").setup({
 require("nvim-treesitter").install({
 	"bash",
 	"html",
+	"svelte",
 	"latex",
 	"javascript",
 	"json",

lua/plugins/utils/convenience.lua

@@ -16,39 +16,20 @@ require("auto-save").setup({
 	noautocmd = true,
 })
 
-local group = vim.api.nvim_create_augroup("autosave", {})
-
--- Notification to say when a file is saved
-vim.api.nvim_create_autocmd("User", {
-	pattern = "AutoSaveWritePre",
-	group = group,
-	callback = function(opts)
-		if opts.data.saved_buffer ~= nil then
-			local filename = vim.fn.expand("%:t")
-			print("Saved '" .. filename .. "' at " .. vim.fn.strftime("%H:%M:%S"))
-		end
-	end,
-})
-
--- Notification when enabling/disabling autosave for a buffer
-vim.api.nvim_create_autocmd("User", {
-	pattern = "AutoSaveEnable",
-	group = group,
-	callback = function(opts)
-		print("AutoSave enabled")
-	end,
-})
-
-vim.api.nvim_create_autocmd("User", {
-	pattern = "AutoSaveDisable",
-	group = group,
-	callback = function(opts)
-		print("AutoSave disabled")
-	end,
-})
-
 -- enable remember
 require("remember").setup({})
 
 -- enable scrolleof
-require("scrollEOF").setup()
+require("scrollEOF").setup({
+	-- The pattern used for the internal autocmd to determine
+	-- where to run scrollEOF. See https://neovim.io/doc/user/autocmd.html#autocmd-pattern
+	pattern = "*",
+	-- Whether or not scrollEOF should be enabled in insert mode
+	insert_mode = false,
+	-- Whether or not scrollEOF should be enabled in floating windows
+	floating = true,
+	-- List of filetypes to disable scrollEOF for.
+	disabled_filetypes = { "terminal" },
+	-- List of modes to disable scrollEOF for. see https://neovim.io/doc/user/builtin.html#mode()
+	disabled_modes = { "t", "nt" },
+})

lua/plugins/utils/telescope.lua

@@ -0,0 +1,49 @@
+vim.pack.add({
+	{ src = "https://github.com/nvim-telescope/telescope.nvim", name = "telescope" },
+	{ src = "https://github.com/nvim-lua/plenary.nvim", name = "plenary" },
+	{ src = "https://github.com/nvim-telescope/telescope-symbols.nvim", name = "telescope-symbols" },
+	{ src = "https://github.com/nvim-telescope/telescope-ui-select.nvim", name = "telescope-ui-select" },
+	{ src = "https://github.com/nvim-telescope/telescope-fzf-native.nvim", name = "telescope-fzf" },
+	{ src = "https://github.com/nvim-telescope/telescope-file-browser.nvim", name = "telescope-file-browser" },
+	{ src = "https://github.com/2kabhishek/nerdy.nvim", name = "telescope-nerdy" },
+})
+
+local actions = require("telescope.actions")
+require("telescope").setup({
+	defaults = {
+		file_ignore_patterns = { ".git", ".venv", ".node_modules", "node_modules", ".svelte-kit", ".vscode" },
+	},
+	pickers = {
+		buffers = {
+			show_all_buffers = true,
+			mappings = {
+				i = {
+					["<CR>"] = actions.select_drop,
+				},
+				n = {
+					["<CR>"] = actions.select_drop,
+				},
+			},
+		},
+		live_grep = {
+			additional_args = function()
+				return { "--hidden" }
+			end,
+		},
+	},
+	extensions = {
+		file_browser = {
+			theme = "ivy",
+			hijack_netrw = true,
+		},
+		["ui-select"] = {
+			require("telescope.themes").get_dropdown({
+				-- even more opts
+			}),
+		},
+	},
+})
+
+require("telescope").load_extension("file_browser")
+require("telescope").load_extension("ui-select")
+require("telescope").load_extension("nerdy")

nvim-pack-lock.json

@@ -5,19 +5,23 @@
       "src": "https://github.com/okuuva/auto-save.nvim"
     },
     "blink": {
-      "rev": "456d38d1cd3743926f329204c2340f3e7840aad6",
+      "rev": "2ef3db111181c5eef22a462aa0122349a6027f28",
       "src": "https://github.com/saghen/blink.cmp"
     },
+    "blink-lib": {
+      "rev": "f29d8bac6549bc1e7d699c83f680823d7def98bd",
+      "src": "https://github.com/saghen/blink.lib"
+    },
     "catppuccin": {
       "rev": "426dbebe06b5c69fd846ceb17b42e12f890aedf1",
       "src": "https://github.com/catppuccin/nvim"
     },
     "conform": {
-      "rev": "086a40dc7ed8242c03be9f47fbcee68699cc2395",
+      "rev": "dca1a190aa85f9065979ef35802fb77131911106",
       "src": "https://github.com/stevearc/conform.nvim"
     },
     "devicons": {
-      "rev": "c72328a5494b4502947a022fe69c0c47e53b6aa6",
+      "rev": "2795c26c916bb3c57dde308b82be51971fa92747",
       "src": "https://github.com/nvim-tree/nvim-web-devicons"
     },
     "flash": {
@@ -33,15 +37,11 @@
       "src": "https://github.com/mfussenegger/nvim-lint"
     },
     "lspconfig": {
-      "rev": "c588db330592fa477a70d2fee6ba20a57194bdc3",
+      "rev": "451d4ef9abd4f0f08e379ef0d55d1c391b6125a7",
       "src": "https://github.com/neovim/nvim-lspconfig"
     },
-    "lspkind": {
-      "rev": "c7274c48137396526b59d86232eabcdc7fed8a32",
-      "src": "https://github.com/onsails/lspkind.nvim"
-    },
     "lualine": {
-      "rev": "f5d2a8570f8b736ddb9bb4be504355bcd6e15ec8",
+      "rev": "131a558e13f9f28b15cd235557150ccb23f89286",
       "src": "https://github.com/nvim-lualine/lualine.nvim"
     },
     "lualine-time": {
@@ -49,13 +49,9 @@
       "src": "https://github.com/archibate/lualine-time"
     },
     "mini": {
-      "rev": "69b7433355664cf76898eb86a12a019f39bd86d1",
+      "rev": "a5fda91040763cf9ad70bdce1c656b0f4ba1d16e",
       "src": "https://github.com/echasnovski/mini.nvim"
     },
-    "neorg": {
-      "rev": "1f14d72aad7165eac307a2a2f6be0fb97a04b3c2",
-      "src": "https://github.com/nvim-neorg/neorg"
-    },
     "noice": {
       "rev": "7bfd942445fb63089b59f97ca487d605e715f155",
       "src": "https://github.com/folke/noice.nvim"
@@ -80,6 +76,30 @@
       "rev": "e462b9a07b8166c3e8011f1dcbc6bf68b67cd8d7",
       "src": "https://github.com/Aasim-A/scrollEOF.nvim"
     },
+    "telescope": {
+      "rev": "f04ab730b8f9c6bf3f54a206d0dcddfd70c52d59",
+      "src": "https://github.com/nvim-telescope/telescope.nvim"
+    },
+    "telescope-file-browser": {
+      "rev": "3610dc7dc91f06aa98b11dca5cc30dfa98626b7e",
+      "src": "https://github.com/nvim-telescope/telescope-file-browser.nvim"
+    },
+    "telescope-fzf": {
+      "rev": "b25b749b9db64d375d782094e2b9dce53ad53a40",
+      "src": "https://github.com/nvim-telescope/telescope-fzf-native.nvim"
+    },
+    "telescope-nerdy": {
+      "rev": "97b0914dece80204a777f04c94b9980da0f7ac88",
+      "src": "https://github.com/2kabhishek/nerdy.nvim"
+    },
+    "telescope-symbols": {
+      "rev": "a6d0127a53d39b9fc2af75bd169d288166118aec",
+      "src": "https://github.com/nvim-telescope/telescope-symbols.nvim"
+    },
+    "telescope-ui-select": {
+      "rev": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2",
+      "src": "https://github.com/nvim-telescope/telescope-ui-select.nvim"
+    },
     "treesitter": {
       "rev": "4916d6592ede8c07973490d9322f187e07dfefac",
       "src": "https://github.com/nvim-treesitter/nvim-treesitter"

test.ts

@@ -1 +0,0 @@
-