2 files changed, 15 insertions, 1 deletions
diff --git a/share/system/client-common.nix b/share/system/client-common.nix
index 49e2472..aa8550f 100644
--- a/share/system/client-common.nix
+++ b/share/system/client-common.nix
@@ -1,10 +1,14 @@
 # Common configuration options for client machines (i.e. not servers)
 { inputs, pkgs, ... }:
 {
-  imports = [ ./steam.nix ];
+  imports = [
+    ./steam.nix
+    ./emacs.nix
+  ];
   nixpkgs = {
     overlays = [
       inputs.rust-overlay.overlays.default
+      inputs.emacs-overlay.overlays.default
       (import ../overlay.nix)
     ];
     config = {
diff --git a/share/system/emacs.nix b/share/system/emacs.nix
new file mode 100644
index 0000000..c846ad7
--- /dev/null
+++ b/share/system/emacs.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+  services.emacs = {
+    enable = true;
+    install = true;
+    package = pkgs.sorremacs;
+  };
+
+  environment.systemPackages = [ pkgs.sorremacs ];
+}