diff --git a/flake.nix b/flake.nix
index 94b3f3a..07d778f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,7 +24,7 @@
         ./formatter
       ];
     };
-
+  
   nixConfig = {
     extra-substituters = [
       "https://aciceri-emacs.cachix.org"
diff --git a/hmModules/default.nix b/hmModules/default.nix
index 741f062..a0421f2 100644
--- a/hmModules/default.nix
+++ b/hmModules/default.nix
@@ -31,11 +31,13 @@
             package = ccrEmacsConfig.package;
           };
           services.emacs = {
-            enable = true;
-            client.enable = true;
-            defaultEditor = true;
-            socketActivation.enable = true;
-            startWithUserSession = true;
+            # TODO Re-enable, this is causing some problems with magit, probably it
+            # would be sufficient disabling `socketActivation`
+            enable = false;
+            client.enable = false;
+            defaultEditor = false;
+            socketActivation.enable = false;
+            startWithUserSession = false;
           };
           home.packages = with pkgs;
             [