diff --git a/home-manager/fish.nix b/home-manager/fish.nix
new file mode 100644
index 0000000..697a096
--- /dev/null
+++ b/home-manager/fish.nix
@@ -0,0 +1,35 @@
+{ pkgs, ... }:
+{
+  programs.fish = {
+    enable = true;
+    generateCompletions = true;
+    shellAliases = {
+      ls = "eza -lh";
+      ip = "ip --color=auto";
+      nano = "nvim";
+      cd = "z";
+      cat = "bat";
+
+      # Aliases for my nixos workflow
+      nixos-switch = "sudo nixos-rebuild switch --flake ~/nixconf &| nom";
+      home-switch = "home-manager switch --flake ~/nixconf &| nom";
+      server-switch = "nixos-rebuild switch --flake ~/nixconf#biggerpi --target-host blue@biggerpi --use-remote-sudo &| nom";
+    };
+    shellInit = "
+      set --global --export theme_virtual_env_prompt_enabled no
+      set --global --export VIRTUAL_ENV_DISABLE_PROMPT 1
+      set --global --export theme_env_packages_hide binutils-wrapper hyprland-qtutils pciutils pkgconf-wrapper
+    ";
+    plugins = [
+      {
+        name = "agnoster";
+        src = pkgs.fetchFromGitHub {
+          owner = "IBeTheBlueCat";
+          repo = "theme-agnoster";
+          rev = "c6b1e6b5671f75d30d2d81a11963ef445e78d8e6";
+          hash = "sha256-hO5ow+7nBqFeXWj8sjd6whuSYqsKYCpvcINU6zpAzsU=";
+        };
+      }
+    ];
+  };
+}
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 461ba21..25b3b62 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -12,7 +12,7 @@
     ./waybar.nix
     ./swaync.nix
     ./hyprlock.nix
-    ./zsh.nix
+    ./fish.nix
     ./eza.nix
     ./nvf.nix
     ./nextcloud.nix
@@ -30,7 +30,7 @@
   services.gnome-keyring.enable = true; # used for nextcloud-client
 
   home.sessionVariables = {
-    DEFAULT_BROWSER = "${lib.getExe pkgs.firefox}"; # even though im using floorp this still works, and pkgs.floorp doesnt
+    DEFAULT_BROWSER = "${lib.getExe pkgs.floorp}"; 
     # Allow XWayland apps to not be weird after turning off xwayland scaling in hyprland.conf
     GDK_SCALE = 1;
     XCURSOR_SIZE = 24;
diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix
index 77eb492..d798591 100644
--- a/home-manager/hyprland.nix
+++ b/home-manager/hyprland.nix
@@ -65,7 +65,7 @@
         "$mod, F, exec, floorp"
         "$mod, 1, exec, alacritty"
         "$mod, D, exec, vesktop"
-        "$mod, space, exec, zsh -c 'wofi --show drun, run'"
+        "$mod, space, exec, bash -c 'wofi --show drun, run'"
 
         # Screenshot tool
         ", Print, exec, grimblast copy area"
diff --git a/home-manager/zellij.nix b/home-manager/zellij.nix
index 54978c2..562ed92 100644
--- a/home-manager/zellij.nix
+++ b/home-manager/zellij.nix
@@ -2,7 +2,7 @@
 {
   programs.zellij = {
     enable = true;
-    enableZshIntegration = true;
+    enableFishIntegration = true;
     exitShellOnExit = true;
     attachExistingSession = true;
   };
diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix
deleted file mode 100644
index a8844c6..0000000
--- a/home-manager/zsh.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-
-{
-  programs.zsh = {
-    enable = true;
-    autocd = true;
-    dotDir = ".config/zsh";
-    autosuggestion.enable = true;
-    enableCompletion = true;
-    shellAliases = {
-      ls = "eza -lh";
-      ip = "ip --color=auto";
-      nano = "nvim";
-      cd = "z";
-      cat = "bat";
-
-      # Aliases for my nixos workflow
-      switch = "sudo nixos-rebuild switch --flake ~/nixconf |& nom";
-      homeswitch = "home-manager switch --flake ~/nixconf |& nom";
-      serverswitch = "nixos-rebuild switch --flake ~/nixconf#biggerpi --target-host blue@biggerpi --use-remote-sudo |& nom";
-    };
-
-    plugins = with pkgs; [
-      {
-        name = "zsh-syntax-highlighting";
-        src = fetchFromGitHub {
-          owner = "zsh-users";
-          repo = "zsh-syntax-highlighting";
-          rev = "0.6.0";
-          sha256 = "0zmq66dzasmr5pwribyh4kbkk23jxbpdw4rjxx0i7dx8jjp2lzl4";
-        };
-        file = "agkozak-zsh-prompt.plugin.zsh";
-      }
-    ];
-    oh-my-zsh = {
-      enable = true;
-      theme = "agnoster";
-    };
-  };
-}
diff --git a/hosts/gabbielaptop/configuration.nix b/hosts/gabbielaptop/configuration.nix
index 35e18ff..3d8dd24 100644
--- a/hosts/gabbielaptop/configuration.nix
+++ b/hosts/gabbielaptop/configuration.nix
@@ -116,19 +116,6 @@
     };
   };
 
-  musnix.enable = true;
-
-  # pam.services = [
-  #   { name = "gnome_keyring"
-  #     text = ''
-  #       auth     optional    ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
-  #       session  optional    ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
-  #
-  #       password  optional    ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
-  #     '';
-  #   }
-  # ];
-
   services.gnome.gnome-keyring.enable = true;
 
   nix.settings.trusted-users = [
@@ -136,7 +123,7 @@
     "blue"
   ];
 
-  programs.zsh.enable = true;
+  programs.fish.enable = true;
   users.users.blue = {
     isNormalUser = true;
     description = "Gabriella Bere";
@@ -146,12 +133,11 @@
       "dialout"
       "audio"
     ];
-    shell = pkgs.zsh;
+    shell = pkgs.fish;
   };
 
   # Enable fingerprint daemon
   services.fprintd.enable = true;
-  #  services.fprintd.tod.enable = true;
 
   # Enable bluetooth and blueman
   hardware.bluetooth = {
@@ -178,6 +164,8 @@
   programs.steam.remotePlay.openFirewall = true;
   programs.gamemode.enable = true;
 
+  # Enable musnix for realtime audio and other such useful things
+  musnix.enable = true;
   # Open ports in the firewall.
   networking.firewall.allowedTCPPorts = [
     43391 # used to forward minecraft traffic to minecraft.gabbie.blue:33991