diff --git a/modules/home/apps/cli-apps/fish/default.nix b/modules/home/apps/cli-apps/fish/default.nix
index afe6750..0fae2e5 100644
--- a/modules/home/apps/cli-apps/fish/default.nix
+++ b/modules/home/apps/cli-apps/fish/default.nix
@@ -13,70 +13,71 @@ in {
     enable = mkBoolOpt true "Whether or not to enable the fish shell";
   };
 
-  config = mkIf cfg.enable {
-    home.packages = with pkgs.fishPlugins; [
-      forgit
-      sponge
-    ];
+  config =
+    mkIf cfg.enable {
+      home.packages = with pkgs.fishPlugins; [
+        forgit
+        sponge
+      ];
 
-    programs = {
-      fish = {
-        enable = true;
-        shellInit = "
+      programs = {
+        fish = {
+          enable = true;
+          shellInit = "
 	zoxide init fish | source
 	starship init fish | source
 	";
-        shellAliases = {
-          vim = "nvim";
-          ls = "colorls --gs";
-          l = "ls -l";
-          la = "ls -a";
-          lla = "ls -la";
-          lt = "ls --tree";
-        };
-      };
-
-      starship = {
-        enable = true;
-        enableTransience = true;
-        settings = {
-          character = {
-            success_symbol = "[➜](bold green)";
-            error_symbol = "[✗](bold red) ";
-            vicmd_symbol = "[](bold blue) ";
-          };
-          time = {
-            disabled = false;
-            time_format = "%T";
-            utc_time_offset = "+1";
-          };
-          username = {
-            style_user = "#00de00";
-            style_root = "red";
-            format = "[$user]($style) ";
-            disabled = false;
-            show_always = true;
-          };
-          hostname = {
-            ssh_only = false;
-            format = "@ [$hostname](bold yellow) ";
-            disabled = false;
-          };
-          directory = {
-            home_symbol = "󰋞 ~";
-            read_only_style = "197";
-            read_only = "  ";
-            format = "at [$path]($style)[$read_only]($read_only_style) ";
+          shellAliases = {
+            vim = "nvim";
+            ls = "colorls --gs";
+            l = "ls -l";
+            la = "ls -a";
+            lla = "ls -la";
+            lt = "ls --tree";
           };
         };
-      };
 
-      zoxide = {
-        enable = true;
-        options = [
-          "--cmd cd"
-        ];
+        starship = {
+          enable = true;
+          enableTransience = true;
+          settings = {
+            character = {
+              success_symbol = "[➜](bold green)";
+              error_symbol = "[✗](bold red) ";
+              vicmd_symbol = "[](bold blue) ";
+            };
+            time = {
+              disabled = false;
+              time_format = "%T";
+              utc_time_offset = "+1";
+            };
+            username = {
+              style_user = "#00de00";
+              style_root = "red";
+              format = "[$user]($style) ";
+              disabled = false;
+              show_always = true;
+            };
+            hostname = {
+              ssh_only = false;
+              format = "@ [$hostname](bold yellow) ";
+              disabled = false;
+            };
+            directory = {
+              home_symbol = "󰋞 ~";
+              read_only_style = "197";
+              read_only = "  ";
+              format = "at [$path]($style)[$read_only]($read_only_style) ";
+            };
+          };
+        };
+
+        zoxide = {
+          enable = true;
+          options = [
+            "--cmd cd"
+          ];
+        };
       };
     };
-  };
 }
diff --git a/modules/home/tools/git/default.nix b/modules/home/tools/git/default.nix
index 2f51442..a4194f5 100644
--- a/modules/home/tools/git/default.nix
+++ b/modules/home/tools/git/default.nix
@@ -23,7 +23,7 @@ in {
       lfs = enabled;
       extraConfig = {
         init = {defaultBranch = "main";};
-	pull = {rebase = false;};
+        pull = {rebase = false;};
         push = {autoSetupRemote = true;};
       };
     };
diff --git a/modules/nixos/archetypes/gaming/default.nix b/modules/nixos/archetypes/gaming/default.nix
index fe75efc..bb43d12 100644
--- a/modules/nixos/archetypes/gaming/default.nix
+++ b/modules/nixos/archetypes/gaming/default.nix
@@ -22,6 +22,10 @@ in {
         socials = enabled;
       };
 
+      system.hardware = {
+        audio = enabled;
+      };
+
       apps = {
         vivaldi = enabled;
       };
diff --git a/modules/nixos/system/hardware/bluetooth/default.nix b/modules/nixos/system/hardware/bluetooth/default.nix
index 95d1daf..c74723b 100644
--- a/modules/nixos/system/hardware/bluetooth/default.nix
+++ b/modules/nixos/system/hardware/bluetooth/default.nix
@@ -18,5 +18,11 @@ in {
       enable = true;
       powerOnBoot = true;
     };
+
+    fileSystems."/var/lib/bluetooth" = {
+      device = "/persist/var/lib/bluetooth";
+      options = ["bind" "noauto" "x-systemd.automount"];
+      noCheck = true;
+    };
   };
 }
diff --git a/modules/nixos/tools/git/default.nix b/modules/nixos/tools/git/default.nix
index c87496a..ebe2671 100644
--- a/modules/nixos/tools/git/default.nix
+++ b/modules/nixos/tools/git/default.nix
@@ -27,7 +27,7 @@ in {
       lfs.enable = true;
       config = {
         init = {defaultBranch = "main";};
-	pull = {rebase = false;};
+        pull = {rebase = false;};
         push = {autoSetupRemote = true;};
       };
     };
diff --git a/systems/x86_64-linux/workvm/default.nix b/systems/x86_64-linux/workvm/default.nix
index bc87166..01d1dd4 100644
--- a/systems/x86_64-linux/workvm/default.nix
+++ b/systems/x86_64-linux/workvm/default.nix
@@ -12,7 +12,6 @@ with lib.wyrdgard; {
   virtualisation.hypervGuest.videoMode = "1920x1080";
 
   environment.systemPackages = with pkgs; [
-
   ];
 
   environment.variables.EDITOR = "nvim";
diff --git a/systems/x86_64-linux/yggdrasil/default.nix b/systems/x86_64-linux/yggdrasil/default.nix
index e3417bf..7373718 100644
--- a/systems/x86_64-linux/yggdrasil/default.nix
+++ b/systems/x86_64-linux/yggdrasil/default.nix
@@ -39,6 +39,8 @@ with lib.wyrdgard; {
       discord = enabled;
       _1password = enabled;
     };
+
+    system.hardware.bluetooth = enabled;
   };
 
   services.xserver.videoDrivers = ["nvidia"];