diff --git a/config.nix b/config.nix
index 64ca54d..fe821b3 100644
--- a/config.nix
+++ b/config.nix
@@ -1,16 +1,7 @@
 let sources = import ./nix/sources.nix;
 in {
   allowUnfree = true;
-  overlays = [
-    (import sources.nixpkgs-wayland)
-    (import sources.nixpkgs-mozilla)
-    (import sources.emacs-overlay)
-    (import ./nixos/overlay.nix)
-    (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)
-    (import ./overlay.nix)
-  ];
+  # chromium.vaapiSupport = true;
+  android_sdk.accept_license = true;
+  overlays = import ./overlays.nix;
 }
diff --git a/nix/.config/nixpkgs/arbtt.nix b/home-manager/arbtt.nix
similarity index 100%
rename from nix/.config/nixpkgs/arbtt.nix
rename to home-manager/arbtt.nix
diff --git a/nix/.config/nixpkgs/desktop.nix b/home-manager/desktop.nix
similarity index 100%
rename from nix/.config/nixpkgs/desktop.nix
rename to home-manager/desktop.nix
diff --git a/nix/.config/nixpkgs/home.nix b/home-manager/home.nix
similarity index 98%
rename from nix/.config/nixpkgs/home.nix
rename to home-manager/home.nix
index 81e7a8f..1c21fa9 100644
--- a/nix/.config/nixpkgs/home.nix
+++ b/home-manager/home.nix
@@ -238,6 +238,7 @@ in {
       gnome3.gcr.out # alacritty
       notmuch
       gmailieer
+      git-absorb
       afew
       broot
       starship
@@ -298,4 +299,7 @@ in {
     recursive = true;
   };
   manual.manpages.enable = false;
+  home.sessionVariables = {
+    HOME_MANAGER_CONFIG = toString ./home.nix; # unused, but checked for existence
+  };
 }
