From 3e8f0eeeec8708f9e5521333bc6884de8fa2067b Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Mon, 11 May 2020 11:15:10 -0400 Subject: Use emacsUnstable (27) also doing this in home rather than system --- system/modules/common.nix | 1 - system/modules/emacs.nix | 41 ----------------------------------------- 2 files changed, 42 deletions(-) delete mode 100644 system/modules/emacs.nix (limited to 'system') diff --git a/system/modules/common.nix b/system/modules/common.nix index 7d940beebb79..74e7729ef350 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 480711b97853..000000000000 --- 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; - }; -} -- cgit 1.4.1