diff --git a/flake.nix b/flake.nix
index 537dce7..83f75ad 100755
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable";
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     home-manager = {
       url = github:nix-community/home-manager;
       inputs.nixpkgs.follows = "nixpkgs";
@@ -12,7 +13,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.home-manager.follows = "home-manager";
     };
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   };
 
   outputs = { self, nixpkgs, home-manager, plasma-manager, nixos-hardware }: {
diff --git a/users/aksutter.nix b/users/aksutter.nix
index 8e37aae..5f6d1e1 100755
--- a/users/aksutter.nix
+++ b/users/aksutter.nix
@@ -1,12 +1,5 @@
 { config, pkgs, home-manager, ... }:
 
-let
-  home-manager = builtins.fetchTarball {
-    url = "https://github.com/nix-community/home-manager/archive/master.tar.gz";
-#    sha256 = "05msmzfa45l9sr9ngd2cfxw66kw0x76d68gp29v5ilrakf8nc90w";
-  };
-in
-
 {
   # Nix User Repository https://github.com/nix-community/NUR
   nixpkgs.config.packageOverrides = pkgs: {
@@ -15,10 +8,6 @@ in
     };
   };    
 
-  imports = [
-    (import "${home-manager}/nixos")
-  ];
-
   users.users.aksutter = {
     shell = pkgs.zsh;
     isNormalUser = true;
diff --git a/users/isutter.nix b/users/isutter.nix
index 17dd49e..0b97f38 100755
--- a/users/isutter.nix
+++ b/users/isutter.nix
@@ -1,12 +1,5 @@
 { config, pkgs, home-manager, ... }:
 
-let
-  home-manager = builtins.fetchTarball {
-    url = "https://github.com/nix-community/home-manager/archive/master.tar.gz";
-#    sha256 = "05msmzfa45l9sr9ngd2cfxw66kw0x76d68gp29v5ilrakf8nc90w";
-  };
-in
-
 {
   # Nix User Repository https://github.com/nix-community/NUR
   nixpkgs.config.packageOverrides = pkgs: {
@@ -15,10 +8,6 @@ in
     };
   };    
 
-  imports = [
-    (import "${home-manager}/nixos")
-  ];
-
   users.users.isutter = {
     shell = pkgs.zsh;
     isNormalUser = true;
diff --git a/users/jsutter.nix b/users/jsutter.nix
index 52ed326..f649ded 100755
--- a/users/jsutter.nix
+++ b/users/jsutter.nix
@@ -8,8 +8,6 @@
     };
   };    
 
-  imports = [ inputs.home-manager.nixosModules.home-manager ];
-
   users.users.jsutter = {
     shell = pkgs.zsh;
     isNormalUser = true;
@@ -119,7 +117,7 @@
           cat = "bat";
           nra = "sudo nixos-rebuild switch --flake .#aurora";
 	        nrf = "sudo nixos-rebuild switch --flake .#framework";
-          nrl = "sudo nixos-rebuild switch --flake .#labrizor"
+          nrl = "sudo nixos-rebuild switch --flake .#labrizor";
         };
         oh-my-zsh = {
           enable = true;
@@ -185,7 +183,8 @@
               privacy-badger
               disconnect
               plasma-integration
-            ]
+            ];
+          };
         };
       };
     };