From 66238861b6b745bc1521494720678ad9c4ccbe0e Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Thu, 15 Feb 2024 07:15:19 +0000
Subject: [PATCH] Set emacs shell based on nix user config

Remove calling org-babel-load-file in extraConfig since I'm moving the
emacs config directly into .emacs.d
---
 flake.nix              | 4 ++--
 home/emacs/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index 0d77a15a..3c7e36f7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,7 +41,7 @@
       homeModules ? default.homeModules,
       stateVersion ? default.stateVersion,
     }: let
-      specialArgs = {inherit hostName user;};
+      specialArgs = {inherit hostName user group shell;};
     in
       nixpkgs.lib.nixosSystem {
         inherit system specialArgs;
@@ -212,7 +212,7 @@
                 };
               };
               home-manager = {
-                extraSpecialArgs = {inherit hostName;};
+                extraSpecialArgs = specialArgs;
                 useGlobalPkgs = true;
                 useUserPackages = true;
                 users = {
diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index a4f35ea5..5afffed0 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -1,6 +1,7 @@
 {
   config,
   pkgs,
+  shell,
   ...
 }: {
   imports = [../git/default.nix ../prog/default.nix];
@@ -14,8 +15,7 @@
       font = "${stylix.fonts.monospace.name}-${toString stylix.fonts.sizes.applications}";
       alpha = "${toString (floor (mul stylix.opacity.applications 100))}";
     in ''
-      (org-babel-load-file "~/.emacs/README.org")
-      (customize-set-variable 'shell-file-name "/bin/sh")
+      (customize-set-variable 'shell-file-name "${pkgs.${shell}}/bin/${shell}")
       (add-to-list 'initial-frame-alist '(font . "${font}"))
       (add-to-list 'default-frame-alist '(font . "${font}"))
       (add-to-list 'initial-frame-alist '(alpha-background . ${alpha}))