From dad605b593991a2ce0a530b42bbb5aba088de662 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sat, 20 Apr 2024 12:33:52 +0100
Subject: [PATCH] Install emacs by default

Don't install programming tools with emacs, but do install as part of
desktop config
---
 home/default.nix       | 2 +-
 home/desktop.nix       | 1 +
 home/emacs/default.nix | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/home/default.nix b/home/default.nix
index 7141a496..bb4363f8 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -3,10 +3,10 @@
     ./bat/default.nix
     ./git/default.nix
     ./ssh/default.nix
-    ./nushell/default.nix
     ./zsh/default.nix
     ./starship/default.nix
     ./bottom/default.nix
+    ./emacs/default.nix
     ./scripts/default.nix
   ];
   programs = {
diff --git a/home/desktop.nix b/home/desktop.nix
index ebff369d..d3647efa 100644
--- a/home/desktop.nix
+++ b/home/desktop.nix
@@ -19,6 +19,7 @@
     ./emacs/default.nix
     ./obs/default.nix
     ./cava/default.nix
+    ./prog/default.nix
   ];
   programs.rofi.terminal = "${config.programs.alacritty.package}/bin/alacritty";
   services = {
diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index 5ac4903f..d7cd3a7f 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -4,7 +4,7 @@
   fonts,
   ...
 }: {
-  imports = [../git/default.nix ../prog/default.nix];
+  imports = [../git/default.nix];
   programs.git.extraConfig.core.editor = "$EDITOR";
   programs.emacs = {
     # Clone emacs config from https://git.xenia.me.uk/pixelifytica/emacs.git