fix: nvim

jz8132543 · Sep 29, 2024 · d5b5b56 · d5b5b56
1 parent a5286a4
commit d5b5b56
Show file tree

Hide file tree

Showing 3 changed files with 87 additions and 73 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/home-manager/modules/tippy/gpg.nix b/home-manager/modules/tippy/gpg.nix
@@ -1,13 +1,12 @@
 {
   pkgs,
-  lib,
   ...
 }:
 {
   services.gpg-agent = {
     enable = true;
-    # pinentryPackage = pkgs.pinentry-curses;
-    pinentryPackage = lib.mkForce pkgs.pinentry-qt;
+    pinentryPackage = pkgs.pinentry-curses;
+    # pinentryPackage = lib.mkForce pkgs.pinentry-qt;
   };
   programs.gpg = {
     enable = true;

diff --git a/home-manager/modules/tippy/nvim.nix b/home-manager/modules/tippy/nvim.nix
@@ -7,6 +7,9 @@
   programs.neovim = {
     enable = true;
     # package = pkgs.neovim-nightly;
+    package = pkgs.neovim.override {
+      lua = pkgs.luajit;
+    };
     viAlias = false;
     vimAlias = true;
     vimdiffAlias = true;
@@ -15,14 +18,24 @@
     withPython3 = false;
     defaultEditor = true;
     coc.enable = false;
-    extraLuaPackages =
-      p: with p; [
-        luarocks
-        magick
-      ];
+    plugins = [ pkgs.vimPlugins.nvim-treesitter.withAllGrammars ];
     extraPackages = with pkgs; [
-      clang
-      imagemagick
+      luajitPackages.luarocks
+      gcc
+      # lsps
+      nil
+      nixd
+      lua-language-server
+      terraform-ls
+      nodePackages.vscode-langservers-extracted # css,eslint,html,json,markdown
+      nodePackages.typescript
+      nodePackages.typescript-language-server
+      nodePackages.bash-language-server
+      nodePackages.dockerfile-language-server-nodejs
+      # formatters
+      eslint_d
+      prettierd
+      nodePackages.prettier
     ];
   };
 
@@ -61,5 +74,7 @@
   home.packages = with pkgs; [
     unzip
     gnumake
+    # luarocks-nix
+    # luajit
   ];
 }