From 760a016842c7dabe9076be5c4c6fc9018c95607a Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Thu, 25 Apr 2024 13:25:15 -0400
Subject: [PATCH] replace nil ls with nixd language server

remove nixlang dedicated module
---
 flake.nix                              | 10 ----------
 hosts/hydra/default.nix                |  1 -
 hosts/lookingglass/default.nix         |  1 -
 hosts/tempest/default.nix              |  1 -
 modules/common/neovim/config/lsp.nix   |  4 ++--
 modules/common/programming/default.nix |  1 -
 modules/common/programming/nix.nix     | 21 ---------------------
 7 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 modules/common/programming/nix.nix

diff --git a/flake.nix b/flake.nix
index bb2cbad..6784efa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -300,16 +300,6 @@
 
       packages =
         let
-          arrow =
-            system:
-            import ./hosts/arrow {
-              inherit
-                inputs
-                globals
-                overlays
-                system
-                ;
-            };
           staff =
             system:
             import ./hosts/staff {
diff --git a/hosts/hydra/default.nix b/hosts/hydra/default.nix
index fdfe979..161b1a9 100644
--- a/hosts/hydra/default.nix
+++ b/hosts/hydra/default.nix
@@ -45,7 +45,6 @@ inputs.nixpkgs.lib.nixosSystem {
       mail.aerc.enable = true;
       mail.himalaya.enable = true;
       dotfiles.enable = true;
-      nixlang.enable = true;
       lua.enable = true;
     }
   ];
diff --git a/hosts/lookingglass/default.nix b/hosts/lookingglass/default.nix
index 92f7a63..5bfe5ff 100644
--- a/hosts/lookingglass/default.nix
+++ b/hosts/lookingglass/default.nix
@@ -43,7 +43,6 @@ inputs.darwin.lib.darwinSystem {
       discord.enable = true;
       firefox.enable = true;
       dotfiles.enable = true;
-      nixlang.enable = true;
       terraform.enable = true;
       python.enable = true;
       rust.enable = true;
diff --git a/hosts/tempest/default.nix b/hosts/tempest/default.nix
index 360329d..76fdd89 100644
--- a/hosts/tempest/default.nix
+++ b/hosts/tempest/default.nix
@@ -110,7 +110,6 @@ inputs.nixpkgs.lib.nixosSystem {
       mail.himalaya.enable = true;
       keybase.enable = true;
       mullvad.enable = false;
-      nixlang.enable = true;
       rust.enable = true;
       terraform.enable = true;
       yt-dlp.enable = true;
diff --git a/modules/common/neovim/config/lsp.nix b/modules/common/neovim/config/lsp.nix
index 8f580dd..167ed09 100644
--- a/modules/common/neovim/config/lsp.nix
+++ b/modules/common/neovim/config/lsp.nix
@@ -37,8 +37,8 @@
       cmd = [ "${pkgs.lua-language-server}/bin/lua-language-server" ];
     };
 
-    use.lspconfig.nil_ls.setup = dsl.callWith {
-      cmd = [ "${pkgs.nil}/bin/nil" ];
+    use.lspconfig.nixd.setup = dsl.callWith {
+      cmd = [ "${pkgs.nixd}/bin/nixd" ];
       capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
     };
 
diff --git a/modules/common/programming/default.nix b/modules/common/programming/default.nix
index f79f364..ee96303 100644
--- a/modules/common/programming/default.nix
+++ b/modules/common/programming/default.nix
@@ -5,7 +5,6 @@
     ./haskell.nix
     ./kubernetes.nix
     ./lua.nix
-    ./nix.nix
     ./python.nix
     ./rust.nix
     ./terraform.nix
diff --git a/modules/common/programming/nix.nix b/modules/common/programming/nix.nix
deleted file mode 100644
index 3aee56f..0000000
--- a/modules/common/programming/nix.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  options.nixlang.enable = lib.mkEnableOption "Nix programming language.";
-
-  config = lib.mkIf config.nixlang.enable {
-
-    home-manager.users.${config.user} = {
-
-      home.packages = with pkgs; [
-        nixfmt-rfc-style # Nix file formatter
-        nil # Nix language server
-      ];
-    };
-  };
-}