1 files changed, 0 insertions, 40 deletions
diff --git a/system/modules/user-interface.nix b/system/modules/user-interface.nix
index 4a1c0053..c913bc70 100644
--- a/system/modules/user-interface.nix
+++ b/system/modules/user-interface.nix
@@ -1,45 +1,8 @@
 { config, pkgs, lib, makeDesktopItem, ... }:
 
-let
-  emacsPackage = import ../packages/emacs.nix {
-    pkgs = pkgs.unstable;
-    emacs = pkgs.unstable.emacs.override {
-      withGTK3 = false;
-    };
-  };
-  editorScript = pkgs.writeScriptBin "edit" ''
-    #!${pkgs.runtimeShell}
-    if [ -z "$1" ]; then
-      exec ${emacsPackage}/bin/emacsclient --create-frame --alternate-editor ${emacsPackage}/bin/emacs
-    else
-      exec ${emacsPackage}/bin/emacsclient --alternate-editor ${emacsPackage}/bin/emacs "$@"
-    fi
-  '';
-  desktopApplicationFile = makeDesktopItem {
-    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=${editorScript}/bin/edit %F
-      Icon=emacs
-      Type=Application
-      Terminal=false
-      Categories=Development;TextEditor;
-      StartupWMClass=Emacs
-      Keywords=Text;Editor;
-    '';
-  };
-in
 { documentation.info.enable = true;
   nixpkgs.config.firefox.enableOfficialBranding = true;
 
-  nixpkgs.config.packageOverrides = pkgs: {
-    myEmacs = emacsPackage;
-  };
   environment.systemPackages = with pkgs; [
     aria2
     firefox
@@ -51,8 +14,6 @@ in
     cmus
 
     fish # for emacs-fish-completion
-    myEmacs
-    editorScript
 
     unstable.xst # st, but with support for XResources
 
@@ -120,7 +81,6 @@ in
     # This is required so that GTK applications launched from Emacs
     # get properly themed:
     GTK_DATA_PREFIX = "${config.system.path}";
-    EDITOR = lib.mkOverride 900 "${editorScript}/bin/edit";
   };
 
   services.redshift = {