diff --git a/flake.lock b/flake.lock
index e8408e5..395e242 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,32 +7,32 @@
         ]
       },
       "locked": {
-        "lastModified": 1627649712,
-        "narHash": "sha256-AJBasvMKpsyJmCLdjroBElCHY5AlalbVy+XY5vjbgXc=",
+        "lastModified": 1639871969,
+        "narHash": "sha256-6feWUnMygRzA9tzkrfAzpA5/NBYg75bkFxnqb1DtD7E=",
         "owner": "rycee",
         "repo": "home-manager",
-        "rev": "b39647e52ed3c0b989e9d5c965e598ae4c38d7ef",
+        "rev": "697cc8c68ed6a606296efbbe9614c32537078756",
         "type": "github"
       },
       "original": {
         "owner": "rycee",
-        "ref": "release-21.05",
+        "ref": "release-21.11",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1629033443,
-        "narHash": "sha256-Vo3TvQvR5hsd3incx/xOt6GFgTm651CYVauHS/irOFo=",
+        "lastModified": 1641687203,
+        "narHash": "sha256-W6Xrb/l1x+E+WMVLw4q5HUnNjt3x4WQFSYJtjJtopbU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8ac785da9843aa110caeed6c912875e46a415a11",
+        "rev": "00acdb2aa817048fbe1f91ece18fe7de09762531",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-21.05",
+        "ref": "nixos-21.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 87c20ab..be42941 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,16 +2,16 @@
 	description = "Michael Thomas's NixOS configuration";
 
 	inputs = {
+		nixpkgs.url = "github:nixos/nixpkgs/nixos-21.11";
+  	unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+		nur.url = "github:nix-community/NUR";
+
 		home-manager = {
-			url = "github:rycee/home-manager/release-21.05";
+			url = "github:rycee/home-manager/release-21.11";
 			inputs = {
 				nixpkgs.follows = "nixpkgs";
 			};
 		};
-
-		nixpkgs.url = "github:nixos/nixpkgs/nixos-21.05";
-  	unstable.url = "github:nixos/nixpkgs/nixos-unstable";
-		nur.url = "github:nix-community/NUR";
 	};
 
 	outputs = inputs: {
@@ -38,7 +38,42 @@
 				];
 				specialArgs = { inherit inputs; };
 			};
+		};
 
+		homeConfigurations = {
+			nixos = inputs.home-manager.lib.homeManagerConfiguration {
+				system = "x86_64-linux";
+				homeDirectory = "/home/michael";
+				username = "michael";
+				stateVersion = "21.05";
+				configuration = { config, pkgs, ... }:
+				{
+					nixpkgs.config = {
+						allowUnfree = true;
+					};
+
+					imports = [
+						./user/environments/nixos/home.nix
+					];
+				};
+			};
+
+			wsl = inputs.home-manager.lib.homeManagerConfiguration {
+				system = "x86_64-linux";
+				homeDirectory = "/home/michael";
+				username = "michael";
+				stateVersion = "21.05";
+				configuration = { config, pkgs, ... }:
+				{
+					nixpkgs.config = {
+						allowUnfree = true;
+					};
+
+					imports = [
+						./user/environments/wsl/home.nix
+					];
+				};
+			};
 		};
 	};
 }
diff --git a/user/machines/loft/config.nix b/user/environments/mac/config.nix
similarity index 100%
rename from user/machines/loft/config.nix
rename to user/environments/mac/config.nix
diff --git a/user/machines/mac/home.nix b/user/environments/mac/home.nix
similarity index 100%
rename from user/machines/mac/home.nix
rename to user/environments/mac/home.nix
diff --git a/user/machines/mac/config.nix b/user/environments/nixos/config.nix
similarity index 100%
rename from user/machines/mac/config.nix
rename to user/environments/nixos/config.nix
diff --git a/user/machines/loft/home.nix b/user/environments/nixos/home.nix
similarity index 79%
rename from user/machines/loft/home.nix
rename to user/environments/nixos/home.nix
index 24f89e4..860a3d4 100644
--- a/user/machines/loft/home.nix
+++ b/user/environments/nixos/home.nix
@@ -2,7 +2,6 @@
 
 {
 	imports = [
-		../../modules/home-manager.nix
 		../../modules/dev.nix
 		../../modules/fonts.nix
 		../../modules/git.nix
@@ -13,9 +12,6 @@
 	];
 
 	home.packages = with pkgs; [
-		neofetch
-		fortune
-		google-chrome
 		firefox
 	];
   
diff --git a/user/machines/wsl/config.nix b/user/environments/wsl/config.nix
similarity index 100%
rename from user/machines/wsl/config.nix
rename to user/environments/wsl/config.nix
diff --git a/user/machines/wsl/home.nix b/user/environments/wsl/home.nix
similarity index 90%
rename from user/machines/wsl/home.nix
rename to user/environments/wsl/home.nix
index 8b95958..bf87936 100644
--- a/user/machines/wsl/home.nix
+++ b/user/environments/wsl/home.nix
@@ -2,7 +2,6 @@
 
 {
 	imports = [
-		../../modules/home-manager.nix
 		../../modules/git.nix
 		../../modules/zsh.nix
 	];
diff --git a/user/machines/kitchen/config.nix b/user/machines/kitchen/config.nix
deleted file mode 100644
index 1dd1750..0000000
--- a/user/machines/kitchen/config.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  allowUnfree = true;
-}
diff --git a/user/machines/kitchen/home.nix b/user/machines/kitchen/home.nix
deleted file mode 100644
index 918fc12..0000000
--- a/user/machines/kitchen/home.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [
-    ../../modules/home-manager.nix
-    ../../modules/fonts.nix
-    ../../modules/git.nix
-    ../../modules/git_nixos.nix
-    ../../modules/gnome.nix
-    ../../modules/dev.nix
-    ../../modules/vscode.nix
-    ../../modules/zsh.nix
-  ];
-
-  home.packages = with pkgs; [
-  	neofetch
-  	fortune
-  ];
-  
-}
\ No newline at end of file