diff --git a/modules/programs/bash-olto.nix b/modules/programs/bash-olto.nix
index d065056..6f232b4 100644
--- a/modules/programs/bash-olto.nix
+++ b/modules/programs/bash-olto.nix
@@ -1,11 +1,10 @@
 { pkgs, ... }:
 {
-	environment.shells = with pkgs; [
-		nushell
-	];
-  programs.bash.interactiveShellInit = ''
-    if ! [ "$TERM" = "dumb" ]; then
-      exec nu
-    fi
-  '';
+  programs.bash = {
+		interactiveShellInit = ''
+			if ! [ "$TERM" = "dumb" ]; then
+				exec nu
+			fi
+		'';
+	};
 }
diff --git a/modules/users/magames.nix b/modules/users/magames.nix
index 97c664f..ce4b85f 100644
--- a/modules/users/magames.nix
+++ b/modules/users/magames.nix
@@ -1,10 +1,16 @@
 { pkgs, ... }:
 {
-  users.users.magames = {
-    isNormalUser = true;
-    description = "Magicman Games";
-    extraGroups = [ "networkmanager" "wheel" "adbusers" "kvm"];
-		shell = pkgs.nushell;
+  users = {
+		defaultUserShell = pkgs.nushell;
+		users.magames = {
+			isNormalUser = true;
+			description = "Magicman Games";
+			extraGroups = [ "networkmanager" "wheel" "adbusers" "kvm"];
+			shell = pkgs.nushell;
+		};
   };
 	programs.fish.enable = true;
+	environment.shells = with pkgs; [
+		nushell
+	];
 }