flake.lock

@@ -7,32 +7,32 @@
         ]
       },
       "locked": {
-        "lastModified": 1639871969,
-        "narHash": "sha256-6feWUnMygRzA9tzkrfAzpA5/NBYg75bkFxnqb1DtD7E=",
+        "lastModified": 1627649712,
+        "narHash": "sha256-AJBasvMKpsyJmCLdjroBElCHY5AlalbVy+XY5vjbgXc=",
         "owner": "rycee",
         "repo": "home-manager",
-        "rev": "697cc8c68ed6a606296efbbe9614c32537078756",
+        "rev": "b39647e52ed3c0b989e9d5c965e598ae4c38d7ef",
         "type": "github"
       },
       "original": {
         "owner": "rycee",
-        "ref": "release-21.11",
+        "ref": "release-21.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1641687203,
-        "narHash": "sha256-W6Xrb/l1x+E+WMVLw4q5HUnNjt3x4WQFSYJtjJtopbU=",
+        "lastModified": 1629033443,
+        "narHash": "sha256-Vo3TvQvR5hsd3incx/xOt6GFgTm651CYVauHS/irOFo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "00acdb2aa817048fbe1f91ece18fe7de09762531",
+        "rev": "8ac785da9843aa110caeed6c912875e46a415a11",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-21.11",
+        "ref": "nixos-21.05",
         "repo": "nixpkgs",
         "type": "github"
       }

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.11";
+			url = "github:rycee/home-manager/release-21.05";
 			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,46 +38,7 @@
 				];
 				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;
-					};
-
-					programs.home-manager.enable = 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;
-					};
-
-					programs.home-manager.enable = true;
-
-					imports = [
-						./user/environments/wsl/home.nix
-					];
-				};
-			};
 		};
 	};
 }

user/machines/kitchen/config.nix

@@ -0,0 +1,3 @@
+{
+  allowUnfree = true;
+}

user/machines/kitchen/home.nix

@@ -0,0 +1,20 @@
+{ 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
+  ];
+  
+}

user/machines/loft/home.nix

@@ -2,6 +2,7 @@
 
 {
 	imports = [
+		../../modules/home-manager.nix
 		../../modules/dev.nix
 		../../modules/fonts.nix
 		../../modules/git.nix
@@ -12,6 +13,9 @@
 	];
 
 	home.packages = with pkgs; [
+		neofetch
+		fortune
+		google-chrome
 		firefox
 	];
   

user/machines/wsl/home.nix

@@ -2,6 +2,7 @@
 
 {
 	imports = [
+		../../modules/home-manager.nix
 		../../modules/git.nix
 		../../modules/zsh.nix
 	];

user/modules/zsh.nix

@@ -41,7 +41,6 @@
 			enableZshIntegration = true;
 			settings = {
 				character.success_symbol = "[➜](green)";
-				character.error_symbol = "[➜](red)";
 			};
 	};
 }