diff --git a/modules/basic-tools/default.nix b/modules/basic-tools/default.nix
index 3ed4f9f..07d14cb 100644
--- a/modules/basic-tools/default.nix
+++ b/modules/basic-tools/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 
 {
   imports = [
@@ -36,11 +36,20 @@
     ouch
   ];
 
-  environment.variables = {
-    EDITOR = "nvim";
-    PAGER = "less";
-    LESS = "-X -R -F";
-  };
+  environment.variables =
+    let
+      editorconf =
+        if config.services.emacs.defaultEditor then
+          { }
+        else
+          {
+            EDITOR = "nvim";
+          };
+    in
+    {
+      PAGER = "less";
+      LESS = "-X -R -F";
+    } // editorconf;
 
   environment.shellAliases = {
     ls = "ls --color=auto";
diff --git a/modules/emacs.nix b/modules/emacs.nix
index a033a54..5f273aa 100644
--- a/modules/emacs.nix
+++ b/modules/emacs.nix
@@ -14,8 +14,9 @@
     enable = false;
     package = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages (epkgs: with epkgs; [
       vterm
+      pdf-tools
     ]));
-    defaultEditor = false;
+    defaultEditor = true;
   };
 
 }