diff --git a/nix/.config/nixpkgs/libinput-gestures.nix b/home-manager/libinput-gestures.nix
similarity index 100%
rename from nix/.config/nixpkgs/libinput-gestures.nix
rename to home-manager/libinput-gestures.nix
diff --git a/nix/.config/nixpkgs/waybar/config b/home-manager/waybar/config
similarity index 100%
rename from nix/.config/nixpkgs/waybar/config
rename to home-manager/waybar/config
diff --git a/nix/.config/nixpkgs/waybar/style.css b/home-manager/waybar/style.css
similarity index 100%
rename from nix/.config/nixpkgs/waybar/style.css
rename to home-manager/waybar/style.css
diff --git a/nix/.config/nixpkgs/config.nix b/nix/.config/nixpkgs/config.nix
deleted file mode 100644
index 70e35c1..0000000
--- a/nix/.config/nixpkgs/config.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-
-{
-  allowUnfree = true;
-  # chromium = {
-  #   vaapiSupport = true;
-  # };
-  android_sdk.accept_license = true;
-
-}
-
diff --git a/nix/.config/nixpkgs/overlays/01-backports.nix b/nix/.config/nixpkgs/overlays/01-backports.nix
deleted file mode 100644
index 692f299..0000000
--- a/nix/.config/nixpkgs/overlays/01-backports.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-self: super:
-let
-  overrideOlder = original: override: with self.lib; let
-  newpkgver = getVersion (override original);
-  oldpkgver = getVersion original;
-    in if (versionOlder oldpkgver newpkgver) then original.overrideDerivation override else original;
-in
-{
-  factorio = super.factorio.override {
-    releaseType = "alpha";
-    username = "yorickvp";
-    token = "dd8dca57e4f1891117d351b25cf56f";
-  };
-  # numix-solarized-gtk-theme = super.numix-solarized-gtk-theme.overrideDerivation (attrs: rec {
-  #   version = "20180204";
-  #   name = "numix-solarized-gtk-theme-${version}";
-  #   buildInputs = attrs.buildInputs ++ [ self.python3 self.inkscape ];
-  #   src = self.fetchFromGitHub {
-  #     owner = "Ferdi265";
-  #     repo = "numix-solarized-gtk-theme";
-  #     rev = "3da78b0dbe74d0af0e3cc12e18ec1c30c7cf2b16";
-  #     sha256 = "0dyqfcs1laff7hr64dg4n5y6qrcki47mdr332yn3yxp3bk7xybc3";
-  #   };
-  #   postPatch = attrs.postPatch + ''
-  #     sed -i s#/usr/bin/inkscape#${self.inkscape}/bin/inkscape# scripts/render-assets.sh
-  #   '';
-  #   buildPhase = ''
-  #     # for i in Solarized*.colors; do
-  #     #   THEME=`basename $i` make
-  #     # done
-  #   '';
-  #   installPhase = ''
-  #     for i in Solarized*.colors; do
-  #       HOME=/tmp/inkscape make install THEME=`basename $i .colors`
-  #     done
-  #   '';
-  # });
-}
diff --git a/nix/.config/nixpkgs/overlays/03-customizations.nix b/nix/.config/nixpkgs/overlays/03-customizations.nix
deleted file mode 100644
index 1bbde41..0000000
--- a/nix/.config/nixpkgs/overlays/03-customizations.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-self: super: {
-  #mpv = super.mpv.override { vaapiSupport = true; };
-  python36Packages = super.python36Packages.override { overrides = (self: super: {
-    # pycrypto runs slow tests by default
-    pycryptodome = super.pycryptodome.overrideDerivation (attrs: {
-      doCheck = false;
-      doInstallCheck = false;
-      setuptoolsCheckPhase = "true";
-      # installCheckPhase = ''
-      #   ${self.python.interpreter} nix_run_setup.py test --skip-slow-tests
-      # '';
-    });
-  }); };
-  # emacs-pgtk = with self; emacs26.overrideAttrs (
-  #   { configureFlags ? [], postPatch ? "", nativeBuildInputs ? [], ... }:
-  #   {
-  #     src = fetchFromGitHub {
-  #       owner = "masm11";
-  #       repo = "emacs";
-  #       rev = "d56f600d1ca2e996bedc6a59a85abc983bb3f23d";
-  #       sha256 = "06wycfmr1w3lgpg10ffad1i2sr9ryac54w8qsavhn3h0rlvivjd3";
-  #     };
-
-  #     patches = [];
-
-  #     nativeBuildInputs = nativeBuildInputs ++ [ autoreconfHook texinfo ];
-
-  #     configureFlags = configureFlags ++ [ "--without-x" "--with-cairo" "--with-modules" ];
-  #   }
-  # );
-
-
-  # wine = pkgs.wine.override { wineRelease = "staging"; wineBuild = "wineWow"; };
-}
diff --git a/nix/.config/nixpkgs/overlays/04-combine.nix b/nix/.config/nixpkgs/overlays/04-combine.nix
deleted file mode 100644
index 8f3de85..0000000
--- a/nix/.config/nixpkgs/overlays/04-combine.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-self: super: {
-
-  myEmacs = super.emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [
-    company
-    paredit
-    counsel
-    flycheck
-    ivy
-    ivy-hydra
-    magit
-    projectile
-    epkgs.melpaPackages.counsel-projectile
-    ggtags
-    use-package
-    org-bullets
-    solarized-theme
-    evil
-    evil-magit
-    evil-leader
-    evil-tutor
-    evil-surround
-    epkgs.evil-goggles
-    epkgs.ox-mediawiki
-    epkgs.hledger-mode
-    # evil-commentary
-    password-store
-    pass
-    linum-relative
-    (epkgs.trivialBuild {
-      pname = "emacs-nix-mode";
-      src = super.fetchFromGitHub {
-        owner = "matthewbauer";
-        repo = "nix-mode";
-        rev = "f24abeb736a028deb283d51a859e7e34aba5e42b";
-        sha256 = "06kznwa5qbl3vzvvdh6lqdgzjzkvkvayvv3bjx3p2j275fxy1kfw";
-      };
-      preConfigure = "rm nix-company.el nix-mode-mmm.el";
-    })
-    nix-buffer
-    which-key
-    git-gutter-fringe
-    neotree
-    all-the-icons
-    epkgs.org-cliplink
-    pandoc-mode
-    markdown-mode
-    interleave
-    # all-the-icons-dired
-    org-ref
-    avy
-    # nixos-sandbox # https://github.com/travisbhartwell/nix-emacs
-    haskell-mode
-    intero
-  ]));
-  # todo: emacs-all-the-icons-fonts
-  pandocdeps = (super.texlive.combine {
-    inherit (super.texlive)
-      scheme-basic
-      # explicit list pandoc tex dependencies
-      amsfonts amsmath lm ec ifxetex ifluatex eurosym listings fancyvrb
-      # longtable
-      booktabs
-      hyperref ulem geometry setspace
-      # linestretch
-      babel
-      # some optional dependencies of pandoc
-      upquote microtype csquotes
-      mathtools
-      ;
-  });
-}
diff --git a/nix/.config/nixpkgs/pkgs/nottetris2.nix b/nix/.config/nixpkgs/pkgs/nottetris2.nix
deleted file mode 100644
index a887d6c..0000000
--- a/nix/.config/nixpkgs/pkgs/nottetris2.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ pkgs ? import <nixpkgs> { }, stdenv ? pkgs.stdenv, love_0_7 ? pkgs.love_0_7 }:
-# let
-#   name = "nottetris2";
-#   src = pkgs.fetchzip {
-#     url = "http://stabyourself.net/dl.php?file=${name}/${name}-linux.zip";
-#     sha256 = "1zwwp4h1njwl3jnwkszcsqx868v16312pbfy5rp9h48ym79spd36";
-#     stripRoot = false;
-#   };
-# in pkgs.writeShellScriptBin name ''
-#   exec ${love_0_7}/bin/love "${src}/Not Tetris 2.love"
-# ''
-  stdenv.mkDerivation {
-    pname = "nottetris";
-    version = "2";
-    buildInputs = [ love_0_7 pkgs.unzip pkgs.makeWrapper ];
-    nativeBuildInputs = [ pkgs.unzip ];
-    src = pkgs.fetchurl {
-      url = "https://stabyourself.net/dl.php?file=nottetris2/nottetris2-source.zip";
-      sha256 = "13lsacp3bd1xf80yrj7r8dgs15m7kxalqa7vml0k7frmhbkb0b1n";
-    };
-    sourceRoot = ".";
-    installPhase = ''
-      mkdir -p $out/lib
-      cp "Not Tetris 2.love" $out/lib/
-      makeWrapper $(command -v love) $out/bin/nottetris2 --add-flags "\"$out/lib/Not Tetris 2.love\""
-    '';
-    # meta = {
-    #   license = 
-    # };
-  }
diff --git a/nix/default.nix b/nix/default.nix
deleted file mode 100644
index 80349e0..0000000
--- a/nix/default.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-let sources = import /home/yorick/dotfiles/nix/sources.nix;
-in import sources.nixpkgs (import ./config.nix)
diff --git a/nixos/packages/default.nix b/nixos/packages/default.nix
deleted file mode 100644
index dd23b15..0000000
--- a/nixos/packages/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-[ (self: super: { yori-cc = super.callPackage ./yori-cc.nix { }; }) ]
diff --git a/nixos/roles/default.nix b/nixos/roles/default.nix
index 462864a..729715a 100644
--- a/nixos/roles/default.nix
+++ b/nixos/roles/default.nix
@@ -34,7 +34,6 @@ in {
 
   # Nix
   nixpkgs.config.allowUnfree = true;
-  nixpkgs.overlays = import ../packages;
 
   #nix.buildCores = config.nix.maxJobs;
 
diff --git a/nixos/secrets.nix b/nixos/secrets.nix
index cf2ede2..ae4c605 100644
Binary files a/nixos/secrets.nix and b/nixos/secrets.nix differ
diff --git a/nixos/services/website.nix b/nixos/services/website.nix
index 15db876..8c6b8ba 100644
--- a/nixos/services/website.nix
+++ b/nixos/services/website.nix
@@ -1,7 +1,6 @@
 { config, lib, pkgs, ... }:
 
 let
-  yoricc = pkgs.callPackage ../packages/yori-cc.nix { };
   cfg = config.services.yorick.website;
 in with lib; {
   options.services.yorick = {
@@ -10,7 +9,7 @@ in with lib; {
       vhost = mkOption { type = types.str; };
       pkg = mkOption {
         type = types.package;
-        default = yoricc;
+        default = pkgs.yori-cc;
       };
     };
     redirect = mkOption {
diff --git a/overlay.nix b/overlay.nix
index 1f67cd4..1cd9a22 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -3,7 +3,7 @@ in pkgs: super: {
   yorick = super.yorick // rec {
     home = { check ? true, newsReadIdsFile ? null }:
       import "${sources.home-manager}/home-manager/home-manager.nix" {
-        confPath = ./nix/.config/nixpkgs/home.nix;
+        confPath = ./home-manager/home.nix;
         inherit pkgs check newsReadIdsFile;
       };
   };
diff --git a/overlays.nix b/overlays.nix
new file mode 100644
index 0000000..af0da1b
--- /dev/null
+++ b/overlays.nix
@@ -0,0 +1,10 @@
+let sources = import ./nix/sources.nix;
+in [
+  (import sources.nixpkgs-wayland)
+  (import sources.nixpkgs-mozilla)
+  (import sources.emacs-overlay)
+  (import ./pkgs)
+  (import ./pkgs/envs.nix)
+  (import ./nixos/overlay.nix)
+  (import ./overlay.nix)
+]
diff --git a/nix/.config/nixpkgs/overlays/02-extrapkgs.nix b/pkgs/default.nix
similarity index 51%
rename from nix/.config/nixpkgs/overlays/02-extrapkgs.nix
rename to pkgs/default.nix
index d4e30a8..0dff534 100644
--- a/nix/.config/nixpkgs/overlays/02-extrapkgs.nix
+++ b/pkgs/default.nix
@@ -1,14 +1,15 @@
-self: super: {
+(self: super: {
 
-  ftb = self.callPackage ../pkgs/ftb.nix {};
-  pyroscope = self.callPackage ../pkgs/pyroscope {};
-  nottetris2 = self.callPackage ../pkgs/nottetris2.nix {};
-  #lejos = self.callPackage ../pkgs/lejos.nix {};
+  yori-cc = super.callPackage ./yori-cc.nix { };
+
+  ftb = super.callPackage ./ftb.nix {};
+  pyroscope = super.callPackage ./pyroscope {};
+  #lejos = super.callPackage ../pkgs/lejos.nix {};
   libinput-gestures = super.libinput-gestures.override { extraUtilsPath = [
     self.xdotool self.python3
   ];};
-  gitFire = super.stdenv.mkDerivation {
-    src = super.fetchFromGitHub {
+  gitFire = self.stdenv.mkDerivation {
+    src = self.fetchFromGitHub {
       owner = "qw3rtman";
       repo = "git-fire";
       rev = "f485fffedbc4f719c55547be22ccd0080e592c9a";
@@ -21,11 +22,17 @@ self: super: {
     '';
   };
 
-  weiightminder = self.callPackage (builtins.fetchGit {
+  weiightminder = super.callPackage (builtins.fetchGit {
     url = https://gist.github.com/yorickvP/229d21a7da13c9c514dbd26147822641;
     rev = "9749ef4d83c0078bc0248215ee882d7124827cf3";
   }) {};
 
 
-  yscripts = self.callPackage /home/yorick/dotfiles/bin {};
-}
+  yscripts = super.callPackage ../bin {};
+  factorio = super.factorio.override {
+    releaseType = "alpha";
+    username = "yorickvp";
+    token = (import ../nixos/secrets.nix).factorio_token;
+  };
+
+})
diff --git a/nix/.config/nixpkgs/overlays/05-envs.nix b/pkgs/envs.nix
similarity index 100%
rename from nix/.config/nixpkgs/overlays/05-envs.nix
rename to pkgs/envs.nix
diff --git a/nix/.config/nixpkgs/pkgs/ftb.nix b/pkgs/ftb.nix
similarity index 94%
rename from nix/.config/nixpkgs/pkgs/ftb.nix
rename to pkgs/ftb.nix
index f61248b..789c876 100644
--- a/nix/.config/nixpkgs/pkgs/ftb.nix
+++ b/pkgs/ftb.nix
@@ -30,6 +30,6 @@ in
   meta = {
       description = "Modded minecraft launcher";
       homepage = http://www.feed-the-beast.com;
-      license = stdenv.lib.licenses.unfreeRedistributable;
+      license = lib.licenses.unfreeRedistributable;
   };
 }
diff --git a/nix/.config/nixpkgs/pkgs/lejos.nix b/pkgs/lejos.nix
similarity index 100%
rename from nix/.config/nixpkgs/pkgs/lejos.nix
rename to pkgs/lejos.nix
diff --git a/nix/.config/nixpkgs/pkgs/pyroscope/default.nix b/pkgs/pyroscope/default.nix
similarity index 100%
rename from nix/.config/nixpkgs/pkgs/pyroscope/default.nix
rename to pkgs/pyroscope/default.nix
diff --git a/nix/.config/nixpkgs/pkgs/pyroscope/fix_readme.diff b/pkgs/pyroscope/fix_readme.diff
similarity index 100%
rename from nix/.config/nixpkgs/pkgs/pyroscope/fix_readme.diff
rename to pkgs/pyroscope/fix_readme.diff
diff --git a/nixos/packages/yori-cc.nix b/pkgs/yori-cc.nix
similarity index 100%
rename from nixos/packages/yori-cc.nix
rename to pkgs/yori-cc.nix