From fadee02e6005db4c0fe58afeb3e24242bbde8e00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Wed, 27 Sep 2023 13:11:07 +0200
Subject: [PATCH] feat(nvim): use nixd instead of nil

---
 .nixd.json                                    |  9 +++
 flake.lock                                    | 67 +++++--------------
 flake.nix                                     |  6 --
 modules/programs/nvim/default.nix             |  2 +-
 .../nvim/plugins/lua/nvim-lspconfig.lua       |  2 +-
 overlays/packages.nix                         |  1 -
 6 files changed, 28 insertions(+), 59 deletions(-)
 create mode 100644 .nixd.json

diff --git a/.nixd.json b/.nixd.json
new file mode 100644
index 0000000..31ab0e5
--- /dev/null
+++ b/.nixd.json
@@ -0,0 +1,9 @@
+{
+    "options": {
+        "enable": true,
+        "target": {
+            "args": [],
+            "installable": ".#nixosConfigurations.nixos-desktop.options"
+        }
+    }
+}
diff --git a/flake.lock b/flake.lock
index 159b808..4d8dc1b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -644,30 +644,6 @@
         "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,
@@ -934,6 +910,22 @@
         "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": {
@@ -1024,10 +1016,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",
@@ -1039,31 +1031,6 @@
         "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": {
diff --git a/flake.nix b/flake.nix
index 4fab135..34a44a8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,12 +17,6 @@
     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";
diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix
index bd14433..96e7683 100644
--- a/modules/programs/nvim/default.nix
+++ b/modules/programs/nvim/default.nix
@@ -33,7 +33,7 @@ in
             deadnix
             isort
             jq
-            nil
+            nixd
             nixpkgs-fmt
             nodePackages.bash-language-server
             rustfmt
diff --git a/modules/programs/nvim/plugins/lua/nvim-lspconfig.lua b/modules/programs/nvim/plugins/lua/nvim-lspconfig.lua
index 7aa6dd7..20a17ed 100644
--- a/modules/programs/nvim/plugins/lua/nvim-lspconfig.lua
+++ b/modules/programs/nvim/plugins/lua/nvim-lspconfig.lua
@@ -134,7 +134,7 @@ end
 
 local servers = {
   "bashls",
-  "nil_ls",
+  "nixd",
   "pylsp",
   "ruff_lsp",
   "typst_lsp",
diff --git a/overlays/packages.nix b/overlays/packages.nix
index 973523e..be4efad 100644
--- a/overlays/packages.nix
+++ b/overlays/packages.nix
@@ -4,7 +4,6 @@ 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;