diff --git a/darwin.nix b/darwin.nix
index 5b7c439..aeecb43 100644
--- a/darwin.nix
+++ b/darwin.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 let
-  dotfiles = import ./dotfiles.nix;
+  dotfiles = import ./dotfiles;
 in
   {
     imports = [
diff --git a/dotfiles.nix b/dotfiles/default.nix
similarity index 72%
rename from dotfiles.nix
rename to dotfiles/default.nix
index 80983ac..4ba7d8d 100644
--- a/dotfiles.nix
+++ b/dotfiles/default.nix
@@ -2,13 +2,13 @@
 
 {
   imports = [
-    ./config/direnv.nix
-    ./config/emacs.nix
-    ./config/fzf.nix
-    ./config/git.nix
-    ./config/neovim.nix
-    ./config/ssh.nix
-    ./config/zsh.nix
+    ./direnv.nix
+    ./emacs.nix
+    ./fzf.nix
+    ./git.nix
+    ./neovim.nix
+    ./ssh.nix
+    ./zsh.nix
   ];
 
   home.packages = [
@@ -22,7 +22,7 @@
     # local packages. I know I could use overlays for these (cf
     # https://github.com/jwoudenberg/dotfiles/commit/12bd31b269b82f0dc661140b8df275ef24f41b81)
     # but I don't want to have to symlink into the overlays directory manually.
-    (pkgs.callPackage ./pkgs/lorri.nix { })
+    (pkgs.callPackage ../pkgs/lorri.nix { })
   ];
 
   programs.man.enable = true;
diff --git a/config/direnv.nix b/dotfiles/direnv.nix
similarity index 100%
rename from config/direnv.nix
rename to dotfiles/direnv.nix
diff --git a/config/emacs-snippets/elm-mode/cas b/dotfiles/emacs-snippets/elm-mode/cas
similarity index 100%
rename from config/emacs-snippets/elm-mode/cas
rename to dotfiles/emacs-snippets/elm-mode/cas
diff --git a/config/emacs-snippets/elm-mode/fun b/dotfiles/emacs-snippets/elm-mode/fun
similarity index 100%
rename from config/emacs-snippets/elm-mode/fun
rename to dotfiles/emacs-snippets/elm-mode/fun
diff --git a/config/emacs-snippets/elm-mode/imp b/dotfiles/emacs-snippets/elm-mode/imp
similarity index 100%
rename from config/emacs-snippets/elm-mode/imp
rename to dotfiles/emacs-snippets/elm-mode/imp
diff --git a/config/emacs-snippets/elm-mode/mod b/dotfiles/emacs-snippets/elm-mode/mod
similarity index 100%
rename from config/emacs-snippets/elm-mode/mod
rename to dotfiles/emacs-snippets/elm-mode/mod
diff --git a/config/emacs-snippets/enh-ruby-mode/rspec b/dotfiles/emacs-snippets/enh-ruby-mode/rspec
similarity index 100%
rename from config/emacs-snippets/enh-ruby-mode/rspec
rename to dotfiles/emacs-snippets/enh-ruby-mode/rspec
diff --git a/config/emacs.nix b/dotfiles/emacs.nix
similarity index 100%
rename from config/emacs.nix
rename to dotfiles/emacs.nix
diff --git a/config/emacs/basics.el b/dotfiles/emacs/basics.el
similarity index 100%
rename from config/emacs/basics.el
rename to dotfiles/emacs/basics.el
diff --git a/config/emacs/compilation.el b/dotfiles/emacs/compilation.el
similarity index 100%
rename from config/emacs/compilation.el
rename to dotfiles/emacs/compilation.el
diff --git a/config/emacs/completion.el b/dotfiles/emacs/completion.el
similarity index 100%
rename from config/emacs/completion.el
rename to dotfiles/emacs/completion.el
diff --git a/config/emacs/diffing.el b/dotfiles/emacs/diffing.el
similarity index 100%
rename from config/emacs/diffing.el
rename to dotfiles/emacs/diffing.el
diff --git a/config/emacs/direnv.el b/dotfiles/emacs/direnv.el
similarity index 100%
rename from config/emacs/direnv.el
rename to dotfiles/emacs/direnv.el
diff --git a/config/emacs/display.el b/dotfiles/emacs/display.el
similarity index 100%
rename from config/emacs/display.el
rename to dotfiles/emacs/display.el
diff --git a/config/emacs/eshell-config.el b/dotfiles/emacs/eshell-config.el
similarity index 100%
rename from config/emacs/eshell-config.el
rename to dotfiles/emacs/eshell-config.el
diff --git a/config/emacs/evil.el b/dotfiles/emacs/evil.el
similarity index 100%
rename from config/emacs/evil.el
rename to dotfiles/emacs/evil.el
diff --git a/config/emacs/folding.el b/dotfiles/emacs/folding.el
similarity index 100%
rename from config/emacs/folding.el
rename to dotfiles/emacs/folding.el
diff --git a/config/emacs/git.el b/dotfiles/emacs/git.el
similarity index 100%
rename from config/emacs/git.el
rename to dotfiles/emacs/git.el
diff --git a/config/emacs/helm-config.el b/dotfiles/emacs/helm-config.el
similarity index 100%
rename from config/emacs/helm-config.el
rename to dotfiles/emacs/helm-config.el
diff --git a/config/emacs/icons.el b/dotfiles/emacs/icons.el
similarity index 100%
rename from config/emacs/icons.el
rename to dotfiles/emacs/icons.el
diff --git a/config/emacs/init.el b/dotfiles/emacs/init.el
similarity index 100%
rename from config/emacs/init.el
rename to dotfiles/emacs/init.el
diff --git a/config/emacs/jumping.el b/dotfiles/emacs/jumping.el
similarity index 100%
rename from config/emacs/jumping.el
rename to dotfiles/emacs/jumping.el
diff --git a/config/emacs/lang/coffeescript.el b/dotfiles/emacs/lang/coffeescript.el
similarity index 100%
rename from config/emacs/lang/coffeescript.el
rename to dotfiles/emacs/lang/coffeescript.el
diff --git a/config/emacs/lang/csv.el b/dotfiles/emacs/lang/csv.el
similarity index 100%
rename from config/emacs/lang/csv.el
rename to dotfiles/emacs/lang/csv.el
diff --git a/config/emacs/lang/dockerfile.el b/dotfiles/emacs/lang/dockerfile.el
similarity index 100%
rename from config/emacs/lang/dockerfile.el
rename to dotfiles/emacs/lang/dockerfile.el
diff --git a/config/emacs/lang/elixir.el b/dotfiles/emacs/lang/elixir.el
similarity index 100%
rename from config/emacs/lang/elixir.el
rename to dotfiles/emacs/lang/elixir.el
diff --git a/config/emacs/lang/elm.el b/dotfiles/emacs/lang/elm.el
similarity index 100%
rename from config/emacs/lang/elm.el
rename to dotfiles/emacs/lang/elm.el
diff --git a/config/emacs/lang/graphviz.el b/dotfiles/emacs/lang/graphviz.el
similarity index 100%
rename from config/emacs/lang/graphviz.el
rename to dotfiles/emacs/lang/graphviz.el
diff --git a/config/emacs/lang/haml.el b/dotfiles/emacs/lang/haml.el
similarity index 100%
rename from config/emacs/lang/haml.el
rename to dotfiles/emacs/lang/haml.el
diff --git a/config/emacs/lang/haskell.el b/dotfiles/emacs/lang/haskell.el
similarity index 100%
rename from config/emacs/lang/haskell.el
rename to dotfiles/emacs/lang/haskell.el
diff --git a/config/emacs/lang/html.el b/dotfiles/emacs/lang/html.el
similarity index 100%
rename from config/emacs/lang/html.el
rename to dotfiles/emacs/lang/html.el
diff --git a/config/emacs/lang/idris.el b/dotfiles/emacs/lang/idris.el
similarity index 100%
rename from config/emacs/lang/idris.el
rename to dotfiles/emacs/lang/idris.el
diff --git a/config/emacs/lang/javascript.el b/dotfiles/emacs/lang/javascript.el
similarity index 100%
rename from config/emacs/lang/javascript.el
rename to dotfiles/emacs/lang/javascript.el
diff --git a/config/emacs/lang/json.el b/dotfiles/emacs/lang/json.el
similarity index 100%
rename from config/emacs/lang/json.el
rename to dotfiles/emacs/lang/json.el
diff --git a/config/emacs/lang/markdown.el b/dotfiles/emacs/lang/markdown.el
similarity index 100%
rename from config/emacs/lang/markdown.el
rename to dotfiles/emacs/lang/markdown.el
diff --git a/config/emacs/lang/nix.el b/dotfiles/emacs/lang/nix.el
similarity index 100%
rename from config/emacs/lang/nix.el
rename to dotfiles/emacs/lang/nix.el
diff --git a/config/emacs/lang/org-mode-config.el b/dotfiles/emacs/lang/org-mode-config.el
similarity index 100%
rename from config/emacs/lang/org-mode-config.el
rename to dotfiles/emacs/lang/org-mode-config.el
diff --git a/config/emacs/lang/ruby.el b/dotfiles/emacs/lang/ruby.el
similarity index 100%
rename from config/emacs/lang/ruby.el
rename to dotfiles/emacs/lang/ruby.el
diff --git a/config/emacs/lang/rust.el b/dotfiles/emacs/lang/rust.el
similarity index 100%
rename from config/emacs/lang/rust.el
rename to dotfiles/emacs/lang/rust.el
diff --git a/config/emacs/lang/terraform.el b/dotfiles/emacs/lang/terraform.el
similarity index 100%
rename from config/emacs/lang/terraform.el
rename to dotfiles/emacs/lang/terraform.el
diff --git a/config/emacs/lang/toml.el b/dotfiles/emacs/lang/toml.el
similarity index 100%
rename from config/emacs/lang/toml.el
rename to dotfiles/emacs/lang/toml.el
diff --git a/config/emacs/lang/yaml.el b/dotfiles/emacs/lang/yaml.el
similarity index 100%
rename from config/emacs/lang/yaml.el
rename to dotfiles/emacs/lang/yaml.el
diff --git a/config/emacs/linting.el b/dotfiles/emacs/linting.el
similarity index 100%
rename from config/emacs/linting.el
rename to dotfiles/emacs/linting.el
diff --git a/config/emacs/projects.el b/dotfiles/emacs/projects.el
similarity index 100%
rename from config/emacs/projects.el
rename to dotfiles/emacs/projects.el
diff --git a/config/emacs/snippets.el b/dotfiles/emacs/snippets.el
similarity index 100%
rename from config/emacs/snippets.el
rename to dotfiles/emacs/snippets.el
diff --git a/config/fzf.nix b/dotfiles/fzf.nix
similarity index 100%
rename from config/fzf.nix
rename to dotfiles/fzf.nix
diff --git a/config/git.nix b/dotfiles/git.nix
similarity index 100%
rename from config/git.nix
rename to dotfiles/git.nix
diff --git a/config/neovim.nix b/dotfiles/neovim.nix
similarity index 100%
rename from config/neovim.nix
rename to dotfiles/neovim.nix
diff --git a/config/ssh.nix b/dotfiles/ssh.nix
similarity index 100%
rename from config/ssh.nix
rename to dotfiles/ssh.nix
diff --git a/config/zsh.nix b/dotfiles/zsh.nix
similarity index 100%
rename from config/zsh.nix
rename to dotfiles/zsh.nix
diff --git a/config/zsh/elm.zsh b/dotfiles/zsh/elm.zsh
similarity index 100%
rename from config/zsh/elm.zsh
rename to dotfiles/zsh/elm.zsh
diff --git a/config/zsh/emacs.zsh b/dotfiles/zsh/emacs.zsh
similarity index 100%
rename from config/zsh/emacs.zsh
rename to dotfiles/zsh/emacs.zsh
diff --git a/config/zsh/jetpack.zsh b/dotfiles/zsh/jetpack.zsh
similarity index 100%
rename from config/zsh/jetpack.zsh
rename to dotfiles/zsh/jetpack.zsh
diff --git a/config/zsh/jump.zsh b/dotfiles/zsh/jump.zsh
similarity index 100%
rename from config/zsh/jump.zsh
rename to dotfiles/zsh/jump.zsh
diff --git a/config/zsh/kill-process.zsh b/dotfiles/zsh/kill-process.zsh
similarity index 100%
rename from config/zsh/kill-process.zsh
rename to dotfiles/zsh/kill-process.zsh
diff --git a/config/zsh/lorri.zsh b/dotfiles/zsh/lorri.zsh
similarity index 100%
rename from config/zsh/lorri.zsh
rename to dotfiles/zsh/lorri.zsh
diff --git a/config/zsh/nixify.sh b/dotfiles/zsh/nixify.sh
similarity index 100%
rename from config/zsh/nixify.sh
rename to dotfiles/zsh/nixify.sh
diff --git a/config/zsh/rubofix.zsh b/dotfiles/zsh/rubofix.zsh
similarity index 100%
rename from config/zsh/rubofix.zsh
rename to dotfiles/zsh/rubofix.zsh
diff --git a/config/zsh/scripts.zsh b/dotfiles/zsh/scripts.zsh
similarity index 100%
rename from config/zsh/scripts.zsh
rename to dotfiles/zsh/scripts.zsh