diff --git a/README.md b/README.md
index 92bc717..9d52cf5 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,26 @@
 # nixos
 
-## Install home-manager
+## Base installation
 
-1. run `scripts/add-home-manager-channel.sh`
-2. run `scripts/install-home-manager.sh`
+```
+parted /dev/sda -- mklabel gpt
+parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB
+parted /dev/sda -- set 1 esp on
+parted /dev/sda -- mkpart primary 512MiB 100%
+
+cryptsetup luksFormat --type luks1 /dev/sda2
+cryptsetup open /dev/sda2 cryptlvm
+
+pvcreate /dev/mapper/cryptlvm
+vgcreate MainGroup /dev/mapper/cryptlvm
+lvcreate -L 8G MainGroup -n swap
+lvcreate -l 100%FREE MainGroup -n root
+
+mkfs.ext4 -L nixos /dev/MainGroup/root
+mkswap -L swap /dev/MainGroup/swap
+mkfs.fat -F 32 -n BOOT /dev/sda1
+```
+
+1. `link-NAME.sh`
+2. `scripts/add-home-manager-channel.sh`
+3. `scripts/install-home-manager.sh`
diff --git a/hardware/asus/configuration.nix b/hardware/asus/configuration.nix
new file mode 100644
index 0000000..3d75f0f
--- /dev/null
+++ b/hardware/asus/configuration.nix
@@ -0,0 +1,138 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+    ];
+
+  # Use the systemd-boot EFI boot loader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  networking.hostName = "nixos"; # Define your hostname.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  # Set your time zone.
+  time.timeZone = "Europe/Zurich";
+
+  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
+  # Per-interface useDHCP will be mandatory in the future, so this generated config
+  # replicates the default behaviour.
+  networking.useDHCP = false;
+  networking.interfaces.enp0s3.useDHCP = true;
+
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+  console = {
+    font = "Lat2-Terminus16";
+    keyMap = "us";
+  };
+
+  # Enable the X11 windowing system.
+  services.xserver.enable = true;
+
+
+  services.xserver.displayManager.lightdm.enable = true;
+  services.xserver.displayManager.defaultSession = "none+qtile";
+  services.xserver.windowManager = {
+    qtile.enable = true;
+  };
+  services.autorandr.enable = true;
+
+  # Configure keymap in X11
+  services.xserver.layout = "us";
+  services.xserver.xkbOptions = "compose:ralt";
+
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+
+  # Enable keyring
+  security.pam.services.lightdm.enableGnomeKeyring = true;
+  services.gnome.gnome-keyring.enable = true;
+
+  # Enable sound.
+  sound.enable = true;
+  hardware.pulseaudio.enable = true;
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  services.xserver.libinput.enable = true;
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.andreas = {
+    isNormalUser = true;
+    initialPassword = "password";
+    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
+  };
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  # allow non-free packages
+  nixpkgs.config.allowUnfree = true;
+
+  # enable steam
+  programs.steam.enable = true;
+  hardware.steam-hardware.enable = true;
+
+  environment.shellAliases = {
+    nix-generations = "sudo nix-env --list-generations --profile /nix/var/nix/profiles/system";
+  };
+  environment.variables = {
+    EDITOR = "vim";
+    HIGHLIGHT_STYLE = "solarized-light";
+    ZWEILI_HARDWARE = "asus";
+    ZWEILI_ENVIRONMENT = "desktop";
+  };
+  environment.systemPackages = with pkgs; [
+    arc-theme
+    celluloid
+    firefox
+    git
+    highlight
+    htop
+    ncdu
+    nitrogen
+    ranger
+    rofi
+    terminator
+    vim
+    wget
+  ];
+
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
+  # };
+
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
+  services.openssh.enable = true;
+
+  # Open ports in the firewall.
+  networking.firewall.allowedTCPPorts = [ 22 ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "21.05"; # Did you read the comment?
+
+}
+
diff --git a/hardware-configuration.nix b/hardware/asus/hardware-configuration.nix
similarity index 100%
rename from hardware-configuration.nix
rename to hardware/asus/hardware-configuration.nix
diff --git a/configuration.nix b/hardware/vm/configuration.nix
similarity index 98%
rename from configuration.nix
rename to hardware/vm/configuration.nix
index 45c08fb..cd5e584 100644
--- a/configuration.nix
+++ b/hardware/vm/configuration.nix
@@ -88,6 +88,8 @@
   environment.variables = {
     EDITOR = "vim";
     HIGHLIGHT_STYLE = "solarized-light";
+    ZWEILI_HARDWARE = "vm";
+    ZWEILI_ENVIRONMENT = "desktop";
   };
   environment.systemPackages = with pkgs; [
     arc-theme
diff --git a/hardware/vm/hardware-configuration.nix b/hardware/vm/hardware-configuration.nix
new file mode 100644
index 0000000..8453137
--- /dev/null
+++ b/hardware/vm/hardware-configuration.nix
@@ -0,0 +1,29 @@
+# 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, modulesPath, ... }:
+
+{
+  imports = [ ];
+
+  boot.initrd.availableKernelModules = [ "ata_piix" "ohci_pci" "sd_mod" "sr_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-label/nixos";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-label/BOOT";
+      fsType = "vfat";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-label/swap"; }
+    ];
+
+  virtualisation.virtualbox.guest.enable = true;
+}
diff --git a/hardware/xps5530/configuration.nix b/hardware/xps5530/configuration.nix
new file mode 100644
index 0000000..76c31bd
--- /dev/null
+++ b/hardware/xps5530/configuration.nix
@@ -0,0 +1,138 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+    ];
+
+  # Use the systemd-boot EFI boot loader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  networking.hostName = "nixos"; # Define your hostname.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  # Set your time zone.
+  time.timeZone = "Europe/Zurich";
+
+  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
+  # Per-interface useDHCP will be mandatory in the future, so this generated config
+  # replicates the default behaviour.
+  networking.useDHCP = false;
+  networking.interfaces.enp0s3.useDHCP = true;
+
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+  console = {
+    font = "Lat2-Terminus16";
+    keyMap = "us";
+  };
+
+  # Enable the X11 windowing system.
+  services.xserver.enable = true;
+
+
+  services.xserver.displayManager.lightdm.enable = true;
+  services.xserver.displayManager.defaultSession = "none+qtile";
+  services.xserver.windowManager = {
+    qtile.enable = true;
+  };
+  services.autorandr.enable = true;
+
+  # Configure keymap in X11
+  services.xserver.layout = "us";
+  services.xserver.xkbOptions = "compose:ralt";
+
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+
+  # Enable keyring
+  security.pam.services.lightdm.enableGnomeKeyring = true;
+  services.gnome.gnome-keyring.enable = true;
+
+  # Enable sound.
+  sound.enable = true;
+  hardware.pulseaudio.enable = true;
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  services.xserver.libinput.enable = true;
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.andreas = {
+    isNormalUser = true;
+    initialPassword = "password";
+    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
+  };
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  # allow non-free packages
+  nixpkgs.config.allowUnfree = true;
+
+  # enable steam
+  programs.steam.enable = true;
+  hardware.steam-hardware.enable = true;
+
+  environment.shellAliases = {
+    nix-generations = "sudo nix-env --list-generations --profile /nix/var/nix/profiles/system";
+  };
+  environment.variables = {
+    EDITOR = "vim";
+    HIGHLIGHT_STYLE = "solarized-light";
+    ZWEILI_HARDWARE = "xps5530";
+    ZWEILI_ENVIRONMENT = "desktop";
+  };
+  environment.systemPackages = with pkgs; [
+    arc-theme
+    celluloid
+    firefox
+    git
+    highlight
+    htop
+    ncdu
+    nitrogen
+    ranger
+    rofi
+    terminator
+    vim
+    wget
+  ];
+
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
+  # };
+
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
+  services.openssh.enable = true;
+
+  # Open ports in the firewall.
+  networking.firewall.allowedTCPPorts = [ 22 ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "21.05"; # Did you read the comment?
+
+}
+
diff --git a/hardware/xps5530/hardware-configuration.nix b/hardware/xps5530/hardware-configuration.nix
new file mode 100644
index 0000000..8453137
--- /dev/null
+++ b/hardware/xps5530/hardware-configuration.nix
@@ -0,0 +1,29 @@
+# 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, modulesPath, ... }:
+
+{
+  imports = [ ];
+
+  boot.initrd.availableKernelModules = [ "ata_piix" "ohci_pci" "sd_mod" "sr_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-label/nixos";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-label/BOOT";
+      fsType = "vfat";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-label/swap"; }
+    ];
+
+  virtualisation.virtualbox.guest.enable = true;
+}
diff --git a/home/common.nix b/home-manager/common.nix
similarity index 100%
rename from home/common.nix
rename to home-manager/common.nix
diff --git a/home/common/git/hooks/prepare-commit-msg b/home-manager/common/git/hooks/prepare-commit-msg
similarity index 100%
rename from home/common/git/hooks/prepare-commit-msg
rename to home-manager/common/git/hooks/prepare-commit-msg
diff --git a/home/personal-desktop.nix b/home-manager/desktop.nix
similarity index 100%
rename from home/personal-desktop.nix
rename to home-manager/desktop.nix
diff --git a/home/desktop/qtile/config.py b/home-manager/desktop/qtile/config.py
similarity index 100%
rename from home/desktop/qtile/config.py
rename to home-manager/desktop/qtile/config.py
diff --git a/home/personal_config/bashrc b/home-manager/personal_config/bashrc
similarity index 100%
rename from home/personal_config/bashrc
rename to home-manager/personal_config/bashrc
diff --git a/home/ubuntu.nix b/home-manager/ubuntu.nix
similarity index 77%
rename from home/ubuntu.nix
rename to home-manager/ubuntu.nix
index 94bc413..e876756 100644
--- a/home/ubuntu.nix
+++ b/home-manager/ubuntu.nix
@@ -3,6 +3,6 @@
   imports = [
     ./personal-desktop.nix
   ];
