From 5ca4303d3211a530022da186e59bf1488ad01dc8 Mon Sep 17 00:00:00 2001 From: fqbn207 Date: Wed, 22 Jan 2025 14:30:41 +0100 Subject: [PATCH] kekl --- configuration.nix | 1 + modules/system/nix/nvim/cmp.nix | 11 +++++------ modules/system/nix/nvim/default.nix | 1 + modules/system/nix/nvim/extraPlugins.nix | 11 +++++++++++ modules/system/nix/nvim/lsp.nix | 6 +++++- modules/system/nix/nvim/snip.nix | 17 +++++++++-------- 6 files changed, 32 insertions(+), 15 deletions(-) create mode 100644 modules/system/nix/nvim/extraPlugins.nix diff --git a/configuration.nix b/configuration.nix index 0169a65..6f16619 100644 --- a/configuration.nix +++ b/configuration.nix @@ -173,6 +173,7 @@ htop btop kew + jq # dev rustup diff --git a/modules/system/nix/nvim/cmp.nix b/modules/system/nix/nvim/cmp.nix index e370273..64e5b6b 100644 --- a/modules/system/nix/nvim/cmp.nix +++ b/modules/system/nix/nvim/cmp.nix @@ -18,12 +18,11 @@ completeopt = "menu,menuone,noinsert,noselect"; }; }; - sourcePlugins = [ - "crates-nvim" - "cmp-path" - "cmp-nvim-lsp" - "rustaceanvim" - ]; + #sourcePlugins = [ + # "crates-nvim" + # "cmp-nvim-lsp" + # "rustaceanvim" + #]; }; }; }; diff --git a/modules/system/nix/nvim/default.nix b/modules/system/nix/nvim/default.nix index 4c68433..39ce7bd 100644 --- a/modules/system/nix/nvim/default.nix +++ b/modules/system/nix/nvim/default.nix @@ -10,6 +10,7 @@ ./cmp.nix ./lualine.nix ./snip.nix + ./extraPlugins.nix ]; programs.nvf = { enable = true; diff --git a/modules/system/nix/nvim/extraPlugins.nix b/modules/system/nix/nvim/extraPlugins.nix new file mode 100644 index 0000000..845d9b4 --- /dev/null +++ b/modules/system/nix/nvim/extraPlugins.nix @@ -0,0 +1,11 @@ +{ pkgs, lib, ... }: +{ + programs.nvf.settings.vim = { + extraPlugins = with pkgs; { + neocord = { + package = vimPlugins.neocord; + setup = "require('neocord').setup {}"; + }; + }; + }; +} diff --git a/modules/system/nix/nvim/lsp.nix b/modules/system/nix/nvim/lsp.nix index 545b7e9..a8c2dbd 100644 --- a/modules/system/nix/nvim/lsp.nix +++ b/modules/system/nix/nvim/lsp.nix @@ -13,12 +13,16 @@ }; python = { enable = true; + lsp.enable = true; + treesitter.enable = true; }; go = { enable = true; + lsp.enable = true; + treesitter.enable = true; }; lua = { - enable = true; + enable = true; }; rust = { enable = true; diff --git a/modules/system/nix/nvim/snip.nix b/modules/system/nix/nvim/snip.nix index 7bfa110..b39c07b 100644 --- a/modules/system/nix/nvim/snip.nix +++ b/modules/system/nix/nvim/snip.nix @@ -4,15 +4,16 @@ snippets = { luasnip = { enable = true; - providers = [ - "friendly-snippets" - "crates-nvim" - "lspkind" - "lspsaga" - "rustaceanvim" - ]; + loaders = "require('luasnip.loaders.from_snipmate').lazy_load()"; + #providers = [ + # "friendly-snippets" + # "crates-nvim" + # "lspkind" + # "lspsaga" + # "rustaceanvim" + #]; setupOpts = { - enable_autosnippets = true; + enable_autosnippets = false; }; }; };