diff --git a/flake.nix b/flake.nix
index fe974fc..a0b0c38 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,10 @@
   description = "Ryan's MacBook Pro flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    nixpkgs = {
+      url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    };
+
     nix-darwin = {
       url = "github:LnL7/nix-darwin";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -70,17 +73,15 @@
     nixpkgs,
     nix-darwin,
     home-manager,
-    attic,
-    catppuccin,
-    nyoom,
-    discord-applemusic-rich-presence,
     ...
   } @ inputs: {
     darwinConfigurations.Ryans-MacBook-Pro = nix-darwin.lib.darwinSystem {
       modules = [
         ./system.nix
+        ./users.nix
         home-manager.darwinModules.home-manager
       ];
+
       specialArgs = inputs;
     };
   };
diff --git a/system.nix b/system.nix
index 46c61a7..07b902e 100644
--- a/system.nix
+++ b/system.nix
@@ -1,7 +1,6 @@
 {
   pkgs,
   attic,
-  catppuccin,
   discord-applemusic-rich-presence,
   nyoom,
   ...
@@ -143,20 +142,5 @@
     taps = ["1password/tap"];
   };
 
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    extraSpecialArgs = {
-      ctpModule = catppuccin.homeManagerModules.catppuccin;
-      discord-applemusic-rich-presence = discord-applemusic-rich-presence.homeManagerModules.default;
-    };
-  };
-
-  users.users.ryanccn = {
-    home = "/Users/ryanccn";
-  };
-
-  home-manager.users.ryanccn = import ./home.nix;
-
   system.stateVersion = 4;
 }
diff --git a/users.nix b/users.nix
new file mode 100644
index 0000000..b9b4401
--- /dev/null
+++ b/users.nix
@@ -0,0 +1,20 @@
+{
+  catppuccin,
+  discord-applemusic-rich-presence,
+  ...
+}: {
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+
+    extraSpecialArgs = {
+      ctpModule = catppuccin.homeManagerModules.catppuccin;
+      discord-applemusic-rich-presence = discord-applemusic-rich-presence.homeManagerModules.default;
+    };
+    users.ryanccn = import ./home.nix;
+  };
+
+  users.users.ryanccn = {
+    home = "/Users/ryanccn";
+  };
+}