diff --git a/config.nix b/config.nix
new file mode 100644
index 0000000..0f5bc7f
--- /dev/null
+++ b/config.nix
@@ -0,0 +1,14 @@
+let sources = import ./nix/sources.nix;
+in
+  {
+    overlays = [
+      (import sources.nixpkgs-wayland)
+      (import sources.nixpkgs-mozilla)
+      (import sources.emacs-overlay)
+      (import ./nix/.config/nixpkgs/overlays/01-backports.nix)
+      (import ./nix/.config/nixpkgs/overlays/02-extrapkgs.nix)
+      (import ./nix/.config/nixpkgs/overlays/03-customizations.nix)
+      (import ./nix/.config/nixpkgs/overlays/04-combine.nix)
+      (import ./nix/.config/nixpkgs/overlays/05-envs.nix)
+    ];
+  }
diff --git a/emacs/emacs-custom.el b/emacs/emacs-custom.el
new file mode 100644
index 0000000..e69de29
diff --git a/install.sh b/install.sh
deleted file mode 100755
index 4882333..0000000
--- a/install.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-#!nix-shell -i bash -p stow
-set -e
-$(nix-build '<nixpkgs>' -A stow --no-out-link)/bin/stow -d `dirname $0` -t ~ nix mutt
diff --git a/nix/.config/nixpkgs/home.nix b/nix/.config/nixpkgs/home.nix
index fc1b8e4..1796812 100644
--- a/nix/.config/nixpkgs/home.nix
+++ b/nix/.config/nixpkgs/home.nix
@@ -7,8 +7,8 @@ font = {
   name = "DejaVu Sans Mono";
     size = "11";
   };
-  sources = import /home/yorick/nixos/nix/sources.nix;
-  nixpkgs-loc = /home/yorick/nixpkgs; #sources.nixpkgs;
+  sources = import /home/yorick/dotfiles/nix/sources.nix;
+  nixpkgs-loc = /*/home/yorick/nixpkgs;*/ sources.nixpkgs;
   pkgs = import nixpkgs-loc {
     overlays = [
       (import sources.nixpkgs-wayland)
@@ -58,7 +58,7 @@ in
         weechat s elixir-mode htmlize
         linum-relative terraform-mode
         direnv vue-mode solarized-theme
-        wlrctl
+        #wlrctl
         (epkgs.melpaBuild {
           pname = "nix-mode";
           version = "1.4.0";
@@ -472,5 +472,9 @@ eval "$(starship init bash)"
     keyserver hkps://keys.openpgp.org
     #keyserver-options auto-key-retrieve
   '';
+  home.file.".mutt" = {
+    source = /home/yorick/dotfiles/mutt/.mutt;
+    recursive = true;
+  };
   manual.manpages.enable = false;
 }
diff --git a/nix/default.nix b/nix/default.nix
new file mode 100644
index 0000000..cd8ec90
--- /dev/null
+++ b/nix/default.nix
@@ -0,0 +1,4 @@
+let
+  sources = import /home/yorick/dotfiles/nix/sources.nix;
+in
+import sources.nixpkgs (import ./config.nix)
diff --git a/nixos/nix/sources.json b/nix/sources.json
similarity index 100%
rename from nixos/nix/sources.json
rename to nix/sources.json
diff --git a/nixos/nix/sources.nix b/nix/sources.nix
similarity index 100%
rename from nixos/nix/sources.nix
rename to nix/sources.nix