diff --git a/configuration.nix b/configuration.nix
index 0676327..d696dc5 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -101,6 +101,7 @@ in
 
   programs = {
     nix-ld.enable = true;
+    fish.enable = true;
   };
 
   virtualisation = {
@@ -109,20 +110,24 @@ in
     };
   };
 
-  users.users.fabian = {
-    isNormalUser = true;
-    initialPassword = "1601";
-    extraGroups = [
-      "wheel"
-      "docker"
-      "audio"
-      "video"
-      "dialout"
-      "plugdev"
-      "adbusers"
-      "kvm"
-      "dialout"
-    ];
+  users = {
+    users = {
+      fabian = {
+        isNormalUser = true;
+        initialPassword = "1601";
+        extraGroups = [
+          "wheel"
+          "docker"
+          "audio"
+          "video"
+          "dialout"
+          "plugdev"
+          "adbusers"
+          "kvm"
+          "dialout"
+        ];
+      };
+    };
   };
 
   environment.systemPackages = with pkgs; [
diff --git a/modules/home/nix/bash.nix b/modules/home/nix/bash.nix
deleted file mode 100644
index 4bf85d1..0000000
--- a/modules/home/nix/bash.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ config, pkgs, ... }:
-{
-  programs = {
-    bash = {
-      enable = true;
-      enableCompletion = true;
-      sessionVariables = {
-        DEVKITPRO = "/opt/devkitpro";
-        DEVKITPPC = "/opt/devkitpro/devkitPPC";
-        DEVKITA64 = "/opt/devkitpro/devkitA64";
-        DEVKITARM = "/opt/devkitpro/devkitARM";
-        PATH = "/opt/devkitpro/tools/bin:$PATH";
-      };
-      shellAliases = {
-        http = "python3 -m http.server";
-        rm = "rm $@ -v -I";
-        ls = "${pkgs.eza}/bin/eza -l --icons";
-        cp = "cp -rv";
-        mv = "mv -v";
-        mkdir = "mkdir -pv";
-        update = "doas nixos-rebuild switch";
-      };
-      shellOptions = [
-        "histappend"
-        "checkwinsize"
-        "extglob"
-        "globstar"
-        "checkjobs"
-      ];
-      initExtra = ''
-        PS1 = "(\u) %"
-
-        eval "$(fzf --bash)"
-        complete -cf doas 
-      '';
-    };
-  };
-}
diff --git a/modules/home/nix/default.nix b/modules/home/nix/default.nix
index 655124f..79583d7 100644
--- a/modules/home/nix/default.nix
+++ b/modules/home/nix/default.nix
@@ -3,7 +3,7 @@
   imports = [
     ./nvim/default.nix
     ./alacritty.nix
-    ./bash.nix
+    ./shell.nix
     ./git.nix
     ./tmux.nix
     ./mpd.nix
diff --git a/modules/home/nix/shell.nix b/modules/home/nix/shell.nix
new file mode 100644
index 0000000..e599d7b
--- /dev/null
+++ b/modules/home/nix/shell.nix
@@ -0,0 +1,106 @@
+{ config, pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    grc
+  ];
+  programs = {
+    fish = {
+      enable = true;
+      generateCompletions = true;
+      interactiveShellInit = ''
+        set -gx DEVKITPRO "/opt/devkitpro";
+        set -gx DEVKITPPC "/opt/devkitpro/devkitPPC";
+        set -gx DEVKITA64 "/opt/devkitpro/devkitA64";
+        set -gx DEVKITARM "/opt/devkitpro/devkitARM";
+        set -gx PATH "/opt/devkitpro/tools/bin:$PATH";
+      '';
+      shellAliases = {
+        g = "git";
+        gc = "git commit";
+        ga = "git add -A";
+        http = "python3 -m http.server";
+        ls = "${pkgs.eza}/bin/eza -la --icons";
+        cp = "cp -rv";
+        mv = "mv -v";
+        mkdir = "mkdir -pv";
+        update = "doas nixos-rebuild switch";
+      };
+      plugins = [
+        {
+          name = "z";
+          src = pkgs.fishPlugins.z.src;
+        }
+        {
+          name = "sponge";
+          src = pkgs.fishPlugins.sponge.src;
+        }
+        {
+          name = "pisces";
+          src = pkgs.fishPlugins.pisces.src;
+        }
+        {
+          name = "fzf-fish";
+          src = pkgs.fishPlugins.fzf-fish.src;
+        }
+        {
+          name = "hydro";
+          src = pkgs.fishPlugins.hydro.src;
+        }
+        {
+          name = "grc";
+          src = pkgs.fishPlugins.grc.src;
+        }
+        {
+          name = "git-abbr";
+          src = pkgs.fishPlugins.git-abbr.src;
+        }
+        {
+          name = "forgit";
+          src = pkgs.fishPlugins.forgit.src;
+        }
+        {
+          name = "colored-man-pages";
+          src = pkgs.fishPlugins.colored-man-pages.src;
+        }
+        {
+          name = "bobthefisher";
+          src = pkgs.fishPlugins.bobthefisher.src;
+        }
+      ];
+    };
+
+    bash = {
+      enable = false;
+      enableCompletion = true;
+      sessionVariables = {
+        DEVKITPRO = "/opt/devkitpro";
+        DEVKITPPC = "/opt/devkitpro/devkitPPC";
+        DEVKITA64 = "/opt/devkitpro/devkitA64";
+        DEVKITARM = "/opt/devkitpro/devkitARM";
+        PATH = "/opt/devkitpro/tools/bin:$PATH";
+      };
+      shellAliases = {
+        http = "python3 -m http.server";
+        rm = "rm $@ -v -I";
+        ls = "${pkgs.eza}/bin/eza -l --icons";
+        cp = "cp -rv";
+        mv = "mv -v";
+        mkdir = "mkdir -pv";
+        update = "doas nixos-rebuild switch";
+      };
+      shellOptions = [
+        "histappend"
+        "checkwinsize"
+        "extglob"
+        "globstar"
+        "checkjobs"
+      ];
+      initExtra = ''
+        PS1="(\u) % "
+
+        eval "$(fzf --bash)"
+        complete -cf doas 
+      '';
+    };
+  };
+}
diff --git a/modules/system/nix/firefox.nix b/modules/system/nix/firefox.nix
index 4724029..07f0f4f 100644
--- a/modules/system/nix/firefox.nix
+++ b/modules/system/nix/firefox.nix
@@ -47,8 +47,8 @@ in
             install_url = "https://addons.mozilla.org/firefox/downloads/latest/darkreader/latest.xpi";
             installation_mode = "force_installed";
           };
