diff --git a/common/home.nix b/common/home.nix
index 37b54a6b..53a294d5 100644
--- a/common/home.nix
+++ b/common/home.nix
@@ -89,7 +89,6 @@
     music = "${config.home.homeDirectory}/Nextcloud/Music";
   };
 
-
   programs = {
     direnv = {
       enable = true;
@@ -174,23 +173,22 @@
       enable = true;
       enableFishIntegration = true;
       enableNushellIntegration = true;
-      settings =
-        let flavour = "mocha"; # Replace with your preferred palette
-        in {
-          # Check https://starship.rs/config/#prompt
-          format = "$all$character";
-          palette = "catppuccin_${flavour}";
-          character = {
-            success_symbol = "[[OK](bold green) ❯](maroon)";
-            error_symbol = "[❯](red)";
-            vimcmd_symbol = "[❮](green)";
-          };
-          directory = {
-            truncation_length = 4;
-            style = "bold lavender";
-          };
-        } // builtins.fromTOML (builtins.readFile
-          (pkgs.catppuccinThemes.starship + /palettes/${flavour}.toml));
+      settings = let flavour = "mocha"; # Replace with your preferred palette
+      in {
+        # Check https://starship.rs/config/#prompt
+        format = "$all$character";
+        palette = "catppuccin_${flavour}";
+        character = {
+          success_symbol = "[[OK](bold green) ❯](maroon)";
+          error_symbol = "[❯](red)";
+          vimcmd_symbol = "[❮](green)";
+        };
+        directory = {
+          truncation_length = 4;
+          style = "bold lavender";
+        };
+      } // builtins.fromTOML (builtins.readFile
+        (pkgs.catppuccinThemes.starship + /palettes/${flavour}.toml));
     };
     eza = {
       enable = true;
@@ -223,6 +221,7 @@
           file = "Catppuccin Mocha.tmTheme";
         };
       };
+      extraPackages = with pkgs.bat-extras; [ batdiff batman batgrep batwatch ];
     };
 
     rbw = {
@@ -245,7 +244,6 @@
       ];
     };
 
-
     home-manager = { enable = true; };
   };
 
@@ -253,11 +251,10 @@
 
   home = {
     username = device.user;
-    homeDirectory =
-      if device.isMac then
-        lib.mkForce "/Users/${device.user}"
-      else
-        lib.mkForce "/home/${device.user}";
+    homeDirectory = if device.isMac then
+      lib.mkForce "/Users/${device.user}"
+    else
+      lib.mkForce "/home/${device.user}";
 
     stateVersion = "23.11";
 
@@ -269,11 +266,9 @@
       EDITOR = "nvim";
       SHELL = "${pkgs.nushellFull}/bin/nu";
       CARGO_TARGET_DIR = "${config.xdg.cacheHome}/cargo/target";
-      BROWSER = "xdg-open";
+      BROWSER = if device.isMac then "open" else "xdg-open";
     };
-    sessionPath = [
-      "${config.home.homeDirectory}/.cargo/bin"
-    ];
+    sessionPath = [ "${config.home.homeDirectory}/.cargo/bin" ];
   };
 }
 
diff --git a/darwin/configuration.nix b/darwin/configuration.nix
index e8dda5e2..7dcac6b2 100644
--- a/darwin/configuration.nix
+++ b/darwin/configuration.nix
@@ -1,4 +1,4 @@
-{ pkgs, device, ... }: {
+{ pkgs, ... }: {
   imports = [ ./yabai.nix ./skhd.nix ];
 
   environment.systemPackages = with pkgs; [ nix neovim ];
@@ -16,21 +16,20 @@
   };
 
   # security.pam.enableSudoTouchIdAuth = true;
-  system.patches = [
-    (pkgs.writeText "pam-reattach.patch"
-      # diff
-      ''
-        new file mode 100644
-        index 0000000..e4293c0
-        --- /dev/null
-        +++ b/etc/pam.d/sudo_local
-        @@ -0,0 +1,3 @@
-        +# sudo_local: local config file which survives system update and is included for sudo
-        +# uncomment following line to enable Touch ID for sudo
-        +auth       optional     ${pkgs.pam-reattach}/lib/pam/pam_reattach.so
-      '')
-
-  ];
+  # system.patches = [
+  #   (pkgs.writeText "pam-reattach.patch"
+  #     # diff
+  #     ''
+  #       new file mode 100644
+  #       index 0000000..e4293c0
+  #       --- /dev/null
+  #       +++ b/etc/pam.d/sudo_local
+  #       @@ -0,0 +1,3 @@
+  #       +# sudo_local: local config file which survives system update and is included for sudo
+  #       +# uncomment following line to enable Touch ID for sudo
+  #       +auth       optional     ${pkgs.pam-reattach}/lib/pam/pam_reattach.so
+  #     '')
+  # ];
 
   programs.bash.enable = true;
   programs.zsh.enable = true;
diff --git a/modules/goread.nix b/modules/goread.nix
index 1a97ae4f..73b5a718 100644
--- a/modules/goread.nix
+++ b/modules/goread.nix
@@ -1,7 +1,5 @@
 { pkgs, config, lib, ... }:
-
 with lib;
-
 let
   cfg = config.programs.goread;
   # configDir =