Merge branch 'master' of github.com:aciceri/emacs
This commit is contained in:
commit
39bc619beb
2 changed files with 8 additions and 6 deletions
|
@ -31,11 +31,13 @@
|
|||
package = ccrEmacsConfig.package;
|
||||
};
|
||||
services.emacs = {
|
||||
enable = true;
|
||||
client.enable = true;
|
||||
defaultEditor = true;
|
||||
socketActivation.enable = true;
|
||||
startWithUserSession = true;
|
||||
# TODO Re-enable, this is causing some problems with magit, probably it
|
||||
# would be sufficient disabling `socketActivation`
|
||||
enable = false;
|
||||
client.enable = false;
|
||||
defaultEditor = false;
|
||||
socketActivation.enable = false;
|
||||
startWithUserSession = false;
|
||||
};
|
||||
home.packages = with pkgs;
|
||||
[
|
||||
|
|
Reference in a new issue