-  programs.bash.enable = true;
+  #programs.bash.enable = true;
   targets.genericLinux.enable = true;
 }
diff --git a/home/work-wsl.nix b/home-manager/work-wsl.nix
similarity index 100%
rename from home/work-wsl.nix
rename to home-manager/work-wsl.nix
diff --git a/home/work_config/bashrc b/home-manager/work_config/bashrc
similarity index 100%
rename from home/work_config/bashrc
rename to home-manager/work_config/bashrc
diff --git a/scripts/install-home-manager.sh b/scripts/install-home-manager.sh
index 359b288..586996e 100644
--- a/scripts/install-home-manager.sh
+++ b/scripts/install-home-manager.sh
@@ -1,3 +1,5 @@
 nix-shell '<home-manager>' -A install
+rm ~/.config/nixpkgs/home.nix
 rm -r ~/.config/qtile
+ln -s $(pwd)/home-manager/$ZWEILI_ENVIRONMENT.nix /home/$USER/.config/nixpkgs/home.nix
 home-manager switch
diff --git a/scripts/link-asus.sh b/scripts/link-asus.sh
new file mode 100644
index 0000000..9b76877
--- /dev/null
+++ b/scripts/link-asus.sh
@@ -0,0 +1,5 @@
+rm /mnt/etc/nixos/configuration.nix
+rm /mnt/etc/nixos/hardware-configuration.nix
+
+ln -s $(pwd)/hardware/asus/configuration.nix /mnt/etc/nixos/configuration.nix
+
diff --git a/scripts/link-vm.sh b/scripts/link-vm.sh
new file mode 100644
index 0000000..6457a35
--- /dev/null
+++ b/scripts/link-vm.sh
@@ -0,0 +1,6 @@
+rm /mnt/etc/nixos/configuration.nix
+rm /mnt/etc/nixos/hardware-configuration.nix
+
+ln -s $(pwd)/hardware/vm/configuration.nix /mnt/etc/nixos/configuration.nix
+
+
diff --git a/scripts/link-xps5530.sh b/scripts/link-xps5530.sh
new file mode 100644
index 0000000..55654d0
--- /dev/null
+++ b/scripts/link-xps5530.sh
@@ -0,0 +1,4 @@
+rm /mnt/etc/nixos/configuration.nix
+rm /mnt/etc/nixos/hardware-configuration.nix
+
+ln -s $(pwd)/hardware/xps5530/configuration.nix /mnt/etc/nixos/configuration.nix