diff --git a/flake.lock b/flake.lock
index 37b3d53..033a0a3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -396,6 +396,24 @@
       }
     },
     "flake-parts_3": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_2"
+      },
+      "locked": {
+        "lastModified": 1765835352,
+        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_4": {
       "inputs": {
         "nixpkgs-lib": [
           "nur",
@@ -416,7 +434,7 @@
         "type": "github"
       }
     },
-    "flake-parts_4": {
+    "flake-parts_5": {
       "inputs": {
         "nixpkgs-lib": [
           "stylix",
@@ -707,6 +725,21 @@
         "type": "github"
       }
     },
+    "nixos-unified": {
+      "locked": {
+        "lastModified": 1764076447,
+        "narHash": "sha256-dpkdOPPCWaFtDoxVAtVaprtPX6jGl8o30EBc1gWBOnQ=",
+        "owner": "srid",
+        "repo": "nixos-unified",
+        "rev": "90171c6936a8332ede17e09e337a0e71f4e659b1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "srid",
+        "repo": "nixos-unified",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1759070547,
@@ -738,6 +771,21 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib_2": {
+      "locked": {
+        "lastModified": 1765674936,
+        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1764831616,
@@ -868,7 +916,7 @@
     },
     "nur": {
       "inputs": {
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_4",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -1007,9 +1055,11 @@
         "awww": "awww",
         "darwin": "darwin_2",
         "disko": "disko",
+        "flake-parts": "flake-parts_3",
         "home-manager": "home-manager_2",
         "musnix": "musnix",
         "niri": "niri",
+        "nixos-unified": "nixos-unified",
         "nixpkgs": "nixpkgs_7",
         "nur": "nur",
         "ovos": "ovos",
@@ -1049,11 +1099,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736130495,
-        "narHash": "sha256-4i9nAJEZFv7vZMmrE0YG55I3Ggrtfo5/T07JEpEZ/RM=",
+        "lastModified": 1765361626,
+        "narHash": "sha256-kX0Dp/kYSRbQ+yd9e3lmmUWdNbipufvKfL2IzbrSpnY=",
         "owner": "snowfallorg",
         "repo": "lib",
-        "rev": "02d941739f98a09e81f3d2d9b3ab08918958beac",
+        "rev": "c566ad8b7352c30ec3763435de7c8f1c46ebb357",
         "type": "github"
       },
       "original": {
@@ -1069,7 +1119,7 @@
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-parts": "flake-parts_4",
+        "flake-parts": "flake-parts_5",
         "gnome-shell": "gnome-shell",
         "nixpkgs": [
           "nixpkgs"
diff --git a/flake.nix b/flake.nix
index f49a03d..a389de4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,67 @@
 {
-  # References:
-  #   * https://github.com/Misterio77/nix-starter-config
-  description = "Padarom's system configuration";
+  description = "toph's system configuration";
+
+  inputs = {
+    # Core
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
+    unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+
+    # Flake framework
+    # flake-parts.url = "github:hercules-ci/flake-parts";
+    # nixos-unified.url = "github:srid/nixos-unified";
+    snowfall = {
+      url = "github:snowfallorg/lib";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    # System management
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    darwin = {
+      url = "github:lnl7/nix-darwin";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    # Infrastructure
+    disko = {
+      url = "github:nix-community/disko";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    # Secrets management
+    agenix = {
+      url = "github:ryantm/agenix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    agenix-rekey = {
+      url = "github:oddlama/agenix-rekey";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    # Styling
+    stylix = {
+      url = "github:nix-community/stylix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    affinity-nix.url = "github:mrshmllow/affinity-nix";
+    quadlet.url = "github:SEIAROTg/quadlet-nix";
+    musnix.url = "github:musnix/musnix";
+    niri.url = "github:sodiboo/niri-flake/9e59ee8";
+    awww.url = "git+https://codeberg.org/LGFae/awww";
+    nur = {
+      url = "github:nix-community/NUR";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    # Custom
+    ovos = {
+      url = "git+file:///home/christopher/workspaces/ovos-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
 
   outputs = {self, ...} @ inputs:
     (inputs.snowfall.mkFlake {
@@ -72,54 +132,4 @@
         homeConfigurations = inputs.self.homeConfigurations;
       };
     };
-
-  inputs = {
-    # nixpkgs.url = "git+file:///home/christopher/code/opensource/nixpkgs";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
-    unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
-
-    ovos.url = "git+file:///home/christopher/workspaces/ovos-flake";
-    ovos.inputs.nixpkgs.follows = "nixpkgs";
-
-    # Opinionated flake library for better organization without much boilerplate
-    snowfall = {
-      url = "github:snowfallorg/lib";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    home-manager = {
-      # url = "git+file:///home/christopher/code/opensource/home-manager";
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    # For using home-manager on Darwin (macOS) devices
-    darwin.url = "github:lnl7/nix-darwin";
-    darwin.inputs.nixpkgs.follows = "nixpkgs";
-
-    # Disk management via Nix
-    disko.url = "github:nix-community/disko";
-    disko.inputs.nixpkgs.follows = "nixpkgs";
-
-    # Secrets management
-    agenix.url = "github:ryantm/agenix";
-    agenix.inputs.nixpkgs.follows = "nixpkgs";
-    agenix-rekey.url = "github:oddlama/agenix-rekey";
-    agenix-rekey.inputs.nixpkgs.follows = "nixpkgs";
-
-    stylix = {
-      url = "github:nix-community/stylix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    affinity-nix.url = "github:mrshmllow/affinity-nix";
-    quadlet.url = "github:SEIAROTg/quadlet-nix";
-    musnix.url = "github:musnix/musnix";
-    niri.url = "github:sodiboo/niri-flake/9e59ee8";
-    awww.url = "git+https://codeberg.org/LGFae/awww";
-    nur = {
-      url = "github:nix-community/NUR";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
 }