okay back to normal
This commit is contained in:
parent
03d48de760
commit
03501566c0
1 changed files with 0 additions and 13 deletions
|
@ -20,20 +20,7 @@ in {
|
|||
services.emacs = {
|
||||
enable = cfg.daemon;
|
||||
install = true;
|
||||
<<<<<<< HEAD
|
||||
package = pkgs.emacs29-pgtk;
|
||||
=======
|
||||
# package = pkgs.emacs29-pgtk;
|
||||
package = pkgs.emacsWithPackagesFromUsePackage {
|
||||
# org mode files are borked with this right now
|
||||
config = ../../../../config/emacs/init.el;
|
||||
|
||||
defaultInitFile = true;
|
||||
|
||||
package = pkgs.emacs29-pgtk;
|
||||
|
||||
};
|
||||
>>>>>>> parent of 0b03caa (please)
|
||||
};
|
||||
users.users.sako.packages = with pkgs; [
|
||||
# direnv
|
||||
|
|
Loading…
Reference in a new issue