Use emacsUnstable (27)

also doing this in home rather than system

3 files changed, 15 insertions, 43 deletions

diff --git a/home/modules/emacs.nix b/home/modules/emacs.nix
index 80116312e9..71d7cbf70e 100644
--- a/home/modules/emacs.nix
+++ b/home/modules/emacs.nix
@@ -29,10 +29,24 @@ in {
 
     ispell
 
+    ripgrep
+    coreutils
+    fd
+    clang
     gnutls
   ];
 
-  programs.emacs.enable = true;
+  nixpkgs.overlays = [
+    (import (builtins.fetchTarball {
+      url = "https://github.com/nix-community/emacs-overlay/archive/54afb061bdd12c61bbfcc13bad98b7a3aab7d8d3.tar.gz";
+      sha256 = "0hrbg65d5h0cb0nky7a46md7vlvhajq1hf0328l2f7ln9hznqz6j";
+    }))
+  ];
+
+  programs.emacs = {
+    enable = true;
+    package = pkgs.emacsUnstable;
+  };
 
   impure.clonedRepos = {
     orgClubhouse = {
diff --git a/system/modules/common.nix b/system/modules/common.nix
index 7d940beebb..74e7729ef3 100644
--- a/system/modules/common.nix
+++ b/system/modules/common.nix
@@ -5,7 +5,6 @@
     [
       ./xserver.nix
       ./fonts.nix
-      ./emacs.nix
       ./sound.nix
       ./kernel.nix
       /home/grfn/code/urb/urbos/system
diff --git a/system/modules/emacs.nix b/system/modules/emacs.nix
deleted file mode 100644
index 480711b978..0000000000
--- a/system/modules/emacs.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ config, pkgs, lib, ... }:
-with lib;
-{
-  options = {
-    programs.emacs.useGit = mkOption {
-      description = "Use emacs from git";
-      type = types.bool;
-      default = false;
-    };
-
-    programs.emacs.useUnstable = mkOption {
-      description = "Use emacs unstable";
-      type = types.bool;
-      default = false;
-    };
-  };
-
-  config = {
-    nixpkgs.overlays = [
-      (import (builtins.fetchTarball {
-        url = "https://github.com/nix-community/emacs-overlay/archive/54afb061bdd12c61bbfcc13bad98b7a3aab7d8d3.tar.gz";
-        sha256 = "0hrbg65d5h0cb0nky7a46md7vlvhajq1hf0328l2f7ln9hznqz6j";
-      }))
-    ];
-
-    environment.systemPackages = with pkgs; [
-      (if config.programs.emacs.useGit
-       then emacsGit
-       else
-         if config.programs.emacs.useUnstable
-         then emacsUnstable
-         else emacs)
-      ripgrep
-      coreutils
-      fd
-      clang
-    ];
-
-    programs.emacs.useUnstable = true;
-  };
-}