diff --git a/users/common/default.nix b/users/common/default.nix
index f9dfb30..89d0d0e 100644
--- a/users/common/default.nix
+++ b/users/common/default.nix
@@ -1,5 +1,5 @@
 { ... }:
 
 {
-  imports = [ ./home.nix ./programs.nix ];
+  imports = [ ./home.nix ./programs.nix ./services.nix ];
 }
diff --git a/users/common/home.nix b/users/common/home.nix
index e76a97e..bda25e9 100644
--- a/users/common/home.nix
+++ b/users/common/home.nix
@@ -5,10 +5,7 @@
     username = "user";
     homeDirectory = "/home/user";
     stateVersion = "22.05";
-    sessionVariables = {
-      EDITOR = "micro";
-      TZ = ":/etc/localtime";
-    };
+    sessionVariables = { TZ = ":/etc/localtime"; };
     file = {
       ".config/starship.toml".source =
         "${inputs.dotfiles}/.config/starship.toml";
diff --git a/users/common/services.nix b/users/common/services.nix
new file mode 100644
index 0000000..7e786cd
--- /dev/null
+++ b/users/common/services.nix
@@ -0,0 +1,9 @@
+{ inputs, config, pkgs, lib, ... }:
+
+{
+  services.emacs = {
+    enable = true;
+    defaultEditor = true;
+    socketActivation.enable = true;
+  };
+}