From 9dd174a2244f7946bcd50f9a6c212f79b05997c8 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Fri, 2 Aug 2024 13:27:23 -0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20switch=20from=20nil=20to=20nixd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flake.lock              | 36 ++++++++++++++++++------------------
 modules/dev/default.nix |  3 ++-
 nix/shells.nix          |  3 ++-
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/flake.lock b/flake.lock
index a10d97b..cd99b70 100644
--- a/flake.lock
+++ b/flake.lock
@@ -186,11 +186,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722082646,
-        "narHash": "sha256-od8dBWVP/ngg0cuoyEl/w9D+TCNDj6Kh4tr151Aax7w=",
+        "lastModified": 1722609272,
+        "narHash": "sha256-Kkb+ULEHVmk07AX+OhwyofFxBDpw+2WvsXguUS2m6e4=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "0413754b3cdb879ba14f6e96915e5fdf06c6aab6",
+        "rev": "f7142b8024d6b70c66fd646e1d099d3aa5bfec49",
         "type": "github"
       },
       "original": {
@@ -238,11 +238,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722268129,
-        "narHash": "sha256-oFlSukmkEe1OW+1sB60VYKUP1XAZahkXAnJHmItrikg=",
+        "lastModified": 1722618951,
+        "narHash": "sha256-ssE4hAbB+CZpbaRkVcDa9Ki9I3zaiODebGEzPXoYJPQ=",
         "owner": "walkah",
         "repo": "dotfiles",
-        "rev": "c328c8962c081d2ad92ef5db701b2692b00172aa",
+        "rev": "2de443f050f068a9aa31d178cfa4ead845a171ed",
         "type": "github"
       },
       "original": {
@@ -971,11 +971,11 @@
         "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1722203588,
-        "narHash": "sha256-91V5FMSQ4z9bkhTCf0f86Zjw0bh367daSf0mzCIW0vU=",
+        "lastModified": 1722462338,
+        "narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "792757f643cedc13f02098d8ed506d82e19ec1da",
+        "rev": "6e090576c4824b16e8759ebca3958c5b09659ee8",
         "type": "github"
       },
       "original": {
@@ -1385,11 +1385,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1722114937,
-        "narHash": "sha256-MOZ9woPwdpFJcHx3wic2Mlw9aztdKjMnFT3FaeLzJkM=",
+        "lastModified": 1722332872,
+        "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "e67b60fb1b2c3aad2202d95b91d4c218cf2a4fdd",
+        "rev": "14c333162ba53c02853add87a0000cbd7aa230c2",
         "type": "github"
       },
       "original": {
@@ -1748,11 +1748,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1722062969,
-        "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=",
+        "lastModified": 1722185531,
+        "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3",
+        "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
         "type": "github"
       },
       "original": {
@@ -1764,11 +1764,11 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1722141560,
-        "narHash": "sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y=",
+        "lastModified": 1722415718,
+        "narHash": "sha256-5US0/pgxbMksF92k1+eOa8arJTJiPvsdZj9Dl+vJkM4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "038fb464fcfa79b4f08131b07f2d8c9a6bcc4160",
+        "rev": "c3392ad349a5227f4a3464dce87bcc5046692fce",
         "type": "github"
       },
       "original": {
diff --git a/modules/dev/default.nix b/modules/dev/default.nix
index 7bd6362..c6fe2cf 100644
--- a/modules/dev/default.nix
+++ b/modules/dev/default.nix
@@ -26,7 +26,8 @@
 
     # Nix
     cachix
-    nil
+    nixd
+    nixf
     nixpkgs-fmt
 
     # My stuff
diff --git a/nix/shells.nix b/nix/shells.nix
index 4a1b6ac..c00aef6 100644
--- a/nix/shells.nix
+++ b/nix/shells.nix
@@ -5,7 +5,8 @@
       deploy-rs
       deadnix
       doctl
-      nil
+      nixd
+      nixf
       nixpkgs-fmt
       opentofu
       statix