From 19ccbd7e90e22dac8bb9ceb644bbf75e7aa1c53f Mon Sep 17 00:00:00 2001
From: Sakooooo <78461130+Sakooooo@users.noreply.github.com>
Date: Mon, 25 Dec 2023 14:18:16 +0400
Subject: [PATCH] remove emacs overlay

---
 flake.nix                             |  4 ----
 modules/dev/editors/emacs/default.nix | 25 ++++++-------------------
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/flake.nix b/flake.nix
index a81bb6ab..f0e2ee9a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,10 +21,6 @@
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    emacs-overlay = {
-      url = "github:nix-community/emacs-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs = {
diff --git a/modules/dev/editors/emacs/default.nix b/modules/dev/editors/emacs/default.nix
index cc65834b..e01ba9b5 100644
--- a/modules/dev/editors/emacs/default.nix
+++ b/modules/dev/editors/emacs/default.nix
@@ -16,34 +16,21 @@ in {
   };
 
   config = mkIf cfg.enable {
-    # import overlay
-    nixpkgs.overlays = [
-      inputs.emacs-overlay.overlay
-    ];
-
     # ues daemon
     services.emacs = {
       enable = cfg.daemon;
       install = true;
-      #package = pkgs.emacs29-pgtk;
-      package = pkgs.emacsWithPackagesFromUsePackage {
-        config = ../../../../config/emacs/init.el;
-
-        defaultInitFile = true;
-
-        package = pkgs.emacs29-pgtk;
-
-      };
+      package = pkgs.emacs29-pgtk;
     };
     users.users.sako.packages = with pkgs; [
       # direnv
       direnv
     ];
-    # home-manager.users.sako.home.file.".emacs.d" = {
-    #   enable = true;
-    #   source = ../../../../config/emacs;
-    #   recursive = true;
-    # };
+    home-manager.users.sako.home.file.".emacs.d" = {
+      enable = true;
+      source = ../../../../config/emacs;
+      recursive = true;
+    };
     fonts.packages = with pkgs; [
       (nerdfonts.override {fonts = ["JetBrainsMono"];})
       jetbrains-mono