diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index b94d3dc..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,4 +0,0 @@
-[submodule "nixos.doot"]
-	path = nixos.doot
-	url = https://github.com/voidarclabs/nixos.doot
-	branch = main
diff --git a/common.nix b/common.nix
index 13a1fbe..8e99d29 100644
--- a/common.nix
+++ b/common.nix
@@ -142,6 +142,7 @@
 				git
 				fastfetch
 				lsd
+				inputs.doot.packages.${pkgs.system}.default
 				stow
 				fzf
 				ripgrep
diff --git a/flake.lock b/flake.lock
index a6fcc37..d3e5780 100644
--- a/flake.lock
+++ b/flake.lock
@@ -15,10 +15,46 @@
       },
       "parent": []
     },
+    "doot": {
+      "inputs": {
+        "doot-src": "doot-src",
+        "nixpkgs": "nixpkgs_2",
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1767536004,
+        "narHash": "sha256-jvKYKYVUF+jQoWR5umYSaAk9IGFkV3j1n+tiOgupZjw=",
+        "owner": "voidarclabs",
+        "repo": "nixos.doot",
+        "rev": "78898e11478aad96df7d462d8d5deed99974be80",
+        "type": "github"
+      },
+      "original": {
+        "owner": "voidarclabs",
+        "repo": "nixos.doot",
+        "type": "github"
+      }
+    },
+    "doot-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1760873580,
+        "narHash": "sha256-h7JNd6748vUpDw7wriMyN9jLV9m/BE2yan2VCQzar1Q=",
+        "owner": "pol-rivero",
+        "repo": "doot",
+        "rev": "05b1036d3457bbf49169ac161e7b62c8eb031684",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pol-rivero",
+        "repo": "doot",
+        "type": "github"
+      }
+    },
     "elephant": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2",
-        "systems": "systems"
+        "nixpkgs": "nixpkgs_3",
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1762272039,
@@ -51,6 +87,22 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1767379071,
+        "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1760284886,
         "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=",
@@ -66,7 +118,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1761907660,
         "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
@@ -82,7 +134,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1757068644,
         "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=",
@@ -98,7 +150,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1761597516,
         "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
@@ -134,8 +186,9 @@
     "root": {
       "inputs": {
         "chataigne": "chataigne",
+        "doot": "doot",
         "elephant": "elephant",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "walker": "walker",
         "way-edges": "way-edges"
       }
@@ -163,16 +216,16 @@
     },
     "systems": {
       "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
         "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
         "type": "github"
       }
     },
@@ -191,13 +244,46 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "walker": {
       "inputs": {
         "elephant": [
           "elephant"
         ],
-        "nixpkgs": "nixpkgs_4",
-        "systems": "systems_2"
+        "nixpkgs": "nixpkgs_5",
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1762268213,
@@ -215,7 +301,7 @@
     },
     "way-edges": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_6",
         "rust-overlay": "rust-overlay"
       },
       "locked": {
diff --git a/flake.nix b/flake.nix
index 7edecd0..1aa4a92 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,6 +5,7 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     elephant.url = "github:abenz1267/elephant";
     chataigne.url = "./chataigne";
+    doot.url = "github:voidarclabs/nixos.doot";
 		way-edges.url = "github:way-edges/way-edges";
 
     walker = {
@@ -13,7 +14,7 @@
     };
   };
 
-  outputs = { self, chataigne, nixpkgs, ... }@inputs: let
+  outputs = { self, doot, chataigne, nixpkgs, ... }@inputs: let
     stdenv.hostPlatform.system = "x86_64-linux";
     system = stdenv.hostPlatform.system;
     hardwareConfig = import /etc/nixos/hardware-configuration.nix;
diff --git a/nixos.doot b/nixos.doot
deleted file mode 160000
index c4b7573..0000000
--- a/nixos.doot
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c4b75733aea97d9c34cb8ba5978ef2df4660be41