From d9a173642fcb662d12be3dab2c1ac32cbc5235ad Mon Sep 17 00:00:00 2001
From: Smaug123 <patrick+github@patrickstevens.co.uk>
Date: Sun, 12 Sep 2021 23:03:54 +0100
Subject: [PATCH] Stop using emacs at all

---
 darwin-configuration.nix | 15 ++++++++-------
 home.nix                 | 11 ++++++-----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/darwin-configuration.nix b/darwin-configuration.nix
index f1fd6d0..0110946 100644
--- a/darwin-configuration.nix
+++ b/darwin-configuration.nix
@@ -191,12 +191,6 @@ in
       python
     ];
 
-  nixpkgs.overlays = [
-    (import (builtins.fetchTarball {
-      url = https://github.com/nix-community/emacs-overlay/archive/8ed671dab09f08e8079e24f9fc7800b7ce260fa2.tar.gz;
-    }))
-  ];
-
   nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
     "vscode"
     "vscode-with-extensions"
@@ -209,7 +203,14 @@ in
   # Use a custom configuration.nix location.
   # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
   # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix";
-  #environment.darwinConfig = "$HOME/.nixpkgs/darwin-configuration.nix";
+
+  # TODO: get Spacemacs actually working
+  #nixpkgs.overlays = [
+  #  (import (builtins.fetchTarball {
+  #    url = https://github.com/nix-community/emacs-overlay/archive/8ed671dab09f08e8079e24f9fc7800b7ce260fa2.tar.gz;
+  #  }))
+  #];
+
 
   # Auto upgrade nix package and the daemon service.
   # services.nix-daemon.enable = true;
diff --git a/home.nix b/home.nix
index 055b21d..3051aa4 100644
--- a/home.nix
+++ b/home.nix
@@ -38,11 +38,6 @@
       pkgs.ripgrep
     ];
 
-  programs.emacs = {
-    enable = true;
-    package = pkgs.emacsGcc;
-  };
-
   programs.tmux = {
     shell = "\${pkgs.zsh}/bin/zsh";
   };
@@ -128,6 +123,12 @@ let g:syntastic_check_on_wq = 0''; }
 
   home.file.".config/youtube-dl/config".source = ./youtube-dl.conf;
 
+  #programs.emacs = {
+  #  enable = true;
+  #  package = pkgs.emacsGcc;
+  #};
+
+
   #home.file.".emacs.d" = {
   #  # don't make the directory read only so that impure melpa can still happen
   #  # for now