Merge pull request #164 from input-output-hk/nixos-cleanup

garbas · web-flow · commit 5a00f510f4ed · 2022-09-21T13:36:43.000+02:00
Direnv + some flake cleanup
diff --git a/.envrc b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,6 @@ qr-code.svg
 
 /target
 /venv
-.pre-commit-config.yaml
+/.direnv
+/.pre-commit-config.yaml
+/result*
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1 @@
+/nix/store/540bkwrxhyfgmxm55bhhsf6mdvs4ymzn-pre-commit-config.json
diff --git a/default.nix b/default.nix
@@ -0,0 +1,14 @@
+(
+  import
+  (
+    let
+      lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+    in
+      fetchTarball {
+        url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+        sha256 = lock.nodes.flake-compat.locked.narHash;
+      }
+  )
+  {src = ./.;}
+)
+.defaultNix
diff --git a/flake.nix b/flake.nix
@@ -53,7 +53,6 @@
             extensions = [
               "rust-src"
               "rust-analysis"
-              "rls-preview"
               "rustfmt-preview"
               "clippy-preview"
             ];
diff --git a/shell.nix b/shell.nix
@@ -0,0 +1,14 @@
+(
+  import
+  (
+    let
+      lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+    in
+      fetchTarball {
+        url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+        sha256 = lock.nodes.flake-compat.locked.narHash;
+      }
+  )
+  {src = ./.;}
+)
+.shellNix

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+/nix/store/540bkwrxhyfgmxm55bhhsf6mdvs4ymzn-pre-commit-config.json`