diff --git a/flake.lock b/flake.lock
index 2dd00af..3242ff9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -665,8 +665,7 @@
         "nuschtos": "nuschtos",
         "snm": "snm",
         "sops-nix": "sops-nix_2",
-        "srvos": "srvos",
-        "treefmt-nix": "treefmt-nix_4"
+        "srvos": "srvos"
       }
     },
     "snm": {
@@ -867,26 +866,6 @@
         "repo": "treefmt-nix",
         "type": "github"
       }
-    },
-    "treefmt-nix_4": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1743081648,
-        "narHash": "sha256-WRAylyYptt6OX5eCEBWyTwOEqEtD6zt33rlUkr6u3cE=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "29a3d7b768c70addce17af0869f6e2bd8f5be4b7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index e9908e5..2d96da2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,25 +59,17 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.disko.follows = "disko";
     };
-
-    # Flake Stuff
-    treefmt-nix = {
-      url = "github:numtide/treefmt-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs =
     inputs@{
       self,
       nixpkgs,
-      treefmt-nix,
       ...
     }:
     let
       forSystems = f: nixpkgs.lib.attrsets.genAttrs nixpkgs.lib.systems.flakeExposed (system: f system);
       pkgs' = system: nixpkgs.legacyPackages.${system};
-      treefmtEval = system: treefmt-nix.lib.evalModule (pkgs' system) ./treefmt.nix;
     in
     {
       modules.default = import ./modules;
@@ -91,9 +83,25 @@
           pkgs = pkgs' system;
         }
       );
-      formatter = forSystems (system: (treefmtEval system).config.build.wrapper);
-      checks = forSystems (system: {
-        formatting = (treefmtEval system).config.build.check self;
-      });
+      formatter = forSystems (
+        system:
+        let
+          pkgs = pkgs' system;
+        in
+        pkgs.treefmt.withConfig {
+          runtimeInputs = with pkgs; [
+            nixfmt-rfc-style
+          ];
+          settings = {
+            tree-root-file = ".git/index";
+            formatter = {
+              nixfmt = {
+                command = "nixfmt";
+                includes = [ "*.nix" ];
+              };
+            };
+          };
+        }
+      );
     };
 }
diff --git a/nixos-modules/audio/default.nix b/nixos-modules/audio/default.nix
index 830b3ae..13f3fe3 100644
--- a/nixos-modules/audio/default.nix
+++ b/nixos-modules/audio/default.nix
@@ -65,13 +65,13 @@ in
     environment.sessionVariables =
       let
         makePluginPath =
-        format:
-          "$HOME/.${format}:" +
-          (lib.makeSearchPath format [
+          format:
+          "$HOME/.${format}:"
+          + (lib.makeSearchPath format [
             "$HOME/.nix-profile/lib"
             "/run/current-system/sw/lib"
             "/etc/profiles/per-user/$USER/lib"
-            ]);
+          ]);
       in
       {
         CLAP_PATH = lib.mkDefault (makePluginPath "clap");
diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix
index a2823b5..bcb41ea 100644
--- a/systems/hetzner/default.nix
+++ b/systems/hetzner/default.nix
@@ -7,7 +7,8 @@
 }:
 
 let
-  network_interface_name = (lib.elemAt config.facter.report.hardware.network_interface 0).unix_device_name;
+  network_interface_name =
+    (lib.elemAt config.facter.report.hardware.network_interface 0).unix_device_name;
 in
 {
 
@@ -116,7 +117,7 @@ in
           federating = true;
           federation_incoming_replies_max_depth = null;
           max_remote_account_fields = 100;
-          federated_timeline_available =true;
+          federated_timeline_available = true;
           languages = [
             "en"
             "de"
diff --git a/systems/omoikane/hardware.nix b/systems/omoikane/hardware.nix
index 006d1f7..db35b43 100644
--- a/systems/omoikane/hardware.nix
+++ b/systems/omoikane/hardware.nix
@@ -12,7 +12,10 @@
   fileSystems."/home/jopejoe1/Public/games" = {
     device = "/dev/sda";
     fsType = "bcachefs";
-    options = [ "compression=zstd" "nofail" ];
+    options = [
+      "compression=zstd"
+      "nofail"
+    ];
   };
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
diff --git a/treefmt.nix b/treefmt.nix
deleted file mode 100644
index b9f9658..0000000
--- a/treefmt.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }:
-{
-  projectRootFile = "flake.nix";
-  programs.nixfmt-rfc-style.enable = true;
-}