diff --git a/modules/cli/shell/starship-preset.toml b/modules/cli/shell/starship-preset.toml
index 561a98b..ce44f9f 100644
--- a/modules/cli/shell/starship-preset.toml
+++ b/modules/cli/shell/starship-preset.toml
@@ -53,7 +53,7 @@ symbol = "  "
 symbol = " "
 
 [git_commit]
-tag_symbol = '  '
+tag_symbol = "  "
 
 [golang]
 symbol = " "
diff --git a/modules/desktop/terminal/alacritty/tokyonight-storm.toml b/modules/desktop/terminal/alacritty/tokyonight-storm.toml
index 494252b..cdff667 100644
--- a/modules/desktop/terminal/alacritty/tokyonight-storm.toml
+++ b/modules/desktop/terminal/alacritty/tokyonight-storm.toml
@@ -6,44 +6,44 @@
 
 # Default colors
 [colors.primary]
-background = '#24283b'
-foreground = '#c0caf5'
+background = "#24283b"
+foreground = "#c0caf5"
 
 [colors.cursor]
-cursor = '#c0caf5'
-text = '#24283b'
+cursor = "#c0caf5"
+text = "#24283b"
 
 [colors.selection]
-text = '#c0caf5'
-background = '#2e3c64'
+text = "#c0caf5"
+background = "#2e3c64"
 
 # Normal colors
 [colors.normal]
-black = '#1d202f'
-red = '#f7768e'
-green = '#9ece6a'
-yellow = '#e0af68'
-blue = '#7aa2f7'
-magenta = '#bb9af7'
-cyan = '#7dcfff'
-white = '#a9b1d6'
+black = "#1d202f"
+red = "#f7768e"
+green = "#9ece6a"
+yellow = "#e0af68"
+blue = "#7aa2f7"
+magenta = "#bb9af7"
+cyan = "#7dcfff"
+white = "#a9b1d6"
 
 # Bright colors
 [colors.bright]
-black = '#414868'
-red = '#ff899d'
-green = '#9fe044'
-yellow = '#faba4a'
-blue = '#8db0ff'
-magenta = '#c7a9ff'
-cyan = '#a4daff'
-white = '#c0caf5'
+black = "#414868"
+red = "#ff899d"
+green = "#9fe044"
+yellow = "#faba4a"
+blue = "#8db0ff"
+magenta = "#c7a9ff"
+cyan = "#a4daff"
+white = "#c0caf5"
 
 # Indexed Colors
 [[colors.indexed_colors]]
 index = 16
-color = '#ff9e64'
+color = "#ff9e64"
 
 [[colors.indexed_colors]]
 index = 17
-color = '#db4b4b'
+color = "#db4b4b"
diff --git a/modules/desktop/wm/niri/noctalia/lockscreen.toml b/modules/desktop/wm/niri/noctalia/lockscreen.toml
index e6af1e4..917c1b5 100644
--- a/modules/desktop/wm/niri/noctalia/lockscreen.toml
+++ b/modules/desktop/wm/niri/noctalia/lockscreen.toml
@@ -5,10 +5,10 @@ wallpaper = "~/workspace/nixos-dotfiles/assets/wallpaper.png"
 enabled = true
 schema_version = 2
 widget_order = [
-    "lockscreen-login-box@DP-1",
-    "lockscreen-login-box@DP-2",
-    "lockscreen-widget-clock@DP-1",
-    "lockscreen-widget-clock@DP-2",
+  "lockscreen-login-box@DP-1",
+  "lockscreen-login-box@DP-2",
+  "lockscreen-widget-clock@DP-1",
+  "lockscreen-widget-clock@DP-2",
 ]
 
 [lockscreen_widgets.grid]
diff --git a/treefmt.nix b/treefmt.nix
index 5d96760..b75025e 100644
--- a/treefmt.nix
+++ b/treefmt.nix
@@ -1,12 +1,27 @@
-{ inputs, ... }:
-{
-  imports = [ inputs.treefmt.flakeModule ];
-  perSystem.treefmt = {
+{ inputs, ... }: {
+  imports = [
+    inputs.treefmt.flakeModule
+  ];
+  perSystem.treefmt = { lib, pkgs, ... }: {
     projectRootFile = "flake.nix";
     programs = {
       nixfmt.enable = true;
-      stylua.enable = true;
       keep-sorted.enable = true;
+      stylua.enable = true;
     };
+    settings.formatter.tombi = {
+      command = "${pkgs.bash}/bin/bash";
+      options = [
+        "-euc"
+        ''
+          for file in "$@"; do
+            ${lib.getExe pkgs.tombi} fmt $file
+          done
+        ''
+        "--"
+      ];
+      includes = [ "*.toml" ];
+    };
+    settings.excludes = [ "secrets/*" ];
   };
 }
diff --git a/typos.toml b/typos.toml
index aa28059..cc22d48 100644
--- a/typos.toml
+++ b/typos.toml
@@ -1,18 +1,13 @@
 #:schema https://raw.githubusercontent.com/crate-ci/typos/refs/heads/master/config.schema.json
 
 [files]
-extend-exclude = [
-    "secrets"
-]
+extend-exclude = ["secrets"]
+
+[default]
+extend-ignore-identifiers-re = ["KEY_102ND", "VE_UE"]
 
 [default.extend-words]
 # noice.nvim
 noice = "noice"
 enew = "enew"
 iif = "iif"
-
-[default]
-extend-ignore-identifiers-re = [
-    "KEY_102ND",
-    "VE_UE"
-]