diff --git a/nixos/boxes/foryog/default.nix b/nixos/boxes/foryog/default.nix
index 5cdbbee7..ce39223e 100644
--- a/nixos/boxes/foryog/default.nix
+++ b/nixos/boxes/foryog/default.nix
@@ -12,6 +12,7 @@
     ./hardware-configuration.nix
     ../../backups.nix
     ../../boot.nix
+    ../../emacs
     ../../git
     ../../gnome
     ../../gui
diff --git a/nixos/home-manager/programs/emacs/default.nix b/nixos/emacs/default.nix
similarity index 76%
rename from nixos/home-manager/programs/emacs/default.nix
rename to nixos/emacs/default.nix
index 21b01962..42861939 100644
--- a/nixos/home-manager/programs/emacs/default.nix
+++ b/nixos/emacs/default.nix
@@ -4,5 +4,6 @@
   lib,
   ...
 }: {
+  services.emacs.enable = true;
   home-manager.users.cyryl = {...}: {imports = [./home.nix];};
 }
diff --git a/nixos/home-manager/programs/emacs/emacs.nix b/nixos/emacs/emacs.nix
similarity index 100%
rename from nixos/home-manager/programs/emacs/emacs.nix
rename to nixos/emacs/emacs.nix
diff --git a/nixos/home-manager/programs/emacs/home.nix b/nixos/emacs/home.nix
similarity index 100%
rename from nixos/home-manager/programs/emacs/home.nix
rename to nixos/emacs/home.nix
diff --git a/nixos/home-manager/default.nix b/nixos/home-manager/default.nix
index e172a6da..a91738f4 100644
--- a/nixos/home-manager/default.nix
+++ b/nixos/home-manager/default.nix
@@ -22,7 +22,6 @@ in {
     ./scripts.nix
 
     ./programs.nix
-    ./programs/emacs/home.nix
     ./programs/newsboat.nix
     ./programs/ssh.nix
     ./programs/tmux.nix