2 files changed, 20 insertions, 3 deletions
diff --git a/home-manager/.config/home-manager/common/default.nix b/home-manager/.config/home-manager/common/default.nix
index e825779..15e760b 100644
--- a/home-manager/.config/home-manager/common/default.nix
+++ b/home-manager/.config/home-manager/common/default.nix
@@ -6,9 +6,6 @@
     sessionPath = [
     	"$HOME/.config/home-manager/common/scripts"
     ];
-    sessionVariables = {
-      EDITOR = "hx";
-    };
     shellAliases = {
       l = "ls -l";
       ll = "ls -al";
@@ -22,6 +19,7 @@
       conf = "$EDITOR ~/.config/home-manager/common/default.nix";
       up = "cd ~/.config/home-manager && home-manager switch";
       za = "zellij attach $(zellij ls -s -r -n | head -n 1)";
+      ce = "$EDITOR ~/.config/home-manager/common/emacs/init.el";
     };
     stateVersion = "23.05";
     packages = with pkgs; [
diff --git a/home-manager/.config/home-manager/per-user/kdam0-arti/home.nix b/home-manager/.config/home-manager/per-user/kdam0-arti/home.nix
index c5f14ec..85221c9 100644
--- a/home-manager/.config/home-manager/per-user/kdam0-arti/home.nix
+++ b/home-manager/.config/home-manager/per-user/kdam0-arti/home.nix
@@ -163,6 +163,25 @@
     enable = true;
   };
 
+  programs.emacs = {
+    enable = true;
+    extraPackages = epkgs: [
+      epkgs.emms
+      epkgs.magit
+    ];
+  };
+
+  services.emacs = {
+    enable = true;
+    client.enable = true;
+    defaultEditor = true;
+  };
+
+  home.file.".config/emacs" = {
+    source = ./../../common/emacs/init.el;
+    recursive = true;
+  }
+
   services.syncthing = {
     enable = true;
   };