diff --git a/home/modules/gpg.nix b/home/modules/gpg.nix
index da17eca..4b33f33 100644
--- a/home/modules/gpg.nix
+++ b/home/modules/gpg.nix
@@ -54,7 +54,7 @@ in {
     programs.git = {
       signing = {
         key = config.local.services.gpg.defaultKey;
-        signByDefault = true;
+        signByDefault = false;
       };
     };
   };
diff --git a/home/modules/gui/waybar.nix b/home/modules/gui/waybar.nix
index 7f37784..7112b41 100644
--- a/home/modules/gui/waybar.nix
+++ b/home/modules/gui/waybar.nix
@@ -6,6 +6,7 @@
 }:
 with lib; let
   cfg = config.local.gui;
+  laptop = config.trivium.laptop.enable;
 in {
   config = mkIf cfg.enable {
     programs.waybar = {
@@ -33,7 +34,13 @@ in {
             "temperature"
             "keyboard-state"
             "tray"
+          ] ++ lists.optionals laptop [
+            "battery"
           ];
+          "battery" = mkIf laptop {
+              format = "{capacity}% {icon}";
+              format-icons = ["" "" "" "" ""];
+          };
           "keyboard-state" = {
             numlock = true;
             capslock = true;