From 6e8d8b43c29cbcea8113fc35da8b271edbbcc06c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Fri, 10 May 2024 11:05:48 +0200
Subject: [PATCH] Replace rnix with nixd

---
 flake.nix         | 4 ----
 hm/dev/common.nix | 5 ++++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index 79f7ef4..15f8bc4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -55,10 +55,6 @@
       nixpkgsConfig = {
         config = {
           allowUnfree = true;
-          # TODO 24.05 rnix-lsp relies on this, but has been removed now
-          permittedInsecurePackages = [
-            "nix-2.15.3"
-          ];
         };
         overlays = [
           (final: prev: { unstable = unixpkgs.legacyPackages.${prev.system}.pkgs; })
diff --git a/hm/dev/common.nix b/hm/dev/common.nix
index 57c1af4..e1c2063 100644
--- a/hm/dev/common.nix
+++ b/hm/dev/common.nix
@@ -61,7 +61,10 @@
       lua-ls.enable = true; # Lua (for Neovim debugging)
       perlpls.enable = config.frogeye.dev.perl; # Perl
       phpactor.enable = config.frogeye.dev.php; # PHP
-      rnix-lsp.enable = true; # Nix
+      nixd = {
+        enable = true;
+        settings.formatting.command = "nixpkgs-fmt";
+      };
       # TODO Something for SQL. sqls is deprecated, sqlls is not in Nixpkgs. Probably needs a DB connection configured anyways?
       yamlls.enable = true; # YAML
       # TODO Check out none-ls