treewide: add and apply nixfmt pre-commit hook

Link: danth#519
trueNAHO · Jan 4, 2025 · ad64260 · ad64260
1 parent 807c818
commit ad64260
Show file tree

Hide file tree

Showing 108 changed files with 3,125 additions and 2,353 deletions.
diff --git a/default.nix b/default.nix
@@ -1,6 +1,9 @@
-(import (let lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-in fetchTarball {
-  url =
-    "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-  sha256 = lock.nodes.flake-compat.locked.narHash;
-}) { src = ./.; }).defaultNix
+(import (
+  let
+    lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+  in
+  fetchTarball {
+    url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+    sha256 = lock.nodes.flake-compat.locked.narHash;
+  }
+) { src = ./.; }).defaultNix
diff --git a/docs/default.nix b/docs/default.nix
@@ -1,28 +1,38 @@
-{ pkgs, lib, inputs, ... }:
+{
+  pkgs,
+  lib,
+  inputs,
+  ...
+}:
 
 let
-  makeOptionsDoc = configuration: pkgs.nixosOptionsDoc {
-    inherit (configuration) options;
+  makeOptionsDoc =
+    configuration:
+    pkgs.nixosOptionsDoc {
+      inherit (configuration) options;
 
-    # Filter out any options not beginning with `stylix`
-    transformOptions = option: option // {
-      visible = option.visible &&
-        builtins.elemAt option.loc 0 == "stylix";
+      # Filter out any options not beginning with `stylix`
+      transformOptions =
+        option:
+        option
+        // {
+          visible = option.visible && builtins.elemAt option.loc 0 == "stylix";
+        };
     };
-  };
 
-  nixos = makeOptionsDoc
-    (lib.nixosSystem {
+  nixos = makeOptionsDoc (
+    lib.nixosSystem {
       inherit (pkgs) system;
       modules = [
         inputs.home-manager.nixosModules.home-manager
         inputs.self.nixosModules.stylix
         ./settings.nix
       ];
-    });
+    }
+  );
 
-  homeManager = makeOptionsDoc
-    (inputs.home-manager.lib.homeManagerConfiguration {
+  homeManager = makeOptionsDoc (
+    inputs.home-manager.lib.homeManagerConfiguration {
       inherit pkgs;
       modules = [
         inputs.self.homeManagerModules.stylix
@@ -35,9 +45,11 @@ let
           };
         }
       ];
-    });
+    }
+  );
 
-in pkgs.stdenvNoCC.mkDerivation {
+in
+pkgs.stdenvNoCC.mkDerivation {
   name = "stylix-book";
   src = ./.;
 

diff --git a/flake.nix b/flake.nix
@@ -90,17 +90,30 @@
   };
 
   outputs =
-    { nixpkgs, base16, self, ... }@inputs:
+    {
+      nixpkgs,
+      base16,
+      self,
+      ...
+    }@inputs:
     inputs.flake-utils.lib.eachDefaultSystem (
-      system: let
+      system:
+      let
         inherit (nixpkgs) lib;
         pkgs = nixpkgs.legacyPackages.${system};
-      in {
+      in
+      {
         checks = lib.attrsets.unionOfDisjoint {
           git-hooks = inputs.git-hooks.lib.${system}.run {
             hooks = {
               deadnix.enable = true;
               hlint.enable = true;
+
+              nixfmt-rfc-style = {
+                enable = true;
+                settings.width = 80;
+              };
+
               statix.enable = true;
               stylish-haskell.enable = true;
               typos.enable = true;
@@ -127,7 +140,8 @@
           };
         };
 
-        packages = let
+        packages =
+          let
             universalPackages = {
               docs = import ./docs { inherit pkgs inputs lib; };
 
@@ -159,41 +173,47 @@
 
             # Testbeds are virtual machines based on NixOS, therefore they are
             # only available for Linux systems.
-            testbedPackages = lib.optionalAttrs
-              (lib.hasSuffix "-linux" system)
-              (import ./stylix/testbed.nix { inherit pkgs inputs lib; });
+            testbedPackages = lib.optionalAttrs (lib.hasSuffix "-linux" system) (
+              import ./stylix/testbed.nix { inherit pkgs inputs lib; }
+            );
           in
-            universalPackages // testbedPackages;
+          universalPackages // testbedPackages;
       }
     )
     // {
-      nixosModules.stylix = { pkgs, ... }@args: {
-        imports = [
-          (import ./stylix/nixos inputs {
-            inherit (self.packages.${pkgs.system}) palette-generator;
-            base16 = base16.lib args;
-            homeManagerModule = self.homeManagerModules.stylix;
-          })
-        ];
-      };
+      nixosModules.stylix =
+        { pkgs, ... }@args:
+        {
+          imports = [
+            (import ./stylix/nixos inputs {
+              inherit (self.packages.${pkgs.system}) palette-generator;
+              base16 = base16.lib args;
+              homeManagerModule = self.homeManagerModules.stylix;
+            })
+          ];
+        };
 
-      homeManagerModules.stylix = { pkgs, ... }@args: {
-        imports = [
-          (import ./stylix/hm inputs {
-            inherit (self.packages.${pkgs.system}) palette-generator;
-            base16 = base16.lib args;
-          })
-        ];
-      };
+      homeManagerModules.stylix =
+        { pkgs, ... }@args:
+        {
+          imports = [
+            (import ./stylix/hm inputs {
+              inherit (self.packages.${pkgs.system}) palette-generator;
+              base16 = base16.lib args;
+            })
+          ];
+        };
 
-      darwinModules.stylix = { pkgs, ... }@args: {
-        imports = [
-          (import ./stylix/darwin inputs {
-            inherit (self.packages.${pkgs.system}) palette-generator;
-            base16 = base16.lib args;
-            homeManagerModule = self.homeManagerModules.stylix;
-          })
-        ];
-      };
+      darwinModules.stylix =
+        { pkgs, ... }@args:
+        {
+          imports = [
+            (import ./stylix/darwin inputs {
+              inherit (self.packages.${pkgs.system}) palette-generator;
+              base16 = base16.lib args;
+              homeManagerModule = self.homeManagerModules.stylix;
+            })
+          ];
+        };
     };
 }
diff --git a/modules/alacritty/hm.nix b/modules/alacritty/hm.nix
@@ -7,48 +7,58 @@ let
   colors = config.lib.stylix.colors.withHashtag;
 in
 {
-  options.stylix.targets.alacritty.enable = config.lib.stylix.mkEnableTarget "Alacritty" true;
+  options.stylix.targets.alacritty.enable =
+    config.lib.stylix.mkEnableTarget "Alacritty" true;
 
-  config = lib.mkIf (config.stylix.enable && config.stylix.targets.alacritty.enable) {
-    programs.alacritty.settings = {
-      font = with config.stylix.fonts; {
-        normal = {
-          family = monospace.name;
-          style = "Regular";
+  config =
+    lib.mkIf (config.stylix.enable && config.stylix.targets.alacritty.enable)
+      {
+        programs.alacritty.settings = {
+          font = with config.stylix.fonts; {
+            normal = {
+              family = monospace.name;
+              style = "Regular";
+            };
+            size = sizes.terminal;
+          };
+          window.opacity = with config.stylix.opacity; terminal;
+          colors = with colors; {
+            primary = {
+              foreground = base05;
+              background = base00;
+              bright_foreground = base07;
+            };
+            selection = {
+              text = base05;
+              background = base02;
+            };
+            cursor = {
+              text = base00;
+              cursor = base05;
+            };
+            normal = {
+              black = base00;
+              white = base05;
+              inherit
+                red
+                green
+                yellow
+                blue
+                magenta
+                cyan
+                ;
+            };
+            bright = {
+              black = base03;
+              white = base07;
+              red = bright-red;
+              green = bright-green;
+              inherit yellow;
+              blue = bright-blue;
+              magenta = bright-magenta;
+              cyan = bright-cyan;
+            };
+          };
         };
-        size = sizes.terminal;
       };
-      window.opacity = with config.stylix.opacity; terminal;
-      colors = with colors; {
-        primary = {
-          foreground = base05;
-          background = base00;
-          bright_foreground = base07;
-        };
-        selection = {
-          text = base05;
-          background = base02;
-        };
-        cursor = {
-          text = base00;
-          cursor = base05;
-        };
-        normal = {
-          black = base00;
-          white = base05;
-          inherit red green yellow blue magenta cyan;
-        };
-        bright = {
-          black = base03;
-          white = base07;
-          red = bright-red;
-          green = bright-green;
-          inherit yellow;
-          blue = bright-blue;
-          magenta = bright-magenta;
-          cyan = bright-cyan;
-        };
-      };
-    };
-  };
 }
diff --git a/modules/alacritty/testbed.nix b/modules/alacritty/testbed.nix
@@ -1,18 +1,22 @@
 { pkgs, ... }:
 
-let package = pkgs.alacritty;
+let
+  package = pkgs.alacritty;
 
-in {
+in
+{
   stylix.testbed.application = {
     enable = true;
     name = "Alacritty";
     inherit package;
   };
 
-  home-manager.sharedModules = [{
-    programs.alacritty = {
-      enable = true;
-      inherit package;
-    };
-  }];
-}
+  home-manager.sharedModules = [
+    {
+      programs.alacritty = {
+        enable = true;
+        inherit package;
+      };
+    }
+  ];
+}
diff --git a/modules/avizo/hm.nix b/modules/avizo/hm.nix
@@ -1,4 +1,9 @@
-{ config, lib, options, ... }:
+{
+  config,
+  lib,
+  options,
+  ...
+}:
 
 with config.lib.stylix.colors;
 with config.stylix.fonts;
@@ -10,17 +15,19 @@ in
     config.lib.stylix.mkEnableTarget "Avizo" true;
 
   # Referenced https://github.com/stacyharper/base16-mako
-  config = lib.optionalAttrs (options.services ? avizo) (lib.mkIf (config.stylix.enable && config.stylix.targets.avizo.enable) {
-    services.avizo = {
+  config = lib.optionalAttrs (options.services ? avizo) (
+    lib.mkIf (config.stylix.enable && config.stylix.targets.avizo.enable) {
+      services.avizo = {
         settings = {
-            default = {
-              background = "rgba(${base01-rgb-r}, ${base01-rgb-g}, ${base01-rgb-b}, ${aviOpacity})";
-              border-color = "rgba(${base0D-rgb-r}, ${base0D-rgb-g}, ${base0D-rgb-b}, ${aviOpacity})";
-              bar-fg-color = "rgba(${base05-rgb-r}, ${base05-rgb-g}, ${base05-rgb-b}, ${aviOpacity})";
-              bar-bg-color = "rgba(${base01-rgb-r}, ${base01-rgb-g}, ${base01-rgb-b}, ${aviOpacity})";
-              image-opacity = aviOpacity;
-            };
+          default = {
+            background = "rgba(${base01-rgb-r}, ${base01-rgb-g}, ${base01-rgb-b}, ${aviOpacity})";
+            border-color = "rgba(${base0D-rgb-r}, ${base0D-rgb-g}, ${base0D-rgb-b}, ${aviOpacity})";
+            bar-fg-color = "rgba(${base05-rgb-r}, ${base05-rgb-g}, ${base05-rgb-b}, ${aviOpacity})";
+            bar-bg-color = "rgba(${base01-rgb-r}, ${base01-rgb-g}, ${base01-rgb-b}, ${aviOpacity})";
+            image-opacity = aviOpacity;
+          };
         };
-    };
-  });
+      };
+    }
+  );
 }
diff --git a/modules/bat/hm.nix b/modules/bat/hm.nix
@@ -1,12 +1,11 @@
 { config, lib, ... }:
 
 {
-  options.stylix.targets.bat.enable =
-    config.lib.stylix.mkEnableTarget "Bat" true;
+  options.stylix.targets.bat.enable = config.lib.stylix.mkEnableTarget "Bat" true;
 
   config = lib.mkIf (config.stylix.enable && config.stylix.targets.bat.enable) {
     programs.bat = {
-      # This theme is reused for yazi. Changes to the template 
+      # This theme is reused for yazi. Changes to the template
       # will need to be applied to modules/yazi/hm.nix
       themes."base16-stylix".src = config.lib.stylix.colors {
         template = ./base16-stylix.mustache;