Emacs: Add emacs overlay emacsoverlay

5 files changed, 12 insertions, 35 deletions

diff --git a/dotfiles/.emacs b/dotfiles/.emacs
index 847d0b6..004babb 100644
--- a/dotfiles/.emacs
+++ b/dotfiles/.emacs
@@ -17,6 +17,9 @@
   (straight-use-package-by-default t))
 ;; bootstrap straight end
 
+(use-package bind-key
+  :ensure t)
+
 (use-package which-key
   :ensure t)
 
@@ -127,10 +130,8 @@
   ("C-p" . consult-find)
   ("C-S-p" . consult-ripgrep)))
 
-(use-package savehist
-  :ensure t
-  :init
-  (savehist-mode))
+
+  (savehist-mode)
 
 (use-package projectile
   :ensure t
diff --git a/flake.lock b/flake.lock
index 09a63b7..f172008 100644
--- a/flake.lock
+++ b/flake.lock
Binary files differdiff --git a/flake.nix b/flake.nix
index 44604b8..accd558 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,6 +29,8 @@
 
     nix-index.url = "github:Mic92/nix-index-database";
 
+    emacs-overlay.url = "github:nix-community/emacs-overlay";
+
     hosts = {
       url = "github:StevenBlack/hosts";
       flake = false;
diff --git a/hosts/default.nix b/hosts/default.nix
index 6808208..e208813 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -11,6 +11,7 @@ let
         };
         overlays = [
           inputs.nur.overlay
+          inputs.emacs-overlay.overlay
           (import ../packages)
           (import ../overlays)
         ] ++ extraOverlays;
diff --git a/hosts/home.nix b/hosts/home.nix
index e615a96..2188e72 100644
--- a/hosts/home.nix
+++ b/hosts/home.nix
@@ -155,37 +155,10 @@
 
     emacs = {
       enable = true;
-      extraPackages = epkgs: with epkgs; [
-        use-package
-
-        direnv
-
-        evil
-        evil-collection
-
-        doom-modeline
-        dashboard
-
-        projectile
-        lsp-ui
-
-        lsp-bridge
-        rust-mode
-        rustic
-        company
-        flycheck
-        lsp-haskell
-
-        nix-mode
-        haskell-mode
-        typescript-mode
-        jq-mode
-
-        doom-themes
-
-        dired-sidebar
-      ];
-      extraConfig = builtins.readFile "${dotfiles}/.emacs";
+      package = (pkgs.emacsWithPackagesFromUsePackage {
+        config = "${dotfiles}/.emacs";
+        defaultInitFile = true;
+      });
     };
 
     firefox = {