diff --git a/flake.lock b/flake.lock
index 739fdd4..b583436 100644
--- a/flake.lock
+++ b/flake.lock
@@ -80,11 +80,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1621840840,
-        "narHash": "sha256-o6h6+d5ZwrFmOTe+ma9s1Z9kyHsCW1C84IA8RZ9/fIU=",
+        "lastModified": 1622103435,
+        "narHash": "sha256-5i5mGg402AANnSRQmWVo7lqiyw3taoMwX26oslOD9c4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ea7d4aa9b8225abd6147339f0d56675d6f1f0fd1",
+        "rev": "5658fadedb748cb0bdbcb569a53bd6065a5704a9",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 7f37115..1dcdcf8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,6 +27,9 @@
         # enabling window-manager
         (import ./modules/bspwm)
 
+        # emacs + package override
+        (import ./modules/emacs)
+
         # disk partitions and such (plus more that needs to be taken out)
         (import ./hardware/iwakura)
 
diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix
new file mode 100644
index 0000000..efc7e01
--- /dev/null
+++ b/modules/emacs/default.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }: {
+  nixpkgs.overlays = [
+    (import ../../overlays/emacs.nix)
+  ];
+  services.emacs = {
+    enable = true;
+    defaultEditor = true;
+  };
+}
diff --git a/modules/emacs/home.nix b/modules/emacs/home.nix
new file mode 100644
index 0000000..3dbaf70
--- /dev/null
+++ b/modules/emacs/home.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }: {
+  home.file.".emacs".text = ''
+    (require 'package)
+    (setq package-archives nil)
+    (setq package-enable-at-startup nil)
+    (package-initialize)
+  '';
+}
diff --git a/overlays/emacs.nix b/overlays/emacs.nix
new file mode 100644
index 0000000..25e7b14
--- /dev/null
+++ b/overlays/emacs.nix
@@ -0,0 +1,20 @@
+final: prev:
+let
+  myEmacs = prev.emacs;
+  emacsWithPackages = (prev.emacsPackagesGen myEmacs).emacsWithPackages;
+in {
+  emacs = emacsWithPackages (epkgs:
+    (with epkgs.melpaStablePackages; [
+      magit
+      zerodark-theme
+    ]) ++ (with epkgs.melpaPackages; [
+      # undo-tree
+      # zoom-frm
+    ]) ++ (with epkgs.elpaPackages; [
+      auctex
+      beacon
+      nameless
+    ]) ++ [
+      #prev.notmuch
+    ]);
+}
diff --git a/users/thorn/home.nix b/users/thorn/home.nix
index 02b605a..07699b5 100755
--- a/users/thorn/home.nix
+++ b/users/thorn/home.nix
@@ -17,6 +17,7 @@
     ../../modules/urxvt/home.nix
     ../../modules/picom/home.nix
     ../../modules/zsh/home.nix
+    ../../modules/emacs/home.nix
 
     ./fonts/home.nix
     ./xresources.nix