feat: nixvim

flake.nix

@@ -6,21 +6,29 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
 
     # Nixpkgs unstable
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/91fb48da7554115400cc6b7a1bfa603e5cfefdb7";
+    # vue-language-server: 2.1.2 -> 2.1.6
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/26ddb99cfd3f8e1092057f90e42db325dad4e5a5";
 
     # Home manager
     home-manager.url = "github:nix-community/home-manager/release-24.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     # NixOS WSL
     nixos-wsl.url = "github:nix-community/nixos-wsl/2405.5.4";
+
+    # nixvim
+    nixvim = {
+      url = "github:nix-community/nixvim/nixos-24.05";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =
     {
       self,
       nixpkgs,
       home-manager,
+      nixvim,
       ...
     }@inputs:
     let

home-manager/common/default.nix

@@ -1,5 +1,7 @@
 { pkgs, ... }:
 {
+  imports = [ ./nixvim ];
+
   home.packages = with pkgs; [
     fd
     fnm
@@ -73,40 +75,6 @@
   programs.gpg.enable = true;
   programs.lazygit.enable = true;
   programs.lsd.enable = true;
-  programs.neovim = {
-    enable = true;
-    defaultEditor = true;
-    extraPackages = with pkgs; [
-      dockerfile-language-server-nodejs
-      emmet-language-server
-      fish
-      gopls
-      hadolint
-      lua-language-server
-      markdownlint-cli
-      marksman
-      nil
-      nixpkgs-fmt
-      nodePackages.prettier
-      nodePackages.volar
-      pyright
-      rust-analyzer
-      shfmt
-      stylua
-      taplo
-      tree-sitter
-      unzip
-      vscode-langservers-extracted
-      wget
-    ];
-    package = pkgs.unstable.neovim-unwrapped;
-    plugins = with pkgs.vimPlugins; [ lazy-nvim ];
-    withNodeJs = true;
-    withPython3 = true;
-    viAlias = true;
-    vimAlias = true;
-    vimdiffAlias = true;
-  };
   programs.password-store = {
     enable = true;
     settings = {
@@ -168,10 +136,6 @@
   programs.zellij.enable = true;
   programs.zoxide.enable = true;
 
-  xdg.configFile."nvim" = {
-    recursive = true;
-    source = ./neovim;
-  };
   xdg.configFile."zellij/config.kdl" = {
     source = ./zellij/config.kdl;
   };