diff --git a/modules/common/bat.nix b/modules/common/bat.nix
index 09e0879..5f1c40a 100644
--- a/modules/common/bat.nix
+++ b/modules/common/bat.nix
@@ -14,8 +14,7 @@ in {
     programs.bat = enabled {
       config.theme      = "base16";
       themes.base16.src = pkgs.writeText "base16.tmTheme" config.theme.tmTheme;
-
-      config.pager = "less --quit-if-one-screen --RAW-CONTROL-CHARS";
+      config.pager = "less -FR";
     };
   }];
 }
diff --git a/modules/common/git.nix b/modules/common/git.nix
index 32cb99f..1af4259 100644
--- a/modules/common/git.nix
+++ b/modules/common/git.nix
@@ -29,7 +29,7 @@ in {
 
     gl  = "git log";
     glo = "git log --oneline --graph";
-    glp = "git log --patch --ext-diff";
+    glp = "git log -p --ext-diff";
 
     gpl   = "git pull";
     gplr  = "git pull --rebase";
diff --git a/modules/common/nushell/default.nix b/modules/common/nushell/default.nix
index 9f92de7..d5293ec 100644
--- a/modules/common/nushell/default.nix
+++ b/modules/common/nushell/default.nix
@@ -16,7 +16,7 @@ in {
       mv = "mv --verbose";
       rm = "rm --recursive --verbose";
 
-      pstree = "pstree -g 3";
+      pstree = "pstree -g 2";
       tree   = "eza --tree --git-ignore --group-directories-first";
     };
 
diff --git a/modules/linux/hyprland/fuzzel.nix b/modules/linux/hyprland/fuzzel.nix
index d173f5c..1502a20 100644
--- a/modules/linux/hyprland/fuzzel.nix
+++ b/modules/linux/hyprland/fuzzel.nix
@@ -14,10 +14,10 @@ in merge <| mkIf config.isDesktop {
       '')];
 
       bind = [
-        "SUPER      , SPACE, exec, pkill fuzzel; fuzzel"
-        "SUPER      , E    , exec, pkill fuzzel; cat ${./emojis.txt} | fuzzel --no-fuzzy --dmenu | cut -d ' ' -f 1 | tr -d '\\n' | wl-copy"
+        "SUPER    , SPACE, exec, pkill fuzzel; fuzzel"
+        "SUPER    , E    , exec, pkill fuzzel; cat ${./emojis.txt} | fuzzel --no-fuzzy --dmenu | cut -d ' ' -f 1 | tr -d '\\n' | wl-copy"
         "SUPER+SHIFT, E    , exec, pkill fuzzel; cat ${./emojis.txt} | fuzzel --no-fuzzy --dmenu | cut -d ' ' -f 1 | tr -d '\\n' | wtype -"
-        "SUPER      , V    , exec, pkill fuzzel; cliphist list | fuzzel --dmenu | cliphist decode | wl-copy"
+        "SUPER    , V    , exec, pkill fuzzel; cliphist list | fuzzel --dmenu | cliphist decode | wl-copy"
       ];
     };
 
diff --git a/modules/linux/hyprland/hyprland.nix b/modules/linux/hyprland/hyprland.nix
index 8c18b40..06b592c 100644
--- a/modules/linux/hyprland/hyprland.nix
+++ b/modules/linux/hyprland/hyprland.nix
@@ -124,17 +124,17 @@ in merge <| mkIf config.isDesktop {
         ];
 
         bind = flatten [
-          "SUPER      , TAB, workspace, e+1"
+          "SUPER    , TAB, workspace, e+1"
           "SUPER+SHIFT, TAB, workspace, e-1"
 
           "SUPER, mouse_up,   workspace, e+1"
           "SUPER, mouse_down, workspace, e-1"
 
           (map (n: [
-            "SUPER      , ${toString n}, workspace            , ${toString n}"
+            "SUPER    , ${toString n}, workspace            , ${toString n}"
             "SUPER+SHIFT, ${toString n}, movetoworkspacesilent, ${toString n}"
           ]) <| range 1 9)
-          "SUPER      , 0, workspace            , 10"
+          "SUPER    , 0, workspace            , 10"
           "SUPER+SHIFT, 0, movetoworkspacesilent, 10"
 
           "SUPER+SHIFT, left , movewindow, l"
@@ -147,20 +147,20 @@ in merge <| mkIf config.isDesktop {
           "SUPER+SHIFT, k, movewindow, u"
           "SUPER+SHIFT, l, movewindow, r"
         
-          "SUPER      , Q, killactive"
-          "SUPER      , F, fullscreen"
+          "SUPER    , Q, killactive"
+          "SUPER    , F, fullscreen"
           "SUPER+SHIFT, F, togglefloating"
 
           "SUPER+SHIFT, RETURN, exec, kitty"
-          "SUPER      , RETURN, exec, ghostty --gtk-single-instance=true"
-          "SUPER      , W     , exec, zen-beta"
-          "SUPER      , D     , exec, discord"
-          "SUPER      , Z     , exec, zulip"
-          "SUPER      , M     , exec, thunderbird"
-          "SUPER      , T     , exec, thunar"
+          "SUPER    , RETURN, exec, ghostty --gtk-single-instance=true"
+          "SUPER    , W     , exec, zen-beta"
+          "SUPER    , D     , exec, discord"
+          "SUPER    , Z     , exec, zulip"
+          "SUPER    , M     , exec, thunderbird"
+          "SUPER    , T     , exec, thunar"
           # "SUPER    , C     , exec, hyprpicker --autocopy"
 
-          "     , PRINT, exec, pkill grim; grim -g \"$(slurp -w 0)\" - | swappy -f - -o - | wl-copy --type image/png"
+          "   , PRINT, exec, pkill grim; grim -g \"$(slurp -w 0)\" - | swappy -f - -o - | wl-copy --type image/png"
           "SHIFT, PRINT, exec, pkill grim; grim                      - | swappy -f - -o - | wl-copy --type image/png"
         ];
 
diff --git a/rebuild.nu b/rebuild.nu
index 7add782..d6c19ec 100755
--- a/rebuild.nu
+++ b/rebuild.nu
@@ -56,7 +56,7 @@ def main --wrapped [
   ] | append ($args_split | get --ignore-errors 1 | default [])
 
   if (uname | get kernel-name) == "Darwin" {
-    NH_NO_CHECKS=1 nh darwin switch . ...$nh_flags -- ...$nix_flags
+    nh darwin switch . ...$nh_flags -- ...$nix_flags
 
     if not (xcode-select --install e>| str contains "Command line tools are already installed") {
       darwin-shadow-xcode-popup
@@ -64,7 +64,7 @@ def main --wrapped [
 
     darwin-set-zshrc
   } else {
-    NH_NO_CHECKS=1 nh os switch . ...$nh_flags -- ...$nix_flags
+    nh os switch . ...$nh_flags -- ...$nix_flags
   }
 }