diff --git a/configuration.nix b/configuration.nix
index 67e70ba..b77c447 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,7 +1,5 @@
-{ pkgs, lib, ... }:
-let sources = import ./nix/sources.nix;
-in {
-  imports = [ "${sources.home-manager}/nixos" ./modules ];
+{ pkgs, lib, ... }: {
+  imports = [ ./modules ];
 
   nixpkgs.config.allowBroken = true;
   boot.loader.systemd-boot.enable = true;
diff --git a/flake.nix b/flake.nix
index e1c6732..67eefb4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,8 +1,23 @@
 {
-  outputs = { self, nixpkgs }: {
+  description = "NixOS configuration";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/release-21.05";
+    nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+
+    home.url = "github:nix-community/home-manager/release-21.05";
+    home.inputs.nixpkgs.follows = "nixpkgs";
+
+  };
+
+  outputs = { self, nixpkgs, home-manager, ... }: {
     nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
-      modules = [ /etc/nixos/hardware-configuration.nix ./configuration.nix ];
+      modules = [
+        home-manager.nixosModules.home-manager
+        ./hardware/laptop.nix
+        ./configuration.nix
+      ];
     };
   };
 }
diff --git a/hardware/laptop.nix b/hardware/laptop.nix
new file mode 100644
index 0000000..59e936c
--- /dev/null
+++ b/hardware/laptop.nix
@@ -0,0 +1,30 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, ... }:
+
+{
+  imports =
+    [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/57846041-f177-45eb-aff3-503006bac638";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/01E6-A013";
+      fsType = "vfat";
+    };
+
+  swapDevices = [ ];
+
+  nix.maxJobs = lib.mkDefault 8;
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+}