diff --git a/flake.nix b/flake.nix
index 00268c3..33be7a1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -11,17 +12,58 @@
   };
 
   outputs =
-    { self, nixpkgs, ... }@inputs:
     {
-      nixosConfigurations.default = nixpkgs.lib.nixosSystem {
+      self,
+      nixpkgs,
+      home-manager,
+      nixos-hardware,
+      ...
+    }@inputs:
+    {
+
+      nixosConfigurations.cap-slim7 = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
         specialArgs = {
           inherit inputs;
         };
+        modules = [
+          ./hosts/cap-slim7/configuration.nix
+          ./modules/nixos/hyprland-amd.nix
+          inputs.home-manager.nixosModules.default
+          nixos-hardware.nixosModules.lenovo-legion-16arha7
+        ];
+      };
+
+      nixosConfigurations.cap-nr200p = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
         modules = [
           ./hosts/cap-nr200p/configuration.nix
           ./modules/nixos/hyprland.nix
           inputs.home-manager.nixosModules.default
         ];
       };
+
+      homeConfigurations = {
+        "caperren@cap-slim7" = home-manager.lib.homeManagerConfiguration {
+          pkgs = nixpkgs.legacyPackages.x86_64-linux;
+          extraModules = [
+            ./home/caperren/common.nix
+            ./home/caperren/laptop.nix
+          ];
+          username = "caperren";
+          homeDirectory = "/home/caperren";
+        };
+
+        "caperren@cap-nr200p" = home-manager.lib.homeManagerConfiguration {
+          pkgs = nixpkgs.legacyPackages.x86_64-linux;
+          extraModules = [
+            ./home/caperren/common.nix
+            ./home/caperren/desktop1.nix
+          ];
+          username = "caperren";
+          homeDirectory = "/home/caperren";
+        };
+    };
+
     };
 }