diff --git a/darwin-configuration.nix b/darwin-configuration.nix
index 364b819..4f7ff60 100644
--- a/darwin-configuration.nix
+++ b/darwin-configuration.nix
@@ -38,12 +38,11 @@ let gmp =
   # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
   # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix";
 
-  # TODO: get Spacemacs actually working
-  #nixpkgs.overlays = [
-  #  (import (builtins.fetchTarball {
-  #    url = https://github.com/nix-community/emacs-overlay/archive/8ed671dab09f08e8079e24f9fc7800b7ce260fa2.tar.gz;
-  #  }))
-  #];
+  nixpkgs.overlays = [
+    (import (builtins.fetchTarball {
+      url = https://github.com/nix-community/emacs-overlay/archive/25dd5297f613fd13971e4847e82d1097077eeb53.tar.gz;
+    }))
+  ];
 
 
   # Auto upgrade nix package and the daemon service.
diff --git a/home.nix b/home.nix
index 61803e7..99483fa 100644
--- a/home.nix
+++ b/home.nix
@@ -44,6 +44,7 @@ let rider = import ./rider/rider.nix { inherit pkgs; username = username; }; in
       pkgs.shellcheck
       pkgs.html-tidy
       pkgs.hugo
+      pkgs.agda
       #rider
     ];
 
@@ -152,24 +153,9 @@ let g:syntastic_check_on_wq = 0''; }
 
   home.file.".config/youtube-dl/config".source = ./youtube-dl.conf;
 
-  #programs.emacs = {
-  #  enable = true;
-  #  package = pkgs.emacsGcc;
-  #};
-
-
-  #home.file.".emacs.d" = {
-  #  # don't make the directory read only so that impure melpa can still happen
-  #  # for now
-  #  recursive = true;
-  #  source = pkgs.fetchFromGitHub {
-  #    owner = "syl20bnr";
-  #    repo = "spacemacs";
-  #    rev = "663cfc5ba7826dd20d18fe5c1f8fb09338284955";
-  #    sha256 = "1a5myflp32myxah296kbq1xc0idixf6xvgis3v4fbs6vk9fj39hw";
-  #    leaveDotGit = true;
-  #  };
-  #};
-
-  #home.file.".spacemacs".source = ./.spacemacs;
+  programs.emacs = {
+    enable = true;
+    package = pkgs.emacsGcc;
+    extraPackages = (epkgs: []);
+  };
 }