diff --git a/install b/install
index bad60db02..a9a45953d 100755
--- a/install
+++ b/install
@@ -11,28 +11,25 @@ else
     sudo mkdir -p /etc/nixos
     sudo cp /etc/nixos.bak/hardware-configuration.nix /etc/nixos
 
-    sudo cp ./configuration.nix /etc/nixos/
-    sudo ln -s $(pwd)/{machines,modules,pkgs} /etc/nixos
+    sudo cp ./system/configuration.nix /etc/nixos/
+    sudo ln -s $(pwd)/system/{machines,modules,pkgs} /etc/nixos
     sudo touch /etc/nixos/.system-installed
 
-    nixos-rebuild switch
     echo "==> System config installed, your old configuration is at /etc/nixos.bak"
 fi
 echo
 
 if [[ -f ~/.config/nixpkgs/system-installed ]]; then
-    echo "=== home-anager config already installed, skipping"
+    echo "=== home-manager config already installed, skipping"
 else
     echo "==> Installing home-manager config"
     nix-channel --add https://github.com/rycee/home-manager/archive/master.tar.gz home-manager
     nix-channel --update
-    nix-shell '<home-manager>' -A install
+    # nix-shell '<home-manager>' -A install
 
     [[ -d ~/.config/nixpkgs ]] && mv ~/.config/{nixpkgs,nixpkgs.bak}
     mkdir -p ~/.config/nixpkgs
-    ln -s home/* ~/.config/nixpkgs
-
-    home-manager switch
+    ln -s $(pwd)/home/* ~/.config/nixpkgs
 
     echo "==> home-manager config installed"
 fi