diff --git a/configuration.nix b/configuration.nix
index f0f53e2..25b762f 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -10,7 +10,7 @@ let
 in {
   nix.package = pkgs.nixUnstable;
   imports =
-    [ 
+    [
       # Hardware Specific Configuration
       ./${systemType}.nix
 
@@ -23,10 +23,11 @@ in {
 
       ./modules/audio/pipewire
 
-      ./modules/shell/fish
+      #./modules/shell/fish
+      ./modules/shell/xonsh
       ./modules/network/browsers/librewolf
       ./modules/network/syncthing
-      
+
       ./modules/login/greetd
     ];
 
diff --git a/modules/shell/xonsh/default.nix b/modules/shell/xonsh/default.nix
new file mode 100644
index 0000000..2c5904d
--- /dev/null
+++ b/modules/shell/xonsh/default.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, lib, ... }:
+
+{
+  programs.xonsh.enable = true;
+
+  users.defaultUserShell = pkgs.xonsh;
+
+  environment.shells = with pkgs; [ xonsh ];
+}