emacs: misc updates

* Remove copilot override

* Add copilot-chat

* Use tecosaur's org-mode with upgraded org-latex-preview

Author: mcwitt

modules/common/home-manager/profiles/base/emacs/default.nix

@@ -28,36 +28,9 @@
 
     programs.emacs.extraPackages = epkgs: [ epkgs.treesit-grammars.with-all-grammars ];
 
-    programs.emacs.overrides =
-      final: prev:
-      let
-        inherit (final) trivialBuild;
-      in
-      {
-
-        copilot = trivialBuild {
-          pname = "copilot";
-          version = "0-unstable-2024-09-25";
-          src = pkgs.fetchFromGitHub {
-            owner = "zerolfx";
-            repo = "copilot.el";
-            rev = "b5878d6a8c741138b5efbf4fe1c594f3fd69dbdd";
-            sha256 = "sha256-02ywlMPku1FIritZjjtxbQW6MmPvSwmRCrudYsUb8bU=";
-          };
-          packageRequires = with final; [
-            dash
-            editorconfig
-            f
-            jsonrpc
-            s
-          ];
-          postInstall = ''
-            cp -r $src $LISPDIR
-          '';
-        };
-
-        eglot = null; # use built-in package
-      };
+    programs.emacs.overrides = _: _: {
+      eglot = null; # use built-in package
+    };
 
     programs.emacs.init = {
       enable = true;
@@ -300,6 +273,8 @@
         '';
       };
 
+      copilot-chat.enable = true;
+
       csv-mode.enable = true;
 
       edit-indirect.enable = true;

modules/common/home-manager/profiles/base/emacs/org.nix

@@ -1,7 +1,41 @@
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 {
   config = lib.mkIf config.profiles.base.enable {
 
+    programs.emacs.overrides = self: _: {
+      # org-mode with upgraded org-latex-preview
+      # https://code.tecosaur.net/tec/org-mode
+      # TODO: remove once changes are merged
+      org =
+        let
+          rev = "cd2269ddb64bda7203acf2ee2e26188237a578ea";
+        in
+        self.trivialBuild {
+          pname = "org";
+          version = "9.7.26+${builtins.substring 0 7 rev}";
+          src = pkgs.fetchgit {
+            name = "org-src";
+            url = "https://code.tecosaur.net/tec/org-mode.git";
+            inherit rev;
+            hash = "sha256-mw11v3r+6/xCTaYht/hD+/Nhd+gIcOmAbtEJUGMiphA=";
+          };
+          installPhase = ''
+            runHook preInstall
+
+            LISPDIR=$out/share/emacs/site-lisp
+            install -d $LISPDIR
+            install lisp/*.el lisp/*.elc $LISPDIR
+
+            runHook postInstall
+          '';
+        };
+    };
+
     programs.emacs.init.usePackage = {
 
       frames-only-mode.config = lib.mkBefore ''
@@ -90,11 +124,6 @@
         '';
       };
 
-      org-fragtog = {
-        enable = true;
-        hook = [ ''(org-mode . org-fragtog-mode)'' ];
-      };
-
       org-protocol.enable = true;
 
       org-roam = {

modules/common/home-manager/profiles/personal/default.nix

@@ -85,27 +85,7 @@ in
 
     programs.texlive = {
       enable = true;
-      extraPackages = tpkgs: {
-        inherit (tpkgs)
-          scheme-basic
-
-          # packages required for Org Mode latex export (see org-latex-default-packages-alist documentation)
-          dvipng
-          dvisvgm
-          wrapfig
-          ulem
-          amsmath
-          capt-of
-          hyperref
-
-          # not mentioned but required
-          minted
-          newfloat
-
-          # not packaged nixpkgs.texlive?
-          # inputenc fontenc graphicx longtable rotating amssymb
-          ;
-      };
+      extraPackages = tpkgs: { inherit (tpkgs) scheme-full; };
     };
 
     tools = {