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