.nixd.json

@@ -1,9 +0,0 @@
-{
-    "options": {
-        "enable": true,
-        "target": {
-            "args": [],
-            "installable": ".#nixosConfigurations.nixos-desktop.options"
-        }
-    }
-}

flake.lock

@@ -644,6 +644,30 @@
         "type": "github"
       }
     },
+    "nil": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1695485017,
+        "narHash": "sha256-aQyRBJnT4tftexM/Y3etfOk8tfMFZzt+vSVtL2J0KLY=",
+        "owner": "oxalica",
+        "repo": "nil",
+        "rev": "510bc6e9b41d39c81b9c815065cb5b7e23a2428c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "nil",
+        "type": "github"
+      }
+    },
     "nix-lazy-nvim": {
       "locked": {
         "lastModified": 1694868321,
@@ -910,22 +934,6 @@
         "type": "github"
       }
     },
-    "nvim-lspconfig": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1695699913,
-        "narHash": "sha256-9uH3ZpZ7zk/84agbagNxUZL49h+P5j7gew+2h04psvg=",
-        "owner": "neovim",
-        "repo": "nvim-lspconfig",
-        "rev": "bfdf2e91e7297a54bcc09d3e092a12bff69a1cf4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "neovim",
-        "repo": "nvim-lspconfig",
-        "type": "github"
-      }
-    },
     "nvim-puppeteer": {
       "flake": false,
       "locked": {
@@ -1016,10 +1024,10 @@
         "impermanence": "impermanence",
         "master": "master",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
+        "nil": "nil",
         "nix-lazy-nvim": "nix-lazy-nvim",
         "nix-super": "nix-super",
         "nixpkgs": "nixpkgs_8",
-        "nvim-lspconfig": "nvim-lspconfig",
         "nvim-puppeteer": "nvim-puppeteer",
         "nvim-treesitter": "nvim-treesitter",
         "pre-commit-hooks": "pre-commit-hooks",
@@ -1031,6 +1039,31 @@
         "timers": "timers"
       }
     },
+    "rust-overlay": {
+      "inputs": {
+        "flake-utils": [
+          "nil",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nil",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1688783586,
+        "narHash": "sha256-HHaM2hk2azslv1kH8zmQxXo2e7i5cKgzNIuK4yftzB0=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "7a29283cc242c2486fc67f60b431ef708046d176",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "smartcolumn-nvim": {
       "flake": false,
       "locked": {

flake.nix

@@ -17,6 +17,12 @@
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     home-manager.url = "github:nix-community/home-manager";
 
+    nil = {
+      inputs.flake-utils.follows = "flake-utils";
+      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:oxalica/nil";
+    };
+
     pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
 
     nix-super.url = "github:privatevoid-net/nix-super";
@@ -54,9 +60,6 @@
     nvim-puppeteer.flake = false;
     nvim-puppeteer.url = "github:chrisgrieser/nvim-puppeteer";
 
-    nvim-lspconfig.flake = false;
-    nvim-lspconfig.url = "github:neovim/nvim-lspconfig";
-
     # Hyprland
     hypr-contrib.url = "github:hyprwm/contrib";
     hyprland.url = "github:hyprwm/Hyprland";

modules/programs/nvim/default.nix

@@ -33,7 +33,7 @@ in
             deadnix
             isort
             jq
-            nixd
+            nil
             nixpkgs-fmt
             nodePackages.bash-language-server
             rustfmt

modules/programs/nvim/plugins/lua/nvim-lspconfig.lua

@@ -134,7 +134,7 @@ end
 
 local servers = {
   "bashls",
-  "nixd",
+  "nil_ls",
   "pylsp",
   "ruff_lsp",
   "typst_lsp",

overlays/packages.nix

@@ -4,6 +4,7 @@ final: prev:
 {
   agenix = inputs.agenix.packages.${prev.system}.default;
   hyprpaper = inputs.hyprpaper.packages.${prev.system}.default;
+  nil = inputs.nil.packages.${prev.system}.default;
   nix-super = inputs.nix-super.packages.${prev.system}.default;
   rofi-wayland = prev.rofi-wayland.overrideAttrs (_: {
     src = inputs.rofi-wayland;

overlays/vimPlugins.nix

@@ -38,12 +38,6 @@ with lib.my;
       src = inputs.nvim-treesitter;
     });
 
-    # HACK: to fix error in nixpkgs version of nvim-lspconfig
-    nvim-lspconfig = prev.vimPlugins.nvim-lspconfig.overrideAttrs (_: {
-      version = mkVersionInput inputs.nvim-lspconfig;
-      src = inputs.nvim-lspconfig;
-    });
-
     nvim-puppeteer = prev.vimUtils.buildVimPluginFrom2Nix {
       pname = "nvim-puppeteer";
       version = mkVersionInput inputs.nvim-puppeteer;