-          "{9b84b6b4-07c4-4b4b-ba21-394d86f6e9ee}" = {
-            install_url = "https://addons.mozilla.org/firefox/downloads/file/3954735/black21-3.0.2.xpi";
+          "{f5bcc922-5c09-4ba5-9611-d7931812785c}" = {
+            install_url = "https://addons.mozilla.org/firefox/downloads/file/4354513/oxocarbon-1.0.xpi";
             installation_mode = "force_installed";
           };
         };
diff --git a/modules/system/nix/x/dwm/source/dwm/config.def.h b/modules/system/nix/x/dwm/source/dwm/config.def.h
index bc28d6b..659c442 100644
--- a/modules/system/nix/x/dwm/source/dwm/config.def.h
+++ b/modules/system/nix/x/dwm/source/dwm/config.def.h
@@ -84,8 +84,8 @@ static const char *termcmd[] = {"alacritty", NULL};
 static const char *dmenucmd[] = {
     "dmenu_run", "-m",      dmenumon, "-fn",    dmenufont, "-nb",     col_gray1,
     "-nf",       col_gray3, "-sb",    col_cyan, "-sf",     col_gray4, NULL};
-static const char *upvol[] = {"wpctl", "set-sink-volume",
-                              "@DEFAULT_AUDIO_SINK@", "5%-", NULL};
+static const char *upvol[] = {"wpctl", "set-volume", "@DEFAULT_AUDIO_SINK@",
+                              "5%+", NULL};
 static const char *downvol[] = {"wpctl", "set-volume", "@DEFAULT_AUDIO_SINK@",
                                 "5%-", NULL};
 static const char *mutevol[] = {"wpctl", "set-mute", "@DEFAULT_AUDIO_SINK@",