2 files changed, 1 insertions, 90 deletions
diff --git a/users/profiles/emacs.nix b/users/profiles/emacs.nix
deleted file mode 100644
index fcf1b8f..0000000
--- a/users/profiles/emacs.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  configPath,
-  pkgs,
-  lib,
-  ...
-}:
-let
-  packages =
-    epkgs: with epkgs; [
-      aidermacs # pair programming in Emacs with Aider
-      cape
-      consult
-      consult-denote
-      corfu
-      denote
-      denote-journal
-      denote-markdown
-      denote-org
-      denote-silo
-      denote-sequence
-      diminish
-      direnv
-      docker
-      docker-compose-mode
-      dockerfile-mode
-      exec-path-from-shell
-      git-link
-      go-mode
-      gotest
-      gptel # LLM client for Emacs
-      hcl-mode
-      jq-mode
-      json-mode
-      json-reformat
-      magit
-      marginalia
-      markdown-mode
-      nix-mode
-      orderless
-      protobuf-mode
-      rg
-      terraform-mode
-      toml-mode
-      tree-sitter
-      tree-sitter-langs
-      treesit-grammars.with-all-grammars
-      vertico
-      yaml-mode
-      yasnippet
-      yasnippet-capf
-    ];
-  emacsFiles = [
-    "early-init.el"
-    "init.el"
-    "site-lisp/init-base.el"
-    "site-lisp/init-completion.el"
-    "site-lisp/init-llm.el"
-    "site-lisp/init-programming.el"
-    "site-lisp/init-text.el"
-    "site-lisp/init-ui.el"
-  ];
-  mkEmacsFile = file: {
-    ".config/emacs/${file}" = {
-      source = "${configPath}/emacs/${file}";
-    };
-  };
-in
-{
-  home.file = lib.mkMerge (map mkEmacsFile emacsFiles);
-
-  programs.emacs = {
-    enable = true;
-    extraPackages = packages;
-    # FIXME: https://github.com/NixOS/nixpkgs/issues/395169
-    package = pkgs.emacs.override { withNativeCompilation = false; };
-  };
-
-  home.packages = with pkgs; [
-    aspell
-    aspellDicts.en
-    aspellDicts.en-science
-    aspellDicts.en-computers
-  ];
-
-  home.sessionVariables = {
-    EDITOR = "${pkgs.emacs}/bin/emacsclient -a=";
-    ASPELL_CONF = "dict-dir ${pkgs.aspellDicts.en}/lib/aspell";
-  };
-}
diff --git a/users/profiles/mac.nix b/users/profiles/mac.nix
index 85b3e7c..02f2cbd 100644
--- a/users/profiles/mac.nix
+++ b/users/profiles/mac.nix
@@ -3,7 +3,6 @@
   imports = [
     ./1password.nix
     ./dev.nix
-    ./emacs.nix
     ./fish.nix
     ./git.nix
     ./llm.nix
@@ -11,6 +10,7 @@
     ./ssh.nix
     ./starship.nix
     "${self}/users/programs/alacritty"
+    "${self}/users/programs/emacs"
     "${self}/users/programs/bat.nix"
   ];