Upgrade Emacs to 29.1 for Doom

shajra · Oct 11, 2023 · c517ea5 · c517ea5
1 parent df4c586
commit c517ea5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/home/modules/base/tui/all/programs/starship/default.nix b/home/modules/base/tui/all/programs/starship/default.nix
@@ -1,7 +1,7 @@
 {
     enable = true;
     settings = {
-        cmd_duration.show_notifications = true;
+        cmd_duration.show_notifications = false;
         status.disabled = false;
         status.format = "[$symbol $status]($style)";
     };

diff --git a/home/modules/base/tui/linux/default.nix b/home/modules/base/tui/linux/default.nix
@@ -20,10 +20,9 @@ in
     # DESIGN: DEBUG: removing to understand infinite recursion
     #programs.direnv-nix-lorelei.enable = true;
 
-    # DESIGN: Emacs 29+ (emacsUnstable) isn't supported
-    # Emacs 28 is now standard in nixpkgs-unstable
-    # https://github.com/doomemacs/doomemacs#prerequisites
-    #programs.emacs.package = pkgs.emacsUnstable;
+    # DESIGN: https://github.com/doomemacs/doomemacs#prerequisites
+    # using emacs29 over emacs-unstable to hit Nixpkgs cache
+    programs.emacs.package = pkgs.emacs29;
 
     services.emacs = import services/emacs;
     services.gpg-agent.enable = true;

diff --git a/home/target/shajra/home/file/default.nix b/home/target/shajra/home/file/default.nix
@@ -7,6 +7,7 @@ in
     ".chrome-remote-desktop-session".text = ''
         systemctl --user start --wait gpg-agent.service
         systemctl --user start --wait clipmenu.service
+        export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/$(id -u)/bus"
         export SSH_AUTH_SOCK="$("${gpg}/bin/gpgconf" --list-dirs agent-ssh-socket)"
         . ~/.xsession
     '';

diff --git a/packages.nix b/packages.nix
@@ -264,9 +264,9 @@ in {
     ];
 
     nixpkgs.build.unused.linux = np.pick { linux = "home"; } [
-        # DESIGN: Not using because Doom doesn't support 29+
-        # https://github.com/doomemacs/doomemacs#prerequisites
-        #"emacsUnstable"
+        # DESIGN: https://github.com/doomemacs/doomemacs#prerequisites
+        # using emacs29 over emacs-unstable to hit Nixpkgs cache
+        "emacs29"
     ];
 
     haskell-nix.prebuilt.programming.haskell = {