commit c70b6b8263e469f9236b972b815bcbce4d2cc349 · pyrox.dev/nixpkgs

+23 -2

nixos/modules/services/editors/emacs.nix

···

       6
        
       

     

       7
        
         cfg = config.services.emacs;

     

       8
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       9
        
       in {

     

       10
        
       

     

       11
        
         options.services.emacs = {

     
···

       45
        
             '';

     

       46
        
           };

     

       47
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       48
        
         };

     

       49
        
       

     

       50
        
         config = mkIf (cfg.enable || cfg.install) {

     
···

       59
        
             };

     

       60
        
           } // optionalAttrs cfg.enable { wantedBy = [ "default.target" ]; };

     

       61
        
       

     

       62
       -
           environment.systemPackages = [ cfg.package ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       63
        
         };

     

       64
       -
       

     

       65
        
       }

···

       6
        
       

     

       7
        
         cfg = config.services.emacs;

     

       8
        
       

     

       9
       +
         editorScript = pkgs.writeScriptBin "emacseditor" ''

     

       10
       +
           #!${pkgs.stdenv.shell}

     

       11
       +
           if [ -z "$1" ]; then

     

       12
       +
             exec ${cfg.package}/bin/emacsclient --create-frame --alternate-editor ${cfg.package}/bin/emacs

     

       13
       +
           else

     

       14
       +
             exec ${cfg.package}/bin/emacsclient --alternate-editor ${cfg.package}/bin/emacs "$@"

     

       15
       +
           fi

     

       16
       +
         '';

     

       17
       +
       

     

       18
        
       in {

     

       19
        
       

     

       20
        
         options.services.emacs = {

     
···

       54
        
             '';

     

       55
        
           };

     

       56
        
       

     

       57
       +
           defaultEditor = mkOption {

     

       58
       +
             type = types.bool;

     

       59
       +
             default = false;

     

       60
       +
             example = true;

     

       61
       +
             description = ''

     

       62
       +
               When enabled, configures emacsclient to be the default editor

     

       63
       +
               using the EDITOR environment variable.

     

       64
       +
             '';

     

       65
       +
           };

     

       66
        
         };

     

       67
        
       

     

       68
        
         config = mkIf (cfg.enable || cfg.install) {

     
···

       77
        
             };

     

       78
        
           } // optionalAttrs cfg.enable { wantedBy = [ "default.target" ]; };

     

       79
        
       

     

       80
       +
           environment.systemPackages = [ cfg.package editorScript ];

     

       81
       +
       

     

       82
       +
           environment.variables = if cfg.defaultEditor then {

     

       83
       +
             EDITOR = mkOverride 900 "${editorScript}/bin/emacseditor";

     

       84
       +
           } else {};

     

       85
        
         };

     

       0
        
       
     

       86
        
       }