format

flake.lock

@@ -665,8 +665,7 @@
         "nuschtos": "nuschtos",
         "snm": "snm",
         "sops-nix": "sops-nix_2",
-        "srvos": "srvos",
+        "srvos": "srvos"
-        "treefmt-nix": "treefmt-nix_4"
       }
     },
     "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",

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);
+      formatter = forSystems (
-      checks = forSystems (system: {
+        system:
-        formatting = (treefmtEval system).config.build.check self;
+        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" ];
+              };
+            };
+          };
+        }
+      );
     };
 }

nixos-modules/audio/default.nix

@@ -66,8 +66,8 @@ in
       let
         makePluginPath =
           format:
-          "$HOME/.${format}:" +
+          "$HOME/.${format}:"
-          (lib.makeSearchPath format [
+          + (lib.makeSearchPath format [
             "$HOME/.nix-profile/lib"
             "/run/current-system/sw/lib"
             "/etc/profiles/per-user/$USER/lib"

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
 {
 

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";

treefmt.nix

@@ -1,5 +0,0 @@
-{ pkgs, ... }:
-{
-  projectRootFile = "flake.nix";
-  programs.nixfmt-rfc-style.enable = true;
-}