From 75e06be676ef5089f976c986f768ea1b4894963f Mon Sep 17 00:00:00 2001
From: David Crompton <davidcrompton1192@gmail.com>
Date: Tue, 19 Dec 2023 11:23:21 -0500
Subject: [PATCH] Maybe I do want them, and should just update with home
 manager later...

---
 flake.nix                                    | 13 ++++++++++---
 machines/universeair/configuration.nix       |  2 +-
 machines/universedesktop/programs/office.nix |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index 1b60bed..c65ea9e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,13 +2,15 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     sops-nix.url = "github:Mic92/sops-nix";
+    me-emacs.url = "git+https://git.syzygial.cc/Syzygial/EmacsConfig.git";
+    me-emacs.inputs.nixpkgs.follows = "nixpkgs";
     nix-darwin.url = "github:LnL7/nix-darwin/master";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
   };
   
-  outputs = { self, nixpkgs, sops-nix, nix-darwin, home-manager }@attrs: let
+  outputs = { self, nixpkgs, sops-nix, me-emacs, nix-darwin, home-manager }@attrs: let
     hydraGitea = (final: prev: {
       hydra_unstable = prev.hydra_unstable.overrideAttrs
         (old: {
@@ -28,6 +30,11 @@
     nixpkgsConfig = {
       config = { allowUnfree = true; };
     };
+    me-emacs-overlay = (final: prev: {
+      me-emacs = me-emacs.packages."x86_64-linux".emacs;
+      # Will in future be macports based
+      mac-emacs = me-emacs.packages."aarch64-darwin".emacs;
+    });
   in {
     nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
@@ -47,7 +54,7 @@
       modules =
         [
           ({ config, pkgs, ... }: {
-            nixpkgs.overlays = [ ];
+            nixpkgs.overlays = [ me-emacs-overlay ];
           })
           ./machines/universedesktop/configuration.nix
         ];
@@ -60,7 +67,7 @@
       modules = [
         ./machines/universeair/configuration.nix
         ({ config, pkgs, ... }: {
-          nixpkgs.overlays = [ ];
+          nixpkgs.overlays = [ me-emacs-overlay ];
         })
         home-manager.darwinModules.home-manager
         {
diff --git a/machines/universeair/configuration.nix b/machines/universeair/configuration.nix
index a5f8089..779bd26 100644
--- a/machines/universeair/configuration.nix
+++ b/machines/universeair/configuration.nix
@@ -41,7 +41,7 @@ flakify() {
     nixpkgs.config.allowUnfree = true;
 
     environment.systemPackages = (with pkgs; [
-      emacs
+      mac-emacs
       (aspellWithDicts (p: with p;[
         en
         en-computers
diff --git a/machines/universedesktop/programs/office.nix b/machines/universedesktop/programs/office.nix
index 4ce8ecd..a8408dd 100644
--- a/machines/universedesktop/programs/office.nix
+++ b/machines/universedesktop/programs/office.nix
@@ -1,7 +1,7 @@
 { lib, config, pkgs, ... }: {
   environment.systemPackages = with pkgs; [
     kitty
-    emacs
+    me-emacs
     rnix-lsp
     texlive.combined.scheme-full
     pandoc