From ac8aee70c01f6f052985e7cd0fdd73e3d2cd6981 Mon Sep 17 00:00:00 2001
From: Chris Kruining <chris@kruining.eu>
Date: Sat, 29 Mar 2025 00:17:42 +0100
Subject: [PATCH] small tweaks

---
 hosts/manwe/default.nix        |  3 ---
 lib/nixos.nix                  |  2 +-
 modules/home/shell/default.nix | 12 ++++++------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/hosts/manwe/default.nix b/hosts/manwe/default.nix
index 1600b67..745839f 100644
--- a/hosts/manwe/default.nix
+++ b/hosts/manwe/default.nix
@@ -14,9 +14,6 @@
   modules = {
     system.audio.enable = true;
 
-    # EXPERIMENTS
-    services.auth.enable = true;
-
     root = {
       user = {
         full_name = "__ROOT__";
diff --git a/lib/nixos.nix b/lib/nixos.nix
index 49ca761..d558eed 100644
--- a/lib/nixos.nix
+++ b/lib/nixos.nix
@@ -59,7 +59,7 @@ in rec
       ++ (map (user: (args@{ inputs, lib, pkgs, config, options, ... }: {
         imports = mapModulesRec' ../modules/home (file: (import file (args // { inherit user; })));
 
-        modules.${user} = (import "${path}/users/${user}/default.nix" args);
+        config.modules.${user} = (import "${path}/users/${user}/default.nix" args);
       })) users);
     };
 
diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix
index 1f52c40..a062006 100644
--- a/modules/home/shell/default.nix
+++ b/modules/home/shell/default.nix
@@ -1,20 +1,20 @@
-{ options, config, lib, pkgs, user, ... }:
+{ config, lib, pkgs, user, ... }:
 let
   inherit (lib.attrsets) attrValues;
   inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.options) mkOption mkEnableOption;
+  inherit (lib.types) nullOr enum;
 
   cfg = config.modules.${user}.shell;
 in
 {
-  options.modules.${user}.shell = let
-    inherit (lib.options) mkOption mkEnableOption;
-    inherit (lib.types) nullOr enum;
-  in {
+  options.modules.${user}.shell = {
     default = mkOption {
-      type = nullOr (enum ["fish" "zsh" "xonsh"]);
+      type = nullOr (enum ["fish" "zsh" "bash"]);
       default = null;
       description = "Default system shell";
     };
+
     corePkgs.enable = mkEnableOption "core shell packages";
   };