diff --git a/.envrc b/.envrc
index 3140b68..6a37c4f 100644
--- a/.envrc
+++ b/.envrc
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 watch_file devshell.nix
 
 use flake
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 49f19df..512e01e 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,4 +4,4 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
-    assignees: [ "dadada" ]
+    assignees: ["dadada"]
diff --git a/.github/workflows/nix-flake-check.yml b/.github/workflows/nix-flake-check.yml
index b0c0fa3..28b1d3c 100644
--- a/.github/workflows/nix-flake-check.yml
+++ b/.github/workflows/nix-flake-check.yml
@@ -1,26 +1,24 @@
 name: Continuous Integration
-
 on:
   pull_request:
   push:
     branches: [main]
-
 jobs:
   checks:
     name: "Checks"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@v26
-      with:
-        nix_path: nixpkgs=channel:nixos-stable
-        extra_nix_config: |
-          experimental-features = nix-command flakes
-          access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-          system-features = nixos-test benchmark big-parallel kvm
-    - uses: cachix/cachix-action@v14
-      with:
-        name: dadada
-        signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
-        authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-    - run: nix flake check
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v26
+        with:
+          nix_path: nixpkgs=channel:nixos-stable
+          extra_nix_config: |
+            experimental-features = nix-command flakes
+            access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
+            system-features = nixos-test benchmark big-parallel kvm
+      - uses: cachix/cachix-action@v14
+        with:
+          name: dadada
+          signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
+          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+      - run: nix flake check
diff --git a/.github/workflows/nix-flake-update.yml b/.github/workflows/nix-flake-update.yml
index 9045f91..33843d1 100644
--- a/.github/workflows/nix-flake-update.yml
+++ b/.github/workflows/nix-flake-update.yml
@@ -3,7 +3,6 @@ on:
   workflow_dispatch: # allows manual triggering
   schedule:
     - cron: '0 0 * * 0' # runs weekly on Sunday at 00:00
-
 jobs:
   lockfile:
     runs-on: ubuntu-latest
@@ -16,6 +15,6 @@ jobs:
         uses: DeterminateSystems/update-flake-lock@v21
         with:
           pr-title: "Update flake.lock" # Title of PR to be created
-          pr-labels: |                  # Labels to be set on the PR
+          pr-labels: | # Labels to be set on the PR
             dependencies
             automated
diff --git a/devshell.nix b/devshell.nix
index ebdfb12..1fbad07 100644
--- a/devshell.nix
+++ b/devshell.nix
@@ -24,7 +24,7 @@
       name = "format";
       help = "Format the project";
       command = ''
-        nixpkgs-fmt .
+        treefmt .
       '';
       category = "dev";
     }
diff --git a/nixos/configurations.nix b/nixos/configurations.nix
index 7a4185a..95b894e 100644
--- a/nixos/configurations.nix
+++ b/nixos/configurations.nix
@@ -21,15 +21,14 @@ let
     nixpkgs.lib.nixosSystem {
       inherit system;
 
-      modules =
-        [
-          {
-            nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays;
-          }
-        ]
-        ++ (nixpkgs.lib.attrValues self.nixosModules)
-        ++ [ agenix.nixosModules.age ]
-        ++ extraModules;
+      modules = [
+        {
+          nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays;
+        }
+      ]
+      ++ (nixpkgs.lib.attrValues self.nixosModules)
+      ++ [ agenix.nixosModules.age ]
+      ++ extraModules;
     };
 in
 {
diff --git a/nixos/stolas/default.nix b/nixos/stolas/default.nix
index 4383cd0..696f55f 100644
--- a/nixos/stolas/default.nix
+++ b/nixos/stolas/default.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 {
 
   imports = [
@@ -124,7 +129,7 @@
       configs = {
         home = {
           SUBVOLUME = "/home/dadada";
-          ALLOW_USERS= ["dadada"];
+          ALLOW_USERS = [ "dadada" ];
           TIMELINE_CREATE = true;
           TIMELINE_CLEANUP = true;
           TIMELINE_MIN_AGE = "1800";
@@ -213,7 +218,7 @@
   #     owner = "paperless";
   #   };
   # };
-  
+
   # Create compressing swap space in RAM
   zramSwap.enable = true;
 }
diff --git a/outputs.nix b/outputs.nix
index aea7953..c860d3c 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -5,12 +5,14 @@
   nixpkgs,
   agenix,
   devshell,
+  treefmt-nix,
   ...
 }@inputs:
 (flake-utils.lib.eachDefaultSystem (
   system:
   let
     pkgs = import nixpkgs { inherit system; };
+    treefmtEval = treefmt-nix.lib.evalModule pkgs ./treefmt.nix;
   in
   {
     devShells.default =
@@ -26,7 +28,7 @@
       in
       import ./devshell.nix { inherit pkgs extraModules; };
 
-    formatter = pkgs.nixfmt-tree;
+    formatter = treefmtEval.config.build.wrapper;
 
     packages = import ./pkgs { inherit pkgs; } // {
       installer-iso = self.nixosConfigurations.installer.config.system.build.isoImage;
@@ -34,7 +36,6 @@
   }
 ))
 // {
-
   hmModules = import ./home/modules.nix { lib = nixpkgs.lib; };
 
   nixosConfigurations = import ./nixos/configurations.nix inputs;
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 9cd9053..9f52a8a 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,3 +1,4 @@
-{ pkgs }: {
-  citizen-cups = pkgs.callPackage ./citizen-cups.nix {};
+{ pkgs }:
+{
+  citizen-cups = pkgs.callPackage ./citizen-cups.nix { };
 }
diff --git a/treefmt.nix b/treefmt.nix
new file mode 100644
index 0000000..75acdfa
--- /dev/null
+++ b/treefmt.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+  projectRootFile = "flake.nix";
+  programs.nixfmt.enable = true;
+  programs.shellcheck.enable = pkgs.hostPlatform.system != "riscv64-linux";
+  programs.shfmt.enable = pkgs.hostPlatform.system != "riscv64-linux";
+  programs.yamlfmt.enable = true;
+}