Reapply "Update mimeapps to use emacs instead of emacsclient"

This reverts commit 127a87c6cd.
This commit is contained in:
Evie Litherland-Smith 2025-03-04 06:37:44 +00:00
parent 5b500a64cd
commit 9111eb22fb
3 changed files with 6 additions and 11 deletions

View file

@ -1,6 +1,4 @@
{ {
config,
lib,
pkgs, pkgs,
config, config,
... ...
@ -13,12 +11,9 @@
../texlive/default.nix ../texlive/default.nix
../programming/default.nix ../programming/default.nix
]; ];
services.emacs = { home.sessionVariables = with config.programs; {
enable = lib.mkDefault true; EDITOR = "${emacs.finalPackage}/bin/emacs -nw";
package = config.programs.emacs.finalPackage; VISUAL = "${emacs.finalPackage}/bin/emacs";
defaultEditor = true;
client.enable = true;
socketActivation.enable = true;
}; };
programs.emacs = { programs.emacs = {
enable = true; enable = true;

View file

@ -347,7 +347,7 @@
# Common program shortcuts # Common program shortcuts
"SUPER, D, exec, ${config.programs.fuzzel.package}/bin/fuzzel" "SUPER, D, exec, ${config.programs.fuzzel.package}/bin/fuzzel"
"SUPER, C, exec, ${config.programs.alacritty.package}/bin/alacritty" "SUPER, C, exec, ${config.programs.alacritty.package}/bin/alacritty"
"SUPER, E, exec, ${config.programs.emacs.finalPackage}/bin/emacsclient -c" "SUPER, E, exec, ${config.programs.emacs.finalPackage}/bin/emacs"
"SUPER, W, exec, ${config.programs.firefox.finalPackage}/bin/firefox" "SUPER, W, exec, ${config.programs.firefox.finalPackage}/bin/firefox"
"SUPER, F, exec, ${pkgs.nautilus}/bin/nautilus" "SUPER, F, exec, ${pkgs.nautilus}/bin/nautilus"

View file

@ -1,5 +1,5 @@
let let
emacs = [ "emacsclient.desktop" ]; emacs = [ "emacs.desktop" ];
browser = [ "firefox.desktop" ]; browser = [ "firefox.desktop" ];
in in
{ {
@ -65,7 +65,7 @@ in
"x-scheme-handler/chrome" = browser; "x-scheme-handler/chrome" = browser;
"x-scheme-handler/webcal" = browser; "x-scheme-handler/webcal" = browser;
"x-scheme-handler/geo" = [ "openstreetmap-geo-handler.desktop" ]; "x-scheme-handler/geo" = [ "openstreetmap-geo-handler.desktop" ];
"x-scheme-handler/mailto" = [ "emacsclient-mail.desktop" ]; "x-scheme-handler/mailto" = [ "emacs-mail.desktop" ];
"x-scheme-handler/unknown" = emacs; "x-scheme-handler/unknown" = emacs;
"x-scheme-handler/prusaslicer" = [ "PrusaSlicerURLProtocol.desktop" ]; "x-scheme-handler/prusaslicer" = [ "PrusaSlicerURLProtocol.desktop" ];