diff --git a/base/gui-programs.nix b/base/gui-programs.nix
index eda1712..c34a688 100644
--- a/base/gui-programs.nix
+++ b/base/gui-programs.nix
@@ -3,6 +3,7 @@
   environment.systemPackages = with pkgs; [
     alacritty
     discord
+    emacsPgtkGcc
     feh
     firefox
     flameshot
diff --git a/base/nix.nix b/base/nix.nix
index 825843f..8edfa63 100644
--- a/base/nix.nix
+++ b/base/nix.nix
@@ -10,9 +10,11 @@
 
     binaryCaches = [
       "https://alarsyo.cachix.org"
+      "https://nix-community.cachix.org"
     ];
     binaryCachePublicKeys = [
       "alarsyo.cachix.org-1:A6BmcaJek5+ZDWWv3fPteHhPm6U8liS9CbDbmegPfmk="
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
     ];
 
     gc = {
diff --git a/flake.lock b/flake.lock
index c4d9156..9ea516f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "emacs-overlay": {
+      "locked": {
+        "lastModified": 1618653777,
+        "narHash": "sha256-jSG1i83pmKwAx6QtkVjyCQT+/LvMEMEVeVDZcOFjRTg=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "905883cd5de24958bfd354c6e335f38f667e7ede",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "master",
+        "repo": "emacs-overlay",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1618149891,
@@ -34,6 +50,7 @@
     },
     "root": {
       "inputs": {
+        "emacs-overlay": "emacs-overlay",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
diff --git a/flake.nix b/flake.nix
index 9c774b2..e3ebce8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,9 +3,10 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-20.09";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+    emacs-overlay.url = "github:nix-community/emacs-overlay/master";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable }: {
+  outputs = { self, nixpkgs, nixpkgs-unstable, emacs-overlay }: {
     nixosConfigurations.poseidon = nixpkgs.lib.nixosSystem rec {
       system = "x86_64-linux";
       modules =
@@ -35,6 +36,10 @@
       modules =
         [
           ./boreal.nix
+
+          {
+            nixpkgs.overlays = [ emacs-overlay.overlay ];
+          }
         ];
     };
   };
diff --git a/hosts/boreal/default.nix b/hosts/boreal/default.nix
index 0d29b09..71615c6 100644
--- a/hosts/boreal/default.nix
+++ b/hosts/boreal/default.nix
@@ -69,6 +69,11 @@ in
       layout = "fr";
       xkbVariant = "us";
     };
+
+    emacs = {
+      enable = true;
+      package = pkgs.emacsPgtkGcc;
+    };
   };
 
   sound.enable = true;