diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..3550a30
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/.gitignore b/.gitignore
index 3324dc9..cbef9cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,6 @@
 obj/
 cub3D
 .direnv
-.envrc
-flake.nix
 compile_commands.json
 .cache
 libft/**/*.o
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..3614c3e
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,61 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1729181673,
+        "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..387d863
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,36 @@
+{
+	description = "A Nix-flake-based C/C++ development environment";
+	inputs = {
+		nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+		flake-utils.url = "github:numtide/flake-utils";
+	};
+
+	outputs = { nixpkgs, flake-utils, ... }: flake-utils.lib.eachDefaultSystem (system:
+		let 
+			pkgs = nixpkgs.legacyPackages.${system};
+		in
+		{
+			devShells = ({
+			    default = pkgs.mkShell.override
+				{
+					# For stdenv
+				}
+				{
+					buildInputs = with pkgs; [
+						SDL2
+						vulkan-loader
+					];
+
+					LD_LIBRARY_PATH="${pkgs.vulkan-loader}/lib";
+
+					packages = with pkgs; [
+						clang_12
+						gcc11
+						gdb
+						norminette
+						valgrind
+					];
+				};
+			});
+    });
+}