chore(pre-commit): run formatting last

.pre-commit-config.yaml

@@ -11,13 +11,6 @@ repos:
 
   - repo: local
     hooks:
-      - id: nix-fmt
-        name: Check nix formatting
-        entry: nix fmt
-        language: system
-        files: .*\.nix$
-        stages: [pre-commit]
-
       - id: prettier
         name: Check css, scss, js, ts and yaml formatting
         entry: prettier
@@ -41,3 +34,19 @@ repos:
         files: .+\.nix$
         args: ["-e", "-l"]
         stages: [pre-commit]
+
+      - id: statix
+        name: Lint nix code
+        entry: statix
+        language: system
+        files: .+\.nix$
+        pass_filenames: false
+        args: [fix]
+        stages: [pre-commit]
+
+      - id: nix-fmt
+        name: Check nix formatting
+        entry: nix fmt
+        language: system
+        files: .*\.nix$
+        stages: [pre-commit]

flake.nix

@@ -75,6 +75,7 @@
               nodePackages.prettier
               typos
               deadnix
+              statix
               inputs'.agenix.packages.default
             ];
             shellHook = ''

home/graphical/thunderbird/default.nix

@@ -1,5 +1,4 @@
-{ ... }:
+_: {
-{
   programs.thunderbird = {
     enable = true;
     settings = {

home/hyprland/default.nix

@@ -9,8 +9,8 @@ let
   inherit (lib) mapAttrsToList mkIf hasAttr;
   inherit (lib.my) getExe getExe';
 
-  roles = osConfig.modules.system.roles;
+  inherit (osConfig.modules.system) roles;
-  desktop = osConfig.modules.system.roles.desktop;
+  inherit (osConfig.modules.system.roles) desktop;
 in
 mkIf osConfig.programs.hyprland.enable {
   home.sessionVariables.ELECTRON_OZONE_PLATFORM_HINT = "auto";

home/sway/default.nix

@@ -10,7 +10,7 @@ let
   inherit (lib) mapAttrs mkIf;
   inherit (lib.my) getExe getExe';
 
-  desktop = osConfig.modules.system.roles.desktop;
+  inherit (osConfig.modules.system.roles) desktop;
   term = getExe desktop.terminal;
   filemanager = getExe desktop.filemanager;
   cliphistEnabled = osConfig.modules.services.cliphist.enable;

modules/nix/overlays.nix

@@ -9,10 +9,10 @@
     (final: prev: {
       scripts = import ../scripts {
         inherit lib config;
-        pkgs = prev.pkgs;
+        inherit (prev) pkgs;
       };
 
-      nysh = inputs'.nysh.packages.nysh;
+      inherit (inputs'.nysh.packages) nysh;
     })
   ];
 }

modules/scripts/default.nix

@@ -8,7 +8,7 @@ let
   inherit (pkgs.writers) writeFishBin writeBashBin;
   inherit (lib.my) getExe;
 
-  runner = config.modules.system.roles.desktop.runner;
+  inherit (config.modules.system.roles.desktop) runner;
 
   nixos-rebuild =
     name: word:

options/fixes/rsyncd.nix

@@ -20,7 +20,7 @@ in
     };
 
     settings = lib.mkOption {
-      type = settingsFormat.type;
+      inherit (settingsFormat) type;
       default = { };
       example = {
         globalSection = {

options/server/navidrome.nix

@@ -45,7 +45,7 @@ in
         };
       };
     };
-    settings = options.services.navidrome.settings;
+    inherit (options.services.navidrome) settings;
     restartPolicy = mkOption {
       type = str;
       default = "always";
@@ -60,7 +60,7 @@ in
     fileSystems.${cfg.library.path} = mkIf (cfg.library.type == "nfs") {
       device = "${cfg.library.source.ip}:${cfg.library.source.path}";
       fsType = "nfs";
-      options = cfg.library.source.options;
+      inherit (cfg.library.source) options;
     };
 
     systemd.tmpfiles.rules = mkIf (cfg.library.type == "nfs") [

options/server/paperless-ngx/default.nix

@@ -22,7 +22,7 @@ in
       description = "Whether the port should be publicly accessible.";
       type = bool;
     };
-    settings = options.services.paperless.settings;
+    inherit (options.services.paperless) settings;
   };
 
   config = mkIf cfg.enable {

options/server/rustypaste.nix

@@ -134,7 +134,7 @@ in
     users.users = mkIf (cfg.user == "rustypaste") {
       rustypaste = {
         useDefaultShell = true;
-        group = cfg.group;
+        inherit (cfg) group;
         isSystemUser = true;
       };
     };

options/services/rsync-backup/default.nix

@@ -85,7 +85,7 @@ in
 
     port = mkOption {
       type = port;
-      default = options.modules.server.rsync-daemon.port.default;
+      inherit (options.modules.server.rsync-daemon.port) default;
     };
   };
 

options/system/users/default.nix

@@ -15,22 +15,19 @@ let
     ;
 
   cfg = config.modules.system.users;
-  file = submodule (
+  file = submodule (_: {
-    { ... }:
+    options = {
-    {
+      path = mkOption {
-      options = {
+        type = either package null;
-        path = mkOption {
+        default = null;
-          type = either package null;
-          default = null;
-        };
-
-        content = mkOption {
-          type = either str null;
-          default = null;
-        };
       };
-    }
+
-  );
+      content = mkOption {
+        type = either str null;
+        default = null;
+      };
+    };
+  });
 in
 {
   options.modules.system.users = mkOption {

parts/lib/default.nix

@@ -5,7 +5,7 @@
       my = import ./functions.nix {
         inherit inputs;
         lib = self;
-        self = args.self;
+        inherit (args) self;
       };
     }
   );

parts/lib/functions.nix

@@ -112,7 +112,7 @@ in
 
   disko = {
     mkBoot = size: {
-      size = size;
+      inherit size;
       type = "EF00";
       content = {
         type = "filesystem";

parts/templates/basic/flake.nix

@@ -21,7 +21,7 @@
         devShell = pkgs.mkShell { buildInputs = with pkgs; [ ]; };
 
         packages.${system} = {
-          hello = pkgs.hello;
+          inherit (pkgs) hello;
           default = self.packages.hello;
         };
       }

parts/templates/rust/flake.nix

@@ -30,12 +30,12 @@
 
         rustBuild = rustPlatform.buildRustPackage {
           inherit pname;
-          version = manifest.version;
+          inherit (manifest) version;
           src = ./.;
           cargoLock.lockFile = ./Cargo.lock;
 
           meta = {
-            description = manifest.description;
+            inherit (manifest) description;
             #license = nixpkgs.lib.licenses.unlicense;
             maintainers = [ ];
           };

users/ny/programs/fuzzel.nix

@@ -4,7 +4,7 @@ let
 in
 {
   rum.programs.fuzzel = {
-    enable = desktop.enable;
+    inherit (desktop) enable;
     settings = {
       main = {
         icon-theme = "Papirus-Dark";