From b054aca5265ffd3ca7936ad2a3a08fc20c64c043 Mon Sep 17 00:00:00 2001
From: Madeline Hashcube <hashcube.dev@proton.me>
Date: Sun, 22 Mar 2026 17:25:25 -0500
Subject: [PATCH] try to fix nushell

---
 flake.nix                      |  1 -
 modules/programs/bash-olto.nix | 17 ++++++++---------
 modules/users/magames.nix      |  2 ++
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/flake.nix b/flake.nix
index eff7fd5..781a4c2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -71,7 +71,6 @@
           ./modules/display/sddm.nix
 
           ./modules/programs/appimage.nix
-          ./modules/programs/bash-olto.nix
           ./modules/programs/steam.nix
 
           ./modules/catppuccin.nix
diff --git a/modules/programs/bash-olto.nix b/modules/programs/bash-olto.nix
index f16e6b7..d065056 100644
--- a/modules/programs/bash-olto.nix
+++ b/modules/programs/bash-olto.nix
@@ -1,12 +1,11 @@
 { pkgs, ... }:
 {
-  programs.bash = {
-    interactiveShellInit = ''
-      if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
-      then
-        shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
-        exec ${pkgs.nushell}/bin/nu $LOGIN_OPTION
-      fi
-    '';
-  };
+	environment.shells = with pkgs; [
+		nushell
+	];
+  programs.bash.interactiveShellInit = ''
+    if ! [ "$TERM" = "dumb" ]; then
+      exec nu
+    fi
+  '';
 }
diff --git a/modules/users/magames.nix b/modules/users/magames.nix
index 557c659..97c664f 100644
--- a/modules/users/magames.nix
+++ b/modules/users/magames.nix
@@ -4,5 +4,7 @@
     isNormalUser = true;
     description = "Magicman Games";
     extraGroups = [ "networkmanager" "wheel" "adbusers" "kvm"];
+		shell = pkgs.nushell;
   };
+	programs.fish.enable = true;
 }
-- 
2.51.2