From ec8b9eb1b829021b7a9cf509596bf7691c0ee63d Mon Sep 17 00:00:00 2001 From: tomoron Date: Thu, 9 Jul 2026 13:50:14 +0200 Subject: [PATCH] vim: add lsp_signature, set exrc remove pylsp-mypy package (broken) --- flake.lock | 30 ++++++++++----------- homeConfigs/global/appearance.nix | 1 + homeConfigs/global/minimal/vim.nix | 42 +++++++++++++++++------------- homeConfigs/global/vim.nix | 2 +- osConfigs/global/user.nix | 4 ++- 5 files changed, 44 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 0c97e6c..f34306a 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1783068397, - "narHash": "sha256-B31MxW5os40h6NlnCUd+8fxresmVJlMnpYv2Kht0uWI=", + "lastModified": 1783587400, + "narHash": "sha256-UEZ8LIavX5HFjtvSkj34ZBM30cWNpqJfXujm+B4rY1k=", "owner": "catppuccin", "repo": "nix", - "rev": "e3adb9b4815a3f934626626e6d6d1d8518717903", + "rev": "b69e0494705aaf50cb2c6e0e005639b632044c6d", "type": "github" }, "original": { @@ -49,11 +49,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1783224161, - "narHash": "sha256-SaSOAG03FE9FC0GV7uPPeyb7CHS59Yw9n0Go1gioidc=", + "lastModified": 1783569760, + "narHash": "sha256-debpliOeMVTrO3IpmFmqfSO/mgYVYxhPmxGwDrBpknU=", "owner": "rycee", "repo": "nur-expressions", - "rev": "3a074d910fc151b9fcfb67dff99b844d6ee530dd", + "rev": "32cdec83ac1c9d5219dbb2278b9d4e3f2f6b5dc3", "type": "gitlab" }, "original": { @@ -86,11 +86,11 @@ ] }, "locked": { - "lastModified": 1783222121, - "narHash": "sha256-E/ElL373TO8lQ2aMvYyzN+k4xkVaUGoRqoa8AtM71tI=", + "lastModified": 1783550008, + "narHash": "sha256-qbbZUk9IG9dLNwCPwdPBs6I5clxwugRpP+1YU+GPK20=", "owner": "nix-community", "repo": "home-manager", - "rev": "a1645f40777620c4bd2b6d854b290c2fc354a266", + "rev": "f4d01c1d87c7c2ec909549165d5a8338f1bd3315", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1782562157, - "narHash": "sha256-a7+T6QSeowynwZ1ZJJbP8T8ntAytvrui8kFGJmIZt2c=", + "lastModified": 1783582157, + "narHash": "sha256-EteIu2AVVbxzkBnBKjrbdknbpjxBkWTMNg02rXj4mgU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a9cf7546a938c737b079e738de73934a13de9784", + "rev": "968980fba2c290b5529025636474eae8457b854c", "type": "github" }, "original": { @@ -163,11 +163,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1783309530, - "narHash": "sha256-ccD51WkEPHDgcvgJtS/qvQ6rY9A9RmYZOyDwuWLxZKU=", + "lastModified": 1783590188, + "narHash": "sha256-HBiI4+CVgAwwF8gg0s7QqUSFrBq2B10L7aXClJPX45k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6258c89d88bc4ca97f955b7b47b8f828d091ecdc", + "rev": "05995407f5df6f8259dbb09c789d11abcb22ef5f", "type": "github" }, "original": { diff --git a/homeConfigs/global/appearance.nix b/homeConfigs/global/appearance.nix index dabcc6e..baf4b06 100644 --- a/homeConfigs/global/appearance.nix +++ b/homeConfigs/global/appearance.nix @@ -23,6 +23,7 @@ qt.style.name = "kvantum"; home.pointerCursor = { + enable = true; gtk.enable = true; package = pkgs.bibata-cursors; name = "Bibata-Modern-Classic"; diff --git a/homeConfigs/global/minimal/vim.nix b/homeConfigs/global/minimal/vim.nix index 6b54731..876aee4 100644 --- a/homeConfigs/global/minimal/vim.nix +++ b/homeConfigs/global/minimal/vim.nix @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2026/06/14 19:22:40 by tomoron #+# #+# # -# Updated: 2026/06/14 19:32:07 by tomoron ### ########.fr # +# Updated: 2026/07/07 20:00:29 by tom ### ########.fr # # # # **************************************************************************** # @@ -31,26 +31,27 @@ local cmp = require'cmp' cmp.setup({ - snippet = { - expand = function(args) - vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users. - end, - }, + experimental = { ghost_text = true }, + snippet = { + expand = function(args) + vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users. + end, + }, - window = { - completion = cmp.config.window.bordered(), - documentation = cmp.config.window.bordered(), - }, + window = { + completion = cmp.config.window.bordered(), + documentation = cmp.config.window.bordered(), + }, - mapping = cmp.mapping.preset.insert({ - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.abort(), - [''] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. - }), + mapping = cmp.mapping.preset.insert({ + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.abort(), + [''] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. + }), - sources = cmp.config.sources({ + sources = cmp.config.sources({ { name = 'nvim_lsp' }, { name = 'vsnip' }, }, { @@ -58,6 +59,7 @@ }) }) + cmp.setup.cmdline({ '/', '?' }, { mapping = cmp.mapping.preset.cmdline(), sources = { @@ -125,6 +127,8 @@ vim.keymap.set("n", "9m", function() require("99.extensions.telescope").select_model() end) + + require "lsp_signature".setup(cfg) ''; programs.neovim.extraConfig = '' @@ -174,6 +178,7 @@ Plug 'hrsh7th/cmp-path' Plug 'hrsh7th/cmp-cmdline' Plug 'hrsh7th/nvim-cmp' + Plug 'ray-x/lsp_signature.nvim' Plug 'hrsh7th/cmp-vsnip' Plug 'hrsh7th/vim-vsnip' @@ -182,6 +187,7 @@ colorscheme catppuccin-mocha set signcolumn=auto + set exrc nnoremap ff Telescope find_files nnoremap fg Telescope live_grep diff --git a/homeConfigs/global/vim.nix b/homeConfigs/global/vim.nix index 74bfa92..edf281c 100644 --- a/homeConfigs/global/vim.nix +++ b/homeConfigs/global/vim.nix @@ -9,7 +9,7 @@ opencode (pkgs.python3.withPackages (ps: with ps; [ python-lsp-server - pylsp-mypy +# pylsp-mypy #tests broken python-lsp-ruff pycodestyle ])) diff --git a/osConfigs/global/user.nix b/osConfigs/global/user.nix index d79ce8c..568afcb 100644 --- a/osConfigs/global/user.nix +++ b/osConfigs/global/user.nix @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2025/09/05 23:42:18 by tomoron #+# #+# # -# Updated: 2026/06/22 15:42:08 by tomoron ### ########.fr # +# Updated: 2026/07/07 17:49:04 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -18,6 +18,8 @@ "libvirtd" # can use libvirtd "dialout" # can use serial devices "wireshark" # can use wireshask + "plugdev" #some esp things ]; }; + users.groups.plugdev = {}; }