add .direnv folder to .gitignore

cursorless-dev · Jun 14, 2024 · e7dc36e · e7dc36e
1 parent 6eb6ed2
commit e7dc36e
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 37 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,3 +42,6 @@ next-env.d.ts
 
 # test subset config
 packages/test-harness/testSubsetGrep.properties
+
+# nix
+.direnv/
diff --git a/flake.nix b/flake.nix
@@ -3,46 +3,41 @@
 
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
-  outputs = { self, nixpkgs }:
+  outputs =
+    { self, nixpkgs }:
     let
-      overlays = [
-        (final: prev: rec {
-          nodejs = prev.nodejs-18_x;
-          pnpm = prev.nodePackages.pnpm;
-        })
+      supportedSystems = [
+        "x86_64-linux"
+        "aarch64-linux"
+        "x86_64-darwin"
+        "aarch64-darwin"
       ];
-      supportedSystems =
-        [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
-      forEachSupportedSystem = f:
-        nixpkgs.lib.genAttrs supportedSystems (system:
-          f {
-            pkgs = import nixpkgs {
-              inherit overlays system;
-            };
-          });
-      pythonVersion = builtins.replaceStrings
-        [ "py" ]
-        [ "python" ]
-        (nixpkgs.lib.importTOML ./pyproject.toml).tool.ruff.target-version;
+      forEachSupportedSystem =
+        f: nixpkgs.lib.genAttrs supportedSystems (system: f { pkgs = import nixpkgs { inherit system; }; });
+      pythonVersion = builtins.replaceStrings [ "py" ] [
+        "python"
+      ] (nixpkgs.lib.importTOML ./pyproject.toml).tool.ruff.target-version;
     in
     {
-      devShells = forEachSupportedSystem ({ pkgs }: {
-        default = pkgs.mkShell {
-          packages = with pkgs; [
-            nodejs
-            pnpm
-            pkgs.${pythonVersion}
-            vsce
-            pre-commit
-          ];
-          # To prevent weird broken non-interactive bash terminal
-          buildInputs = [ pkgs.bashInteractive ];
-          shellHook = ''
-            if [ ! -f .git/hooks/pre-commit ]; then
-              pre-commit install
-            fi
-          '';
-        };
-      });
+      devShells = forEachSupportedSystem (
+        { pkgs }:
+        {
+          default = pkgs.mkShell {
+            packages = with pkgs; [
+              corepack
+              pkgs.${pythonVersion}
+              vsce
+              pre-commit
+            ];
+            # To prevent weird broken non-interactive bash terminal
+            buildInputs = [ pkgs.bashInteractive ];
+            shellHook = ''
+              if [ ! -f .git/hooks/pre-commit ]; then
+                pre-commit install
+              fi
+            '';
+          };
+        }
+      );
     };
 }