From 8d0d95420a3cba608fff74eace599208a7af9c0f Mon Sep 17 00:00:00 2001 From: js0ny Date: Sun, 13 Apr 2025 17:11:04 +0100 Subject: [PATCH] fix(nvim): LuaSnip auto expand, snack image preview for md --- .just.d/linux.just | 4 ++-- platforms/linux/systemd/user/keyd-app.service | 2 +- tools/nvim/lua/plugins/appearance.lua | 1 + tools/nvim/lua/plugins/completion.lua | 11 ++++++++++ tools/nvim/lua/plugins/lang/init.lua | 21 +++++-------------- tools/nvim/lua/plugins/lang/treesitter.lua | 2 +- tools/nvim/lua/plugins/mod/nvim-cmp.lua | 8 +------ tools/nvim/lua/plugins/mod/snacks-nvim.lua | 4 +++- 8 files changed, 25 insertions(+), 28 deletions(-) diff --git a/.just.d/linux.just b/.just.d/linux.just index 1d48002..84db47f 100644 --- a/.just.d/linux.just +++ b/.just.d/linux.just @@ -1,12 +1,12 @@ [linux] systemd: - {{LN}} {{DOTFILES}}/platforms/{{OS}}/systemd {{XDG_CONFIG_HOME}}/systemd/ + {{LN}} {{DOTFILES}}/platforms/{{OS}}/systemd {{XDG_CONFIG_HOME}}/systemd [linux] keyd: -which keyd || sudo pacman -S keyd --noconfirm || sudo apt install keyd --yes || @just build_keyd - sudo cp {{DOTFILES}}/platforms/linux/keyd/keyd.conf /etc/keyd/default.conf + sudo cp {{DOTFILES}}/platforms/linux/keyd/default.conf /etc/keyd/default.conf mkdir -p {{XDG_CONFIG_HOME}}/keyd {{LN}} {{DOTFILES}}/platforms/linux/keyd/app.conf {{XDG_CONFIG_HOME}}/keyd/app.conf sudo systemctl enable --now keyd.service diff --git a/platforms/linux/systemd/user/keyd-app.service b/platforms/linux/systemd/user/keyd-app.service index f20c7c0..b98c91c 100644 --- a/platforms/linux/systemd/user/keyd-app.service +++ b/platforms/linux/systemd/user/keyd-app.service @@ -4,7 +4,7 @@ Documentation=man:keyd-application-mapper(1) https://github.com/rvaiya/keyd [Service] Type=forking -ExecStart=/usr/bin/keyd-application-mapper -d +ExecStart=/usr/local/bin/keyd-application-mapper -d ExecStop=pkill keyd-applicatio Restart=on-failure diff --git a/tools/nvim/lua/plugins/appearance.lua b/tools/nvim/lua/plugins/appearance.lua index 3ba6ab5..91d54bf 100644 --- a/tools/nvim/lua/plugins/appearance.lua +++ b/tools/nvim/lua/plugins/appearance.lua @@ -23,6 +23,7 @@ return { integrations = { -- lualine = true, "lualine", + "blink_cmp" }, }, }, diff --git a/tools/nvim/lua/plugins/completion.lua b/tools/nvim/lua/plugins/completion.lua index b53d6ea..9541f9e 100644 --- a/tools/nvim/lua/plugins/completion.lua +++ b/tools/nvim/lua/plugins/completion.lua @@ -1,11 +1,22 @@ return { { import = "plugins.mod.blink-cmp" }, + -- { import = "plugins.mod.nvim-cmp" }, { "L3MON4D3/LuaSnip", build = "make install_jsregexp", event = "InsertEnter", config = function() require("luasnip.loaders.from_vscode").lazy_load({ paths = "~/.config/lsp-snippets" }) + require("luasnip").setup({ + history = true, + enable_autosnippets = true, + }) end, }, + { + "js0ny/luasnip-latex-snippets.nvim", + dependencies = { "L3MON4D3/LuaSnip", "lervag/vimtex" }, + ft = { "tex", "latex", "markdown", "org" }, + opts = {} + } } diff --git a/tools/nvim/lua/plugins/lang/init.lua b/tools/nvim/lua/plugins/lang/init.lua index 08be240..d65cdca 100644 --- a/tools/nvim/lua/plugins/lang/init.lua +++ b/tools/nvim/lua/plugins/lang/init.lua @@ -8,25 +8,14 @@ return { { import = "plugins.lang.lua" }, { import = "plugins.lang.treesitter" }, { import = "plugins.mod.trouble-nvim" }, - { - "williamboman/mason.nvim", - cmd = "Mason", - build = ":MasonUpdate", - -- opts_extend = { "ensure_installed" }, - opts = { - -- ensure_installed = require("config.servers").servers, - }, - }, + -- Remove mason and use system package manager -- { - -- "williamboman/mason-lspconfig.nvim", - -- event = "BufReadPre", - -- dependencies = { - -- { "williamboman/mason.nvim" }, - -- { "neovim/nvim-lspconfig" }, - -- }, + -- "williamboman/mason.nvim", + -- cmd = "Mason", + -- build = ":MasonUpdate", + -- -- opts_extend = { "ensure_installed" }, -- opts = { -- -- ensure_installed = require("config.servers").servers, - -- -- automatic_installation = false, -- }, -- }, { import = "plugins.mod.conform-nvim" }, diff --git a/tools/nvim/lua/plugins/lang/treesitter.lua b/tools/nvim/lua/plugins/lang/treesitter.lua index c778722..8aaf441 100644 --- a/tools/nvim/lua/plugins/lang/treesitter.lua +++ b/tools/nvim/lua/plugins/lang/treesitter.lua @@ -12,7 +12,7 @@ return { "BufReadPre", }, opts = { - ensure_installed = { "c", "lua", "vim", "vimdoc", "markdown", "markdown_inline" }, + ensure_installed = { "c", "lua", "vim", "vimdoc", "markdown", "markdown_inline", "latex" }, highlight = { enable = true }, indent = { enable = true }, }, diff --git a/tools/nvim/lua/plugins/mod/nvim-cmp.lua b/tools/nvim/lua/plugins/mod/nvim-cmp.lua index 6c4a0a4..4e92412 100644 --- a/tools/nvim/lua/plugins/mod/nvim-cmp.lua +++ b/tools/nvim/lua/plugins/mod/nvim-cmp.lua @@ -12,7 +12,6 @@ return { }, config = function() local cmp = require("cmp") - local lspconfig = require("lspconfig") local capabilities = require("cmp_nvim_lsp").default_capabilities() local servers_module = require("config.servers") local luasnip = require("luasnip") @@ -108,10 +107,5 @@ return { matching = { disallow_symbol_nonprefix_matching = false }, }) - -- 配置 LSP - for _, server in ipairs(servers) do - local config = vim.tbl_deep_extend("force", default_server_config, servers_config[server] or {}) - lspconfig[server].setup(config) - end - end, + end, } diff --git a/tools/nvim/lua/plugins/mod/snacks-nvim.lua b/tools/nvim/lua/plugins/mod/snacks-nvim.lua index 998cb6c..6382188 100644 --- a/tools/nvim/lua/plugins/mod/snacks-nvim.lua +++ b/tools/nvim/lua/plugins/mod/snacks-nvim.lua @@ -41,7 +41,9 @@ return { -- scroll = { enabled = true }, statuscolumn = { enabled = true }, -- words = { enabled = true }, - image = { enabled = true }, + image = { enabled = true, + img_dirs = { "_Global/Assets" } + }, }, keys = { -- {