From 03501566c0d80d94118e7e66c2bd4ad87481ff78 Mon Sep 17 00:00:00 2001
From: Sakooooo <78461130+Sakooooo@users.noreply.github.com>
Date: Mon, 25 Dec 2023 14:21:18 +0400
Subject: [PATCH] okay back to normal

---
 modules/dev/editors/emacs/default.nix | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/modules/dev/editors/emacs/default.nix b/modules/dev/editors/emacs/default.nix
index fffa8199..e01ba9b5 100644
--- a/modules/dev/editors/emacs/default.nix
+++ b/modules/dev/editors/emacs/default.nix
@@ -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