From 35ca78a39759b2086afaf5b63be99dac17985103 Mon Sep 17 00:00:00 2001
From: Alex van de Sandt <me@alexvds.com>
Date: Mon, 11 May 2026 14:53:52 -0500
Subject: [PATCH] Set default shell in aspect

---
 modules/shell/zsh.nix     | 7 ++++++-
 modules/users/igneous.nix | 3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/shell/zsh.nix b/modules/shell/zsh.nix
index ec944a0..b5118a1 100644
--- a/modules/shell/zsh.nix
+++ b/modules/shell/zsh.nix
@@ -1,9 +1,14 @@
+{ den, ... }:
 let
   completions = builtins.readFile ./completions.zsh;
   keybindings = builtins.readFile ./keybindings.zsh;
 in
 {
-  den.aspects.zsh = {
+  den.aspects.shell.zsh = {
+    includes = [
+      (den.batteries.user-shell "zsh")
+    ];
+
     homeManager =
       { lib, pkgs, ... }:
       {
diff --git a/modules/users/igneous.nix b/modules/users/igneous.nix
index d90be3b..579b6d8 100644
--- a/modules/users/igneous.nix
+++ b/modules/users/igneous.nix
@@ -5,10 +5,9 @@
     includes = [
       den.batteries.define-user
       den.batteries.primary-user
-      (den.batteries.user-shell "zsh")
 
       den.aspects.shell
-      den.aspects.zsh
+      den.aspects.shell.zsh
     ];
 
     homeManager =
-- 
2.51.2