Revert "fixed svelte highlighting"

This reverts commit 67ef68769a.

flake.nix

@@ -22,6 +22,7 @@
         black
         nixfmt
         rustfmt
+        eslint_d
         nil
         python313Packages.python-lsp-server
         typescript-language-server

init.lua

@@ -1,10 +1,6 @@
 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")
@@ -43,6 +39,10 @@ vim.opt.incsearch = true
 -- Nowrap
 vim.opt.wrap = false
 
+-- Scrolloff
+local scrolloff = math.floor(vim.o.lines / 2) - 3
+vim.opt.scrolloff = scrolloff
+
 -- Indent
 vim.o.autoindent = true
 

lua/config/autocmd.lua

@@ -27,13 +27,6 @@ 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" }, {

lua/config/binds.lua

@@ -83,22 +83,5 @@ Keymap("n", "<leader>fg", function()
 end)
 
 Keymap("n", "<leader>fb", function()
-	builtin.buffers({ show_all_buffers = true })
+	builtin.buffers({ cwd = vim.fn.expand("%:p:h") }) -- buffers don’t need cwd, but harmless
-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,7 +7,6 @@ require("conform").setup({
 	formatters_by_ft = {
 		lua = { "stylua" },
 		javascript = { "prettier" },
-		typescript = { "prettier" },
 		html = { "prettier" },
 		svelte = { "prettier" },
 		python = { "black" },

lua/plugins/completion/lspconfig.lua

@@ -1,7 +1,6 @@
 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/saghen/blink.lib", name = "blink-lib" },
 })
 
 vim.lsp.config("lua_ls", {
@@ -39,7 +38,7 @@ vim.lsp.enable({
 	"ts_ls",
 	"pylsp",
 	"cssls",
-	"svelte",
+	"svelte_language_server",
 	"nixd",
 	"rust_analyzer",
 	"emmet_language_server",

lua/plugins/utils/convenience.lua

@@ -20,16 +20,16 @@ require("auto-save").setup({
 require("remember").setup({})
 
 -- enable scrolleof
-require("scrollEOF").setup({
+-- require("scrollEOF").setup({
-	-- The pattern used for the internal autocmd to determine
+-- 	-- The pattern used for the internal autocmd to determine
-	-- where to run scrollEOF. See https://neovim.io/doc/user/autocmd.html#autocmd-pattern
+-- 	-- where to run scrollEOF. See https://neovim.io/doc/user/autocmd.html#autocmd-pattern
-	pattern = "*",
+-- 	pattern = "*",
-	-- Whether or not scrollEOF should be enabled in insert mode
+-- 	-- Whether or not scrollEOF should be enabled in insert mode
-	insert_mode = false,
+-- 	insert_mode = false,
-	-- Whether or not scrollEOF should be enabled in floating windows
+-- 	-- Whether or not scrollEOF should be enabled in floating windows
-	floating = true,
+-- 	floating = true,
-	-- List of filetypes to disable scrollEOF for.
+-- 	-- List of filetypes to disable scrollEOF for.
-	disabled_filetypes = { "terminal" },
+-- 	disabled_filetypes = { "terminal" },
-	-- List of modes to disable scrollEOF for. see https://neovim.io/doc/user/builtin.html#mode()
+-- 	-- List of modes to disable scrollEOF for. see https://neovim.io/doc/user/builtin.html#mode()
-	disabled_modes = { "t", "nt" },
+-- 	disabled_modes = { "t", "nt" },
-})
+-- })

lua/plugins/utils/telescope.lua

@@ -8,23 +8,11 @@ vim.pack.add({
 	{ 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" }

nvim-pack-lock.json

@@ -5,23 +5,19 @@
       "src": "https://github.com/okuuva/auto-save.nvim"
     },
     "blink": {
-      "rev": "2ef3db111181c5eef22a462aa0122349a6027f28",
+      "rev": "456d38d1cd3743926f329204c2340f3e7840aad6",
       "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": "dca1a190aa85f9065979ef35802fb77131911106",
+      "rev": "086a40dc7ed8242c03be9f47fbcee68699cc2395",
       "src": "https://github.com/stevearc/conform.nvim"
     },
     "devicons": {
-      "rev": "2795c26c916bb3c57dde308b82be51971fa92747",
+      "rev": "c72328a5494b4502947a022fe69c0c47e53b6aa6",
       "src": "https://github.com/nvim-tree/nvim-web-devicons"
     },
     "flash": {
@@ -37,11 +33,15 @@
       "src": "https://github.com/mfussenegger/nvim-lint"
     },
     "lspconfig": {
-      "rev": "451d4ef9abd4f0f08e379ef0d55d1c391b6125a7",
+      "rev": "c588db330592fa477a70d2fee6ba20a57194bdc3",
       "src": "https://github.com/neovim/nvim-lspconfig"
     },
+    "lspkind": {
+      "rev": "c7274c48137396526b59d86232eabcdc7fed8a32",
+      "src": "https://github.com/onsails/lspkind.nvim"
+    },
     "lualine": {
-      "rev": "131a558e13f9f28b15cd235557150ccb23f89286",
+      "rev": "f5d2a8570f8b736ddb9bb4be504355bcd6e15ec8",
       "src": "https://github.com/nvim-lualine/lualine.nvim"
     },
     "lualine-time": {
@@ -49,9 +49,13 @@
       "src": "https://github.com/archibate/lualine-time"
     },
     "mini": {
-      "rev": "a5fda91040763cf9ad70bdce1c656b0f4ba1d16e",
+      "rev": "69b7433355664cf76898eb86a12a019f39bd86d1",
       "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"
@@ -77,7 +81,7 @@
       "src": "https://github.com/Aasim-A/scrollEOF.nvim"
     },
     "telescope": {
-      "rev": "f04ab730b8f9c6bf3f54a206d0dcddfd70c52d59",
+      "rev": "471eebb1037899fd942cc0f52c012f8773505da1",
       "src": "https://github.com/nvim-telescope/telescope.nvim"
     },
     "telescope-file-browser": {
@@ -85,7 +89,7 @@
       "src": "https://github.com/nvim-telescope/telescope-file-browser.nvim"
     },
     "telescope-fzf": {
-      "rev": "b25b749b9db64d375d782094e2b9dce53ad53a40",
+      "rev": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c",
       "src": "https://github.com/nvim-telescope/telescope-fzf-native.nvim"
     },
     "telescope-nerdy": {