diff --git a/home/default.nix b/home/default.nix
index c22be8f..46b05ed 100755
--- a/home/default.nix
+++ b/home/default.nix
@@ -2,7 +2,8 @@
   pkgs,
   username,
   ...
-}: {
+}:
+{
   imports = [
     ./fd.nix
     ./fzf.nix
@@ -17,7 +18,7 @@
     ./jq.nix
     ./lazygit.nix
     ./mise.nix
-    # ./ghostty.nix # FIXME: ghostty home-manager program not available in aarch64-darwin
+    ./terminal.nix
     ./bat.nix
     ./aerospace.nix
     # TODO ./pass.nix
@@ -30,16 +31,11 @@
 
     # packages that are not available via programs
     packages = with pkgs; [
-      # nix-search-tv
-      # FIXME: NIX_SHELL_CMD='nix-shell --run $SHELL -p $(echo "{}" | sed "s:nixpkgs/::g"' ^-- SC2016 (info): Expressions don't expand in single quotes, use double quotes for that.
-      # (writeShellApplication {
-      #   name = "ns";
-      #   runtimeInputs = with pkgs; [
-      #     fzf
-      #     nix-search-tv
-      #   ];
-      #   text = builtins.readFile "${pkgs.nix-search-tv.src}/nixpkgs.sh";
-      # })
+      raycast
+      ice-bar
+      keka
+      stats
+      iina
     ];
   };
 
diff --git a/home/ghostty.nix b/home/ghostty.nix
deleted file mode 100644
index 6e851ed..0000000
--- a/home/ghostty.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  programs.ghostty = {
-    enable = true;
-    enableZshIntegration = true;
-    enableBashIntegration = true;
-
-    settings = {
-      theme = "catppuccin-mocha";
-      font-family = "D2Coding";
-      font-size = 15;
-      macos-icon = "xray";
-    };
-  };
-}
diff --git a/home/nvf/lsp/treesitter.nix b/home/nvf/lsp/treesitter.nix
index 41e9087..f5f8657 100755
--- a/home/nvf/lsp/treesitter.nix
+++ b/home/nvf/lsp/treesitter.nix
@@ -1,6 +1,7 @@
 {
   # treesitter
   enable = true;
+  addDefaultGrammars = true;
   fold = true;
   highlight = {
     enable = true;
diff --git a/home/terminal.nix b/home/terminal.nix
new file mode 100644
index 0000000..a1894c4
--- /dev/null
+++ b/home/terminal.nix
@@ -0,0 +1,7 @@
+{
+  programs.wezterm = {
+    enable = true;
+    enableZshIntegration = true;
+    enableBashIntegration = true;
+  };
+}
diff --git a/modules/apps.nix b/modules/apps.nix
index 118d1f4..a43d478 100644
--- a/modules/apps.nix
+++ b/modules/apps.nix
@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   nixpkgs.config.allowUnfree = true;
 
   environment.systemPackages = with pkgs; [
@@ -25,22 +26,17 @@
       Bitwarden = 1352778147;
     };
 
-    taps = [];
+    taps = [ ];
 
     # WARNING only include those not in nixpkgs
-    brews = [];
+    brews = [ ];
 
     casks = [
       "batfi"
       "hammerspoon"
       # TODO use nixpkgs when possible
       # "google-chrome"
-      # "iina"
-      # "jordanbaird-ice"
-      # "keka"
-      # "shottr"
-      # "raycast"
-      # "stats"
+      "shottr"
     ];
   };
 }
diff --git a/modules/system.nix b/modules/system.nix
index 98b5a83..267234a 100644
--- a/modules/system.nix
+++ b/modules/system.nix
@@ -46,11 +46,13 @@
       };
 
       controlcenter = {
-        Sound = false;
-        Bluetooth = false;
         AirDrop = false;
+        BatteryShowPercentage = false;
+        Bluetooth = false;
         Display = false;
+        FocusModes = false;
         NowPlaying = false;
+        Sound = false;
       };
 
       menuExtraClock = {