summary refs log tree commit diff
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2018-04-16 20:04:52 +0800
committerGitHub <noreply@github.com>2018-04-16 20:04:52 +0800
commit247c97b6998d3ef65a0dd1924cf1e197d44c9e7a (patch)
treee78af1f0cb881d92d4a3d4272be55cb0b4b089c4
parentbd4ad008dd2bfe60f7473cbf652ed3c1b11f4955 (diff)
parent9580f22115dc602ad66b318755937c5444f37d3f (diff)
downloadnixpkgs-247c97b6998d3ef65a0dd1924cf1e197d44c9e7a.tar
nixpkgs-247c97b6998d3ef65a0dd1924cf1e197d44c9e7a.tar.gz
nixpkgs-247c97b6998d3ef65a0dd1924cf1e197d44c9e7a.tar.bz2
nixpkgs-247c97b6998d3ef65a0dd1924cf1e197d44c9e7a.tar.lz
nixpkgs-247c97b6998d3ef65a0dd1924cf1e197d44c9e7a.tar.xz
nixpkgs-247c97b6998d3ef65a0dd1924cf1e197d44c9e7a.tar.zst
nixpkgs-247c97b6998d3ef65a0dd1924cf1e197d44c9e7a.zip
Merge pull request #35896 from wucke13/master
Solving #30396
-rw-r--r--nixos/modules/services/editors/emacs.nix21
1 files changed, 20 insertions, 1 deletions
diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix
index bbc9bcf3dae..ba7ec967919 100644
--- a/nixos/modules/services/editors/emacs.nix
+++ b/nixos/modules/services/editors/emacs.nix
@@ -15,6 +15,25 @@ let
     fi
   '';
 
+desktopApplicationFile = pkgs.writeTextFile {
+  name = "emacsclient.desktop";
+  destination = "/share/applications/emacsclient.desktop";
+  text = ''
+[Desktop Entry]
+Name=Emacsclient
+GenericName=Text Editor
+Comment=Edit text
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+Exec=emacseditor %F
+Icon=emacs
+Type=Application
+Terminal=false
+Categories=Development;TextEditor;
+StartupWMClass=Emacs
+Keywords=Text;Editor;
+'';
+};
+
 in {
 
   options.services.emacs = {
@@ -74,7 +93,7 @@ in {
       };
     } // optionalAttrs cfg.enable { wantedBy = [ "default.target" ]; };
 
-    environment.systemPackages = [ cfg.package editorScript ];
+    environment.systemPackages = [ cfg.package editorScript desktopApplicationFile ];
 
     environment.variables = {
       # This is required so that GTK applications launched from Emacs