diff --git a/README.md b/README.md
new file mode 100644
index 0000000..8cfdc7e
--- /dev/null
+++ b/README.md
@@ -0,0 +1,7 @@
+## Targets
+
+| Name    | Arch    | Description |
+| ------- | ------- | ----------- |
+| Marr    | x86_64  |             |
+| Brontes | x86_64  |             |
+| Styrax  | Aarch64 |             |
diff --git a/flake.lock b/flake.lock
index e5ce6af..eb0c755 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,25 @@
 {
   "nodes": {
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1719994518,
+        "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -7,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719180626,
-        "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=",
+        "lastModified": 1720470846,
+        "narHash": "sha256-7ftA4Bv5KfH4QdTRxqe8/Hz2YTKo+7IQ9n7vbNWgv28=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb",
+        "rev": "2fb5c1e0a17bc6059fa09dc411a43d75f35bb192",
         "type": "github"
       },
       "original": {
@@ -22,11 +42,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1719322773,
-        "narHash": "sha256-BqPxtFwXrpJQDh65NOIHX99pz2rtIMshG9Mt2xnnc5c=",
+        "lastModified": 1720515935,
+        "narHash": "sha256-8b+fzR4W2hI5axwB+4nBwoA15awPKkck4ghhCt8v39M=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "caabc425565bbd5c8640630b0bf6974961a49242",
+        "rev": "a111ce6b537df12a39874aa9672caa87f8677eda",
         "type": "github"
       },
       "original": {
@@ -38,11 +58,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1719075281,
-        "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
+        "lastModified": 1720418205,
+        "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
+        "rev": "655a58a72a6601292512670343087c2d75d859c1",
         "type": "github"
       },
       "original": {
@@ -54,6 +74,7 @@
     },
     "root": {
       "inputs": {
+        "flake-parts": "flake-parts",
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs"
diff --git a/flake.nix b/flake.nix
index 56f2d99..609f336 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "Nydragon's configuration'";
+  description = "Nydragon's NixOS configuration";
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
@@ -8,84 +8,78 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    # Powered by
+    flake-parts = {
+      url = "github:hercules-ci/flake-parts";
+      inputs.nixpkgs-lib.follows = "nixpkgs";
+    };
+
   };
 
   outputs =
-    inputs@{ self, nixpkgs, ... }:
-    let
-      inherit (self) outputs;
+    inputs:
+    inputs.flake-parts.lib.mkFlake { inherit inputs; } {
+      systems = [
+        "x86_64-linux"
+        "aarch64-linux"
+      ];
 
-      system = "x86_64-linux";
-      overlays = import ./overlays;
-
-      pkgs = import nixpkgs {
-        inherit system;
-        overlays = [ overlays.calibre ];
-        config = {
-          allowUnfree = true;
-          packageOverrides = pkgs: {
-            custom = {
-              scripts = import ./home/scripts { inherit pkgs; };
-            };
-          };
-        };
-
-      };
-
-      lib = nixpkgs.lib.extend (
-        self: super: {
-          my = import ./lib {
-            inherit pkgs inputs;
-            lib = self;
-          };
-        }
-      );
-
-      mkSystem =
+      perSystem =
         {
-          hostname,
-          extraModules ? [ ],
+          inputs',
+          config,
+          pkgs,
+          ...
         }:
-        lib.nixosSystem {
-          inherit system;
-          modules = [ ./hosts/${hostname}/configuration.nix ] ++ extraModules;
-          specialArgs = {
-            inherit
-              inputs
-              outputs
-              system
-              lib
-              pkgs
-              hostname
-              ;
-
-            username = "nico";
+        {
+          devShells.default = pkgs.mkShell {
+            buildInputs = with pkgs; [
+              pre-commit
+              nixfmt-rfc-style
+              nodePackages.prettier
+              typos
+            ];
+            shellHook = ''
+              ${pkgs.pre-commit}/bin/pre-commit install -f
+            '';
           };
         };
-    in
-    {
-      nixosConfigurations = {
-        marr = mkSystem {
-          hostname = "marr";
-          extraModules = [
-            #inputs.nixos-hardware.nixosModules.dell-xps-15-9510-nvidia
-          ];
+
+      flake = rec {
+        templates = import ./templates;
+        # TODO: move that somewhere else
+        lib = inputs.nixpkgs.lib.extend (
+          self: super: {
+            my = import ./lib {
+              lib = self;
+              inherit inputs;
+            };
+          }
+        );
+
+        # TODO: move that somewhere else
+        nixosConfigurations = {
+          marr = lib.my.mkSystem {
+            hostname = "marr";
+            system = "x86_64-linux";
+            extraModules = [
+              #inputs.nixos-hardware.nixosModules.dell-xps-15-9510-nvidia
+            ];
+          };
+
+          brontes = lib.my.mkSystem {
+            hostname = "brontes";
+            system = "x86_64-linux";
+
+          };
+          #    styrak = lib.my.mkSystem {
+          #hostname = "styrak";
+          #system = "aarch64-linux";
+          #};
         };
-
-        brontes = mkSystem { hostname = "brontes"; };
       };
 
-      devShells."${system}".default = pkgs.mkShell {
-        buildInputs = with pkgs; [
-          pre-commit
-          nixfmt-rfc-style
-          nodePackages.prettier
-          typos
-        ];
-        shellHook = ''
-          ${pkgs.pre-commit}/bin/pre-commit install -f
-        '';
-      };
-      templates = import ./templates;
     };
+
 }
diff --git a/lib/default.nix b/lib/default.nix
index e963d91..e55420a 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ lib, inputs, ... }:
 {
 
   # Verify the existence of a binary inside of a derivation.
@@ -9,4 +9,25 @@
       abs = lib.getExe' pkg bin;
     in
     if builtins.pathExists abs then abs else throw "${abs} does not exist.";
+
+  mkSystem =
+    {
+      hostname,
+      extraModules ? [ ],
+      system,
+    }:
+    lib.nixosSystem {
+      inherit system;
+      modules = [ ../hosts/${hostname}/configuration.nix ] ++ extraModules;
+      specialArgs = {
+        inherit
+          inputs
+          system
+          lib
+          hostname
+          ;
+
+        username = "nico";
+      };
+    };
 }
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index 5588490..1741870 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -1,5 +1,11 @@
 { ... }:
 {
+
+  imports = [
+    ./nixpkgs.nix
+    ./overlays
+  ];
+
   nix = {
     gc = {
       automatic = true;
diff --git a/modules/nix/nixpkgs.nix b/modules/nix/nixpkgs.nix
new file mode 100644
index 0000000..234e367
--- /dev/null
+++ b/modules/nix/nixpkgs.nix
@@ -0,0 +1,10 @@
+{
+  nixpkgs.config = {
+    allowUnfree = true;
+    packageOverrides = pkgs: {
+      custom = {
+        scripts = import ../../home/scripts { inherit pkgs; };
+      };
+    };
+  };
+}
diff --git a/modules/nix/overlays/default.nix b/modules/nix/overlays/default.nix
new file mode 100644
index 0000000..40787d6
--- /dev/null
+++ b/modules/nix/overlays/default.nix
@@ -0,0 +1,16 @@
+{
+
+  nixpkgs.overlays = [
+    # Add env vars to calibre so they may get propagated to a plugin that needs them
+    (final: prev: {
+      calibre = prev.calibre.overrideAttrs (old: {
+        postInstall = ''
+          wrapProgram $out/bin/calibre \
+              --set QT_QPA_PLATFORM xcb \
+              --set-default ACSM_LIBCRYPTO ${prev.openssl.out}/lib/libcrypto.so \
+              --set-default ACSM_LIBSSL ${prev.openssl.out}/lib/libssl.so
+        '';
+      });
+    })
+  ];
+}
diff --git a/overlays/default.nix b/overlays/default.nix
deleted file mode 100644
index 913fefb..0000000
--- a/overlays/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  calibre = final: prev: {
-    calibre = prev.calibre.overrideAttrs (old: {
-      postInstall = ''
-        wrapProgram $out/bin/calibre \
-            --set QT_QPA_PLATFORM xcb \
-            --set-default ACSM_LIBCRYPTO ${prev.openssl.out}/lib/libcrypto.so \
-            --set-default ACSM_LIBSSL ${prev.openssl.out}/lib/libssl.so
-      '';
-    });
-  };
-}