From 3af3b5dbc4b40a5a1e5dbca2290d1bed334763ec Mon Sep 17 00:00:00 2001
From: Artur Manuel <balkenix@outlook.com>
Date: Sat, 14 Dec 2024 11:14:51 +0000
Subject: [PATCH] feat: added support for custom shells in alqueva.users

---
 hosts/python/configs/waybar/config.jsonc | 3 +--
 hosts/python/users.nix                   | 2 ++
 hosts/shared/users.nix                   | 7 ++++++-
 lib/default.nix                          | 1 -
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/hosts/python/configs/waybar/config.jsonc b/hosts/python/configs/waybar/config.jsonc
index 9e49487..a1fc5b8 100644
--- a/hosts/python/configs/waybar/config.jsonc
+++ b/hosts/python/configs/waybar/config.jsonc
@@ -9,8 +9,7 @@
     "format": "{player_icon} {dynamic}",
     "format-paused": "{status_icon} <i>{dynamic}</i>",
     "interval": 1,
-    "title-len": 10,
-    "album-len": 10,
+    "dynamic-length": 52,
     "player-icons": {
       "default": "▶",
       "mpv": "🎵",
diff --git a/hosts/python/users.nix b/hosts/python/users.nix
index 3c8d7f7..76cdf72 100644
--- a/hosts/python/users.nix
+++ b/hosts/python/users.nix
@@ -1,9 +1,11 @@
 {
   inputs,
   pkgs,
+  config,
   ...
 }: {
   alqueva.users.artur = {
+    shell = config.programs.xonsh.package;
     tmpfiles = {
       ".config/qutebrowser/config.py" = ./configs/qutebrowser/config.py;
       ".config/qutebrowser/gruvbox.py" = ./configs/qutebrowser/gruvbox.py;
diff --git a/hosts/shared/users.nix b/hosts/shared/users.nix
index 0a1ac82..fab24fb 100644
--- a/hosts/shared/users.nix
+++ b/hosts/shared/users.nix
@@ -27,6 +27,11 @@ in {
           default = [];
           description = "Groups to add the defined user to.";
         };
+        shell = mkOption {
+          type = types.package;
+          default = config.programs.bash.package;
+          description = "Shell the user wants to use.";
+        };
       };
     });
   };
@@ -38,7 +43,7 @@ in {
         isNormalUser = true;
         extraGroups = ucfg.groups;
         inherit (ucfg) packages;
-        shell = config.programs.xonsh.package;
+        shell = ucfg.shell;
         initialPassword = "password";
       })
       cfg;
diff --git a/lib/default.nix b/lib/default.nix
index 849c612..dc52b9e 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -13,7 +13,6 @@
           inputs.self.nixosModules.default
           ({config, ...}: {
             config = {
-              alqueva.xonsh.enable = true;
               nix = {
                 settings.extra-experimental-features = [
                   "nix-command"