diff --git a/common/config/packages.nix b/common/config/packages.nix index 289b1fb..86f1664 100644 --- a/common/config/packages.nix +++ b/common/config/packages.nix @@ -1,4 +1,4 @@ -{ config, pkgs, emacs-overlay, ... }: +{ config, pkgs, ... }: let # nix-direnv with flake support nix-direnv-with-flakes = pkgs.nix-direnv.override { enableFlakes = true; }; @@ -34,9 +34,8 @@ in { services.gnome.gnome-keyring.enable = true; - nixpkgs.overlays = [ emacs-overlay.overlay ]; services.emacs.enable = true; - services.emacs.package = pkgs.emacsPgtkNativeComp; + services.emacs.package = pkgs.emacs28-gtk; # direnv setup diff --git a/flake.lock b/flake.lock index 086430d..2c56e79 100644 --- a/flake.lock +++ b/flake.lock @@ -1,41 +1,5 @@ { "nodes": { - "emacs-overlay": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1664015884, - "narHash": "sha256-U+oc5aF063T7i1NWqy9O+xqkqdAucAtEpBLds5Jb/zU=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "583ad7baf08792c0edce8d6461a2e40be6c11115", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" - } - }, - "flake-utils": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -106,7 +70,6 @@ }, "root": { "inputs": { - "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index c8786e6..16cd3a4 100644 --- a/flake.nix +++ b/flake.nix @@ -7,9 +7,6 @@ inputs = rec { home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - - emacs-overlay.url = "github:nix-community/emacs-overlay"; - emacs-overlay.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { self, nixpkgs,