diff --git a/modules/home/default.nix b/modules/home/default.nix
index e3185e0..6dc81b5 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -37,11 +37,12 @@ in {
 
   config = {
     home.sessionVariables = {
+      SHELL = cfg.shell;
       EDITOR = cfg.editor;
       TERMINAL = cfg.terminal;
       BROWSER = cfg.browser;
     };
 
-    # home.shell = pkgs.${cfg.shell};
+    # users.defaultUserShell = pkgs.${cfg.shell};
   };
 }
diff --git a/modules/home/terminal/ghostty/default.nix b/modules/home/terminal/ghostty/default.nix
index 00d925c..4681b53 100644
--- a/modules/home/terminal/ghostty/default.nix
+++ b/modules/home/terminal/ghostty/default.nix
@@ -13,6 +13,7 @@ in
     programs.ghostty = {
       enable = true;
       settings = {
+        command = config.${namespace}.defaults.shell;
         background-blur-radius = 20;
         theme = "dark:stylix,light:stylix";
         window-theme = (config.${namespace}.themes.polarity or "dark");
diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix
index f38a28e..9fd9192 100644
--- a/modules/nixos/desktop/default.nix
+++ b/modules/nixos/desktop/default.nix
@@ -17,18 +17,12 @@ in
       example = "plasma";
       description = "Which desktop to enable";
     };
-
-    autoLogin = mkEnableOption "Enable plasma's auto login feature.";
   };
 
   config = mkMerge [
     ({
       services.displayManager = {
         enable = true;
-
-        autoLogin = mkIf cfg.autoLogin {
-          enable = true;
-        };
       };
     })
 
diff --git a/modules/nixos/hardware/bluetooth/default.nix b/modules/nixos/hardware/bluetooth/default.nix
index 1b99eef..98fc678 100644
--- a/modules/nixos/hardware/bluetooth/default.nix
+++ b/modules/nixos/hardware/bluetooth/default.nix
@@ -11,6 +11,9 @@ in
     hardware.bluetooth = {
       enable = true;
       powerOnBoot = true;
+      settings = {
+        General.Experimental = true; # Show battery charge of Bluetooth devices
+      };
     };
 
     services.pipewire.wireplumber.extraConfig.bluetoothEnhancements = {
diff --git a/systems/x86_64-linux/manwe/default.nix b/systems/x86_64-linux/manwe/default.nix
index c333f85..76d4e6d 100644
--- a/systems/x86_64-linux/manwe/default.nix
+++ b/systems/x86_64-linux/manwe/default.nix
@@ -28,5 +28,11 @@
     };
   };
 
+
+  services.displayManager.autoLogin = {
+    enable = true;
+    user = "chris";
+  };
+
   system.stateVersion = "23.11";
 }