diff --git a/flake.lock b/flake.lock
index a987f47..ad3a676 100644
--- a/flake.lock
+++ b/flake.lock
@@ -100,6 +100,26 @@
         "type": "github"
       }
     },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1688466019,
+        "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -293,6 +313,7 @@
       "inputs": {
         "agenix": "agenix",
         "deploy-rs": "deploy-rs",
+        "flake-parts": "flake-parts",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager_2",
         "nixos-hardware": "nixos-hardware",
diff --git a/flake.nix b/flake.nix
index 88b244b..b493b00 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,211 +1,213 @@
 {
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
 
-  inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 
-  inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
-  inputs.flake-utils.url = "github:numtide/flake-utils";
+    flake-parts = {
+      url = "github:hercules-ci/flake-parts";
+      inputs.nixpkgs-lib.follows = "nixpkgs";
+    };
 
-  inputs.home-manager = {
-    url = "github:nix-community/home-manager/release-23.05";
-    inputs.nixpkgs.follows = "nixpkgs";
+    flake-utils.url = "github:numtide/flake-utils";
+
+    home-manager = {
+      url = "github:nix-community/home-manager/release-23.05";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    nur.url = "github:nix-community/NUR/master";
+
+    agenix = {
+      url = "github:ryantm/agenix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    deploy-rs = {
+      url = "github:serokell/deploy-rs";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.utils.follows = "flake-utils";
+    };
+
+    pre-commit-hooks = {
+      url = "github:cachix/pre-commit-hooks.nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs-stable.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+    };
+
+    nvim-kitty-navigator = {
+      url = "github:hermitmaster/nvim-kitty-navigator";
+      flake = false;
+    };
   };
 
-  inputs.nur.url = "github:nix-community/NUR/master";
-
-  inputs.agenix = {
-    url = "github:ryantm/agenix";
-    inputs.nixpkgs.follows = "nixpkgs";
-  };
-
-  inputs.deploy-rs = {
-    url = "github:serokell/deploy-rs";
-    inputs.nixpkgs.follows = "nixpkgs";
-    inputs.utils.follows = "flake-utils";
-  };
-
-  inputs.pre-commit-hooks = {
-    url = "github:cachix/pre-commit-hooks.nix";
-    inputs.nixpkgs.follows = "nixpkgs";
-    inputs.nixpkgs-stable.follows = "nixpkgs";
-    inputs.flake-utils.follows = "flake-utils";
-  };
-
-  inputs.nvim-kitty-navigator = {
-    url = "github:hermitmaster/nvim-kitty-navigator";
-    flake = false;
-  };
-
-  outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, flake-utils
-    , home-manager, nur, agenix, deploy-rs, pre-commit-hooks
+  outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, flake-parts
+    , flake-utils, home-manager, nur, agenix, deploy-rs, pre-commit-hooks
     , nvim-kitty-navigator }@inputs:
-    let
-      nixpkgsConfig.allowUnfree = true;
-      overlays = {
-        unstable = final: prev: {
-          unstable = import nixpkgs-unstable {
-            inherit (prev) system;
-            config = nixpkgsConfig;
+    inputs.flake-parts.lib.mkFlake { inherit inputs; } {
+      systems = [ "x86_64-linux" "aarch64-linux" ];
+      imports = [ ];
+      flake = rec {
+        overlays = {
+          unstable = final: prev: {
+            unstable = import nixpkgs-unstable {
+              inherit (prev) system;
+              config.allowUnfree = true;
+            };
           };
-        };
-        neovim = final: prev:
-          let
-            buildVimPlugin = name: input:
-              prev.pkgs.vimUtils.buildVimPluginFrom2Nix {
-                pname = name;
-                version = input.rev;
-                versionSuffix = "-git";
-                src = input;
+          neovim = final: prev:
+            let
+              buildVimPlugin = name: input:
+                prev.pkgs.vimUtils.buildVimPluginFrom2Nix {
+                  pname = name;
+                  version = input.rev;
+                  versionSuffix = "-git";
+                  src = input;
+                };
+            in {
+              vimPlugins = prev.vimPlugins // {
+                nvim-kitty-navigator =
+                  buildVimPlugin "nvim-kitty-navigator" nvim-kitty-navigator;
               };
-          in {
-            vimPlugins = prev.vimPlugins // {
-              nvim-kitty-navigator =
-                buildVimPlugin "nvim-kitty-navigator" nvim-kitty-navigator;
             };
+          deconz = final: prev: {
+            deconz = final.qt5.callPackage ./pkgs/deconz { };
+          };
+          wrappers = final: prev: {
+            genericBinWrapper =
+              final.callPackage ./pkgs/generic-bin-wrapper { };
+            mullvadExcludeWrapper =
+              final.callPackage ./pkgs/mullvad-exclude-wrapper { };
           };
-        deconz = final: prev: {
-          deconz = final.qt5.callPackage ./pkgs/deconz { };
         };
-        wrappers = final: prev: {
-          genericBinWrapper = final.callPackage ./pkgs/generic-bin-wrapper { };
-          mullvadExcludeWrapper =
-            final.callPackage ./pkgs/mullvad-exclude-wrapper { };
+
+        lib = rec {
+          systemDefaults = {
+            modules =
+              [ nixosModules.flakeDefaults agenix.nixosModules.default ];
+            overlays = with overlays; [
+              unstable
+              nur.overlay
+              neovim
+              deconz
+              wrappers
+            ];
+          };
+          createSystem = hostName:
+            { hardwareConfig, config }:
+            ({ pkgs, lib, ... }: {
+              networking.hostName = hostName;
+
+              nixpkgs.overlays = systemDefaults.overlays;
+
+              imports = systemDefaults.modules ++ [ hardwareConfig config ];
+
+              environment.systemPackages =
+                [ agenix.packages.x86_64-linux.default ];
+            });
+          createUser' = import ./lib/createUser.nix;
+          createUser = name: args:
+            ({ pkgs, ... }@args2:
+              (createUser' name args) ({ inherit home-manager; } // args2));
+          createMediaGroup = _: { users.groups.media.gid = 600; };
+        };
+
+        nixosModules = {
+          flakeDefaults = import ./modules/flakeDefaults.nix;
+          systemdNotify = import ./modules/systemdNotify.nix;
+        };
+
+        homeManagerModules = {
+          git = import ./home/modules/git.nix;
+          firefox = import ./home/modules/firefox/firefox.nix;
+          tor-browser = import ./home/modules/firefox/tor-browser.nix;
+        };
+
+        nixosConfigurations = {
+          home-pc = nixpkgs.lib.nixosSystem {
+            system = "x86_64-linux";
+            modules = [
+              nixpkgs.nixosModules.notDetected
+              nixos-hardware.nixosModules.common-pc
+              nixos-hardware.nixosModules.common-pc-ssd
+              nixos-hardware.nixosModules.common-cpu-amd-pstate
+              nixos-hardware.nixosModules.common-gpu-amd
+              (lib.createSystem "home-pc" {
+                hardwareConfig = ./hardware/home-pc.nix;
+                config = ./home-pc.nix;
+              })
+              lib.createMediaGroup
+              (lib.createUser "felschr" {
+                user.extraGroups = [ "wheel" "audio" "disk" "media" ];
+                modules = [ homeManagerModules.git ];
+                config = ./home/felschr.nix;
+              })
+              ({ pkgs, ... }: {
+                environment.systemPackages =
+                  [ deploy-rs.defaultPackage.x86_64-linux ];
+              })
+            ];
+            specialArgs = { inherit inputs; };
+          };
+          pilot1 = nixpkgs.lib.nixosSystem {
+            system = "x86_64-linux";
+            modules = [
+              nixpkgs.nixosModules.notDetected
+              nixos-hardware.nixosModules.common-pc
+              nixos-hardware.nixosModules.common-pc-ssd
+              nixos-hardware.nixosModules.common-cpu-intel
+              (lib.createSystem "pilot1" {
+                hardwareConfig = ./hardware/pilot1.nix;
+                config = ./work-pc.nix;
+              })
+              (lib.createUser "felschr" {
+                user.extraGroups = [ "wheel" "audio" "disk" ];
+                modules = [ homeManagerModules.git ];
+                config = ./home/felschr-work.nix;
+              })
+            ];
+            specialArgs = { inherit inputs; };
+          };
+          home-server = nixpkgs.lib.nixosSystem {
+            system = "x86_64-linux";
+            modules = [
+              nixpkgs.nixosModules.notDetected
+              nixos-hardware.nixosModules.common-pc
+              nixos-hardware.nixosModules.common-pc-ssd
+              nixos-hardware.nixosModules.common-cpu-intel-kaby-lake
+              (lib.createSystem "home-server" {
+                hardwareConfig = ./hardware/lattepanda.nix;
+                config = ./home-server.nix;
+              })
+              lib.createMediaGroup
+              (lib.createUser "felschr" {
+                user = {
+                  extraGroups = [ "wheel" "audio" "disk" "media" ];
+                  openssh.authorizedKeys.keys = [
+                    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP751vlJUnB7Pfe1KNr6weWkx/rkP4J3lTYpAekHdOgV"
+                  ];
+                };
+                modules = [ homeManagerModules.git ];
+                config = ./home/felschr-server.nix;
+              })
+            ];
+            specialArgs = { inherit inputs; };
+          };
+        };
+
+        deploy.nodes.home-server = {
+          hostname = "192.168.1.102";
+          profiles.system = {
+            user = "felschr";
+            path = deploy-rs.lib.x86_64-linux.activate.nixos
+              self.nixosConfigurations.home-server;
+          };
         };
       };
-      nixosModules = {
-        flakeDefaults = import ./modules/flakeDefaults.nix;
-        systemdNotify = import ./modules/systemdNotify.nix;
-      };
-      homeManagerModules = {
-        git = import ./home/modules/git.nix;
-        firefox = import ./home/modules/firefox/firefox.nix;
-        tor-browser = import ./home/modules/firefox/tor-browser.nix;
-      };
-      systemDefaults = {
-        modules = [ nixosModules.flakeDefaults agenix.nixosModules.default ];
-        overlays = with overlays; [
-          unstable
-          nur.overlay
-          neovim
-          deconz
-          wrappers
-        ];
-      };
-      lib = rec {
-        createSystem = hostName:
-          { hardwareConfig, config }:
-          ({ pkgs, lib, ... }: {
-            networking.hostName = hostName;
-
-            nixpkgs.overlays = systemDefaults.overlays;
-
-            imports = systemDefaults.modules ++ [ hardwareConfig config ];
-
-            environment.systemPackages = with pkgs;
-              [ agenix.packages.x86_64-linux.default ];
-          });
-        createUser' = import ./lib/createUser.nix;
-        createUser = name: args:
-          ({ pkgs, ... }@args2:
-            (createUser' name args) ({ inherit home-manager; } // args2));
-        createMediaGroup = _: { users.groups.media.gid = 600; };
-      };
-      specialArgs = { inherit inputs; };
-    in rec {
-
-      inherit lib overlays nixosModules homeManagerModules;
-
-      nixosConfigurations.home-pc = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          nixpkgs.nixosModules.notDetected
-          nixos-hardware.nixosModules.common-pc
-          nixos-hardware.nixosModules.common-pc-ssd
-          nixos-hardware.nixosModules.common-cpu-amd-pstate
-          nixos-hardware.nixosModules.common-gpu-amd
-          (lib.createSystem "home-pc" {
-            hardwareConfig = ./hardware/home-pc.nix;
-            config = ./home-pc.nix;
-          })
-          lib.createMediaGroup
-          (lib.createUser "felschr" {
-            user.extraGroups = [ "wheel" "audio" "disk" "media" ];
-            modules = [ homeManagerModules.git ];
-            config = ./home/felschr.nix;
-          })
-          ({ pkgs, ... }: {
-            environment.systemPackages = with pkgs;
-              [ deploy-rs.defaultPackage.x86_64-linux ];
-          })
-        ];
-        inherit specialArgs;
-      };
-
-      nixosConfigurations.pilot1 = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          nixpkgs.nixosModules.notDetected
-          nixos-hardware.nixosModules.common-pc
-          nixos-hardware.nixosModules.common-pc-ssd
-          nixos-hardware.nixosModules.common-cpu-intel
-          (lib.createSystem "pilot1" {
-            hardwareConfig = ./hardware/pilot1.nix;
-            config = ./work-pc.nix;
-          })
-          (lib.createUser "felschr" {
-            user.extraGroups = [ "wheel" "audio" "disk" ];
-            modules = [ homeManagerModules.git ];
-            config = ./home/felschr-work.nix;
-          })
-        ];
-        inherit specialArgs;
-      };
-
-      nixosConfigurations.home-server = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          nixpkgs.nixosModules.notDetected
-          nixos-hardware.nixosModules.common-pc
-          nixos-hardware.nixosModules.common-pc-ssd
-          nixos-hardware.nixosModules.common-cpu-intel-kaby-lake
-          (lib.createSystem "home-server" {
-            hardwareConfig = ./hardware/lattepanda.nix;
-            config = ./home-server.nix;
-          })
-          lib.createMediaGroup
-          (lib.createUser "felschr" {
-            user = {
-              extraGroups = [ "wheel" "audio" "disk" "media" ];
-              openssh.authorizedKeys.keys = [
-                "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP751vlJUnB7Pfe1KNr6weWkx/rkP4J3lTYpAekHdOgV"
-              ];
-            };
-            modules = [ homeManagerModules.git ];
-            config = ./home/felschr-server.nix;
-          })
-        ];
-        inherit specialArgs;
-      };
-
-      deploy.nodes.home-server = {
-        hostname = "192.168.1.102";
-        profiles.system = {
-          user = "felschr";
-          path = deploy-rs.lib.x86_64-linux.activate.nixos
-            self.nixosConfigurations.home-server;
-        };
-      };
-
-    } // flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (system:
-      let
-        pkgs = import nixpkgs {
-          inherit system;
-          config = nixpkgsConfig;
-        };
-      in rec {
-        formatter = pkgs.nixfmt;
-
+      perSystem = { system, config, pkgs, ... }: rec {
         packages = { deconz = pkgs.qt5.callPackage ./pkgs/deconz { }; };
 
         apps = { deconz = flake-utils.lib.mkApp { drv = packages.deconz; }; };
@@ -222,5 +224,8 @@
             };
           };
         };
-      });
+
+        formatter = pkgs.nixfmt;
+      };
+    };
 }