okay back to normal

This commit is contained in:
Sakooooo 2023-12-25 14:21:18 +04:00
parent 03d48de760
commit 03501566c0
Signed by: sako
GPG key ID: FE52FD65B76E4751

View file

@ -20,20 +20,7 @@ in {
services.emacs = { services.emacs = {
enable = cfg.daemon; enable = cfg.daemon;
install = true; install = true;
<<<<<<< HEAD
package = pkgs.emacs29-pgtk; 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; [ users.users.sako.packages = with pkgs; [
# direnv # direnv