Fix action

Also, exclude .pre-commit-config.yaml from the SOPS differ

.gitattributes

@@ -1,2 +1,3 @@
 *.yaml diff=sopsdiffer
+.pre-commit-config.yaml diff=default
 

.github/workflows/validate.yml

@@ -18,10 +18,10 @@ jobs:
         run: nix flake show
 
       - name: Check formatting
-        run: nix fmt --check .
+        run: nix fmt -- --ci .
 
       - name: Run deadnix
-        run: deadnix ./modules ./lib
+        run: nix run nixpkgs#deadnix ./modules ./lib
 
       - name: Run statix
-        run: statix check ./modules ./lib
+        run: nix run nixpkgs#statix check -- .

.pre-commit-config.yaml

@@ -0,0 +1,25 @@
+repos:
+  - repo: local
+    hooks:
+      - id: nixfmt
+        name: nixfmt
+        entry: nix
+        language: system
+        types: [nix]
+        pass_filenames: false
+        args: ["fmt"]
+
+      - id: deadnix
+        name: deadnix
+        entry: deadnix
+        language: system
+        types: [nix]
+        args: ["./modules", "./lib"]
+
+      - id: statix
+        name: statix
+        entry: statix
+        language: system
+        types: [nix]
+        args: ["check", "--", "."]
+

flake.nix

@@ -100,7 +100,7 @@
       ];
     in
     {
-      formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.nixfmt);
+      formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.nixfmt-tree);
 
       # Darwin (macOS) hosts
       darwinConfigurations = {

modules/hosts/darwin/AirPuppet/default.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   system.stateVersion = 4;
 
   homebrew = {

modules/hosts/home-manager-only/home-gene.liverman.nix

@@ -1,4 +1,3 @@
-{ ... }:
+_: {
-{
   # Settings just for work machines go here
 }

modules/hosts/nixos/hetznix01/home-gene.nix

@@ -1,4 +1,3 @@
-{ ... }:
+_: {
-{
   home.stateVersion = "24.05";
 }

modules/hosts/nixos/hetznix02/home-gene.nix

@@ -1,4 +1,3 @@
-{ ... }:
+_: {
-{
   home.stateVersion = "24.05";
 }

modules/hosts/nixos/kiosk-entryway/home-gene.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   home.stateVersion = "24.11";
 
   programs = {

modules/hosts/nixos/kiosk-gene-desk/home-gene.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   home.stateVersion = "24.11";
 
   programs = {

modules/hosts/nixos/nixnas1/disk-config.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   disko.devices = {
     disk = {
       sdc = {

modules/hosts/nixos/nixnas1/home-gene.nix

@@ -1,4 +1,3 @@
-{ ... }:
+_: {
-{
   home.stateVersion = "24.05";
 }

modules/hosts/nixos/nixnuc/containers/audiobookshelf.nix

@@ -1,4 +1,4 @@
-{ ... }:
+_:
 let
   volume_base = "/var/lib/audiobookshelf";
   http_port = "13378";

modules/hosts/nixos/nixnuc/home-gene.nix

@@ -1,4 +1,3 @@
-{ ... }:
+_: {
-{
   home.stateVersion = "23.11";
 }

modules/hosts/nixos/rainbow-planet/home-gene.nix

@@ -11,15 +11,14 @@
   ];
 
   home.file = {
-    ".config/hypr/frappe.conf".source = (
+    ".config/hypr/frappe.conf".source =
       pkgs.fetchFromGitHub {
         owner = "catppuccin";
         repo = "hyprland";
         rev = "99a88fd21fac270bd999d4a26cf0f4a4222c58be";
         hash = "sha256-07B5QmQmsUKYf38oWU3+2C6KO4JvinuTwmW1Pfk8CT8=";
       }
-      + "/themes/frappe.conf"
+      + "/themes/frappe.conf";
-    );
   };
 
   programs = {

modules/shared/home/general/default.nix

@@ -51,7 +51,7 @@ in
     nodejs
     nurl
     nvd
-    nixfmt
+    nixfmt-tree
     onefetch
     powershell
     pre-commit

modules/shared/home/linux/apps/hexchat.nix

@@ -1,4 +1,3 @@
-{ ... }:
+_: {
-{
   programs.hexchat.enable = true;
 }

modules/shared/home/linux/apps/pidgin.nix

@@ -1,4 +1,3 @@
-{ ... }:
+_: {
-{
   programs.pidgin.enable = true;
 }

modules/shared/home/linux/apps/tilix.nix

@@ -39,14 +39,13 @@ with lib.hm.gvariant;
 
   home.file = {
     ".config/tilix/schemes/Beanbag-Mathias.json".source = ../../../files/tilix/Beanbag-Mathias.json;
-    ".config/tilix/schemes/Catppuccin-Frappe.json".source = (
+    ".config/tilix/schemes/Catppuccin-Frappe.json".source =
       pkgs.fetchFromGitHub {
         owner = "catppuccin";
         repo = "tilix";
         rev = "3fd05e03419321f2f2a6aad6da733b28be1765ef";
         hash = "sha256-SI7QxQ+WBHzeuXbTye+s8pi4tDVZOV4Aa33mRYO276k=";
       }
-      + "/src/Catppuccin-Frappe.json"
+      + "/src/Catppuccin-Frappe.json";
-    );
   };
 }

modules/shared/home/linux/apps/waybar.nix

@@ -2,15 +2,14 @@
 {
   home.file = {
     ".config/waybar/config".source = ../../../files/waybar/config;
-    ".config/waybar/frappe.css".source = (
+    ".config/waybar/frappe.css".source =
       pkgs.fetchFromGitHub {
         owner = "catppuccin";
         repo = "waybar";
         rev = "f74ab1eecf2dcaf22569b396eed53b2b2fbe8aff";
         hash = "sha256-WLJMA2X20E5PCPg0ZPtSop0bfmu+pLImP9t8A8V4QK8=";
       }
-      + "/themes/frappe.css"
+      + "/themes/frappe.css";
-    );
     ".config/waybar/style.css".source = ../../../files/waybar/style.css;
   };
 

modules/shared/home/linux/apps/xfce4-terminal.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   home.file = {
     ".config/xfce4/terminal/accels.scm".source = ../../../files/xfce4/terminal/accels.scm;
   };

modules/shared/nixos/flatpaks.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   services = {
     flatpak = {
       enable = true;

modules/shared/nixos/internationalisation.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   # Select internationalisation properties.
   i18n = {
     defaultLocale = "en_US.UTF-8";

modules/shared/nixos/nixroutes.nix

@@ -1,6 +1,6 @@
 { config, lib, ... }:
 let
-  hostName = config.networking.hostName;
+  inherit (config.networking) hostName;
 in
 {
   programs.zsh.shellAliases.nixroutes = "cd ~/repos/dots && echo '=== Current Routes ===' && ip route show && ip -6 route show && echo '' && echo '=== New Build Routes ===' && nix eval --json '.#nixosConfigurations.${hostName}.config.systemd.network.networks.\"10-wan\".routes'";