diff --git a/features/emacs.nix b/features/emacs.nix
new file mode 100644
index 0000000..1782a13
--- /dev/null
+++ b/features/emacs.nix
@@ -0,0 +1,6 @@
+{ pkgs, inputs, ... }: {
+  nixpkgs.overlays = [ inputs.emacs-overlay.overlay ];
+  environment.systemPackages = with pkgs; [
+    emacsUnstable
+  ];
+}
diff --git a/flake.lock b/flake.lock
index 1628268..8a861c6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -17,6 +17,21 @@
         "type": "github"
       }
     },
+    "emacs-overlay": {
+      "locked": {
+        "lastModified": 1618166767,
+        "narHash": "sha256-GX9HpyX64eDkfuvGZgi3UZxUhqahEzyxwIlYLh3m1sM=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "e52579ab1b0fe093ea230116ac175be61488e7ed",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -168,6 +183,7 @@
     },
     "root": {
       "inputs": {
+        "emacs-overlay": "emacs-overlay",
         "himalaya": "himalaya",
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
diff --git a/flake.nix b/flake.nix
index 99ea8ca..d5570d5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,6 +11,7 @@
     nixos-hardware.url = github:NixOS/nixos-hardware/master;
     home-manager.url = "github:nix-community/home-manager";
     himalaya.url = "github:srid/himalaya/nixify-crate2nix";
+    emacs-overlay.url = "github:nix-community/emacs-overlay";
   };
 
   outputs = inputs@{ self, home-manager, nixpkgs, ... }:
@@ -29,6 +30,7 @@
           ./features/passwordstore.nix
           ./features/syncthing.nix
           ./features/email
+          ./features/emacs.nix
           ./features/monitor-brightness.nix
 
           # home-manager configuration