From 6abad2d5a642b0c2ab0bbd0043b2b1678867c076 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Tue, 27 Dec 2022 10:06:18 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20add=20devenv?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore |  3 ++-
 flake.nix  | 26 ++++++++++++++++++--------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 317d586..1e78073 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /.direnv
-/result
\ No newline at end of file
+/result
+/.pre-commit-config.yaml
diff --git a/flake.nix b/flake.nix
index baa9f1b..82ad7c2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -87,16 +87,26 @@
       (system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
-        darwin-local = pkgs.writeScriptBin "darwin-local" ''
-          #!${pkgs.stdenv.shell}
-          nix build .#darwinConfigurations.$(hostname -s).system
-          ./result/sw/bin/darwin-rebuild switch --flake .
-        '';
       in
       {
-        devShells.default = pkgs.mkShell {
-          name = "athens";
-          buildInputs = [ darwin-local deploy-rs.packages.${system}.deploy-rs pkgs.nixpkgs-fmt pkgs.rnix-lsp pkgs.sops ];
+        devShells.default = devenv.lib.mkShell {
+          inherit inputs pkgs;
+          modules = [
+            {
+              packages = [ deploy-rs.packages.${system}.deploy-rs pkgs.sops ];
+
+              scripts.darwin-local.exec = ''
+                nix build .#darwinConfigurations.$(hostname -s).system
+                ./result/sw/bin/darwin-rebuild switch --flake .
+              '';
+
+              languages.nix.enable = true;
+
+              pre-commit.hooks = {
+                nixpkgs-fmt.enable = true;
+              };
+            }
+          ];
         };
 
         formatter = pkgs.nixpkgs-fmt;