diff --git a/arm64.nix b/arm64.nix
index 0dbce43..dec4405 100644
--- a/arm64.nix
+++ b/arm64.nix
@@ -1,6 +1,4 @@
-{ lib, ... }:
-with lib.kernel;
-{
+{ lib, ... }: with lib.kernel; {
   ARM64_VA_BITS_48 = yes;
   ARM64_PAN = yes;
   ARM64_USE_LSE_ATOMICS = yes;
diff --git a/audio.nix b/audio.nix
index 1c3302b..29f8539 100644
--- a/audio.nix
+++ b/audio.nix
@@ -1,6 +1,4 @@
-{ lib, ... }:
-with lib.kernel;
-{
+{ lib, ... }: with lib.kernel; {
   SOUND = yes;
   SND = yes;
   SND_PCM_TIMER = yes;
diff --git a/base.nix b/base.nix
index fcad6f8..1766d02 100644
--- a/base.nix
+++ b/base.nix
@@ -1,9 +1,7 @@
-{ lib, hostPlatform, ... }@args:
-with lib.kernel;
+{ lib, hostPlatform, ... }@args: with lib.kernel;
 
-(import ./disable.nix args)
-// (import ./systemd.nix args)
-// {
+(import ./disable.nix args) //
+(import ./systemd.nix args) // {
   KERNEL_ZSTD = yes;
 
   SYSVIPC = yes;
diff --git a/disable.nix b/disable.nix
index c8e9a7e..611ec00 100644
--- a/disable.nix
+++ b/disable.nix
@@ -1,6 +1,4 @@
-{ lib, ... }:
-with lib.kernel;
-{
+{ lib, ... }: with lib.kernel; {
   X86_MPPARSE = option no;
   AMD_NUMA = option no;
 
diff --git a/dm-crypt.nix b/dm-crypt.nix
index 339cb4c..e7fa2f0 100644
--- a/dm-crypt.nix
+++ b/dm-crypt.nix
@@ -1,6 +1,4 @@
-{ lib, hostPlatform, ... }:
-with lib.kernel;
-{
+{ lib, hostPlatform, ... }: with lib.kernel; {
   MD = yes;
   MD_BITMAP_FILE = no;
   BLK_DEV_DM = yes;
@@ -15,17 +13,14 @@ with lib.kernel;
 
   CRYPTO_USER_API_HASH = yes;
   CRYPTO_USER_API_SKCIPHER = yes;
-}
-// lib.optionalAttrs hostPlatform.isx86_64 {
+} // lib.optionalAttrs hostPlatform.isx86_64 {
   CRYPTO_AES_NI_INTEL = yes;
   CRYPTO_AEGIS128_AESNI_SSE2 = yes;
   CRYPTO_SHA256_SSSE3 = yes;
-}
-// lib.optionalAttrs hostPlatform.isRiscV64 {
+} // lib.optionalAttrs hostPlatform.isRiscV64 {
   CRYPTO_AES_RISCV64 = yes;
   CRYPTO_SHA256_RISCV64 = yes;
-}
-// lib.optionalAttrs hostPlatform.isAarch64 {
+} // lib.optionalAttrs hostPlatform.isAarch64 {
   CRYPTO_AES_ARM64 = yes;
   CRYPTO_AES_ARM64_CE = yes;
   CRYPTO_AES_ARM64_CE_BLK = yes;
diff --git a/flake.nix b/flake.nix
index 76415eb..9c22667 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,56 +8,40 @@
     extra-trusted-public-keys = [ "cache.kyouma.net:Frjwu4q1rnwE/MnSTmX9yx86GNA/z3p/oElGvucLiZg=" ];
   };
 
-  outputs =
-    { self, nixpkgs, ... }:
+  outputs = { self, nixpkgs, ... }:
+  let
+    inherit (nixpkgs) lib;
+    inherit (lib) mapAttrs;
+
+    profiles = import ./profiles.nix;
+    legacyPackages = mapAttrs (system: profile: import nixpkgs { inherit system; }) profiles;
+    linux-hardened = import ./linux-hardened.nix;
+  in {
+    packages = mapAttrs
+      (system: profiles: mapAttrs
+        (name: profile: linux-hardened legacyPackages.${system} profile)
+      profiles) profiles;
+
+    devShells = mapAttrs (system: profile:
     let
-      inherit (nixpkgs) lib;
-      inherit (lib) mapAttrs;
-      profiles = import ./profiles.nix;
+      pkgs = legacyPackages.${system};
+      dummy = linux-hardened pkgs { arch = ""; config = ./dummy.nix; firmware = [ ]; };
 
-      legacyPackages = mapAttrs (system: profile: import nixpkgs { inherit system; }) profiles;
+      mkShell = packages:
+        pkgs.mkShell {
+          inherit packages;
+          shellHook = ''
+            exec $SHELL
+          '';
+        };
+    in {
+      default = mkShell
+        (with pkgs; dummy.nativeBuildInputs ++ [ ncurses pkg-config ]);
+    }) profiles;
 
-      linux-hardened = import ./linux-hardened.nix;
-    in
-    {
-      packages = mapAttrs (
-        system: profiles: mapAttrs (name: profile: linux-hardened legacyPackages.${system} profile) profiles
-      ) profiles;
-
-      devShells = mapAttrs (
-        system: profile:
-        let
-          pkgs = legacyPackages.${system};
-          dummy = linux-hardened pkgs {
-            arch = "";
-            config = ./dummy.nix;
-            firmware = [ ];
-          };
-
-          mkShell =
-            packages:
-            pkgs.mkShell {
-              inherit packages;
-              shellHook = ''
-                exec $SHELL
-              '';
-            };
-        in
-        {
-          default = mkShell (
-            with pkgs;
-            dummy.nativeBuildInputs
-            ++ [
-              ncurses
-              pkg-config
-            ]
-          );
-        }
-      ) profiles;
-
-      hydraJobs = {
-        kernel = self.packages;
-        shell = self.devShells;
-      };
+    hydraJobs = {
+      kernel = self.packages;
+      shell = self.devShells;
     };
+  };
 }
diff --git a/linux-hardened.nix b/linux-hardened.nix
index 657863d..a2d3709 100644
--- a/linux-hardened.nix
+++ b/linux-hardened.nix
@@ -1,9 +1,4 @@
-pkgs:
-{
-  arch,
-  config,
-  firmware,
-}:
+pkgs: { arch, config, firmware }:
 let
   inherit (pkgs)
     lib
@@ -11,26 +6,23 @@ let
     buildLinux
     fetchFromGitHub
     gccStdenv
-    runCommand
-    ;
+    runCommand;
 
-  kernel =
-    let
-      args = {
-        inherit (pkgs) lib hostPlatform;
-      };
+  kernel = let
+    args = {
+      inherit (pkgs) lib hostPlatform;
+    };
 
-      firmwareEnv = buildEnv {
-        name = "linux-firmware";
-        pathsToLink = [ "/lib/firmware" ];
-        paths = with pkgs; [
-          linux-firmware
-          sof-firmware
-          wireless-regdb
-        ];
-      };
-    in
-    buildLinux rec {
+    firmwareEnv = buildEnv {
+      name = "linux-firmware";
+      pathsToLink = [ "/lib/firmware" ];
+      paths = with pkgs; [
+        linux-firmware
+        sof-firmware
+        wireless-regdb
+      ];
+    };
+  in buildLinux rec {
       pname = "linux-hardened";
       version = "6.10.4-hardened1";
 
@@ -46,9 +38,9 @@ let
       enableCommonConfig = false;
 
       structuredExtraConfig =
-        (import ./base.nix args)
-        // (import config args)
-        // lib.optionalAttrs (firmware != [ ]) {
+        (import ./base.nix args) //
+        (import config args) //
+        lib.optionalAttrs (firmware != [ ]) {
           EXTRA_FIRMWARE = lib.kernel.freeform (toString firmware);
           EXTRA_FIRMWARE_DIR = lib.kernel.freeform "${firmwareEnv}/lib/firmware";
         };
@@ -56,11 +48,11 @@ let
       features = {
         efiBootStub = true;
       };
+
       isHardened = true;
       stdenv = gccStdenv;
     };
-in
-kernel.overrideAttrs (base: {
+in kernel.overrideAttrs (base: {
   installFlags = base.installFlags or [ ] ++ [ "INSTALL_MOD_PATH=$(out)" ];
 
   postInstall = ''
diff --git a/physical.nix b/physical.nix
index c4dd681..ac4c7cb 100644
--- a/physical.nix
+++ b/physical.nix
@@ -1,6 +1,4 @@
-{ lib, ... }:
-with lib.kernel;
-{
+{ lib, ... }: with lib.kernel; {
   MICROCODE = yes;
 
   ENERGY_MODEL = yes;
diff --git a/portable.nix b/portable.nix
index 46c482e..0fc20d2 100644
--- a/portable.nix
+++ b/portable.nix
@@ -1,6 +1,4 @@
-{ lib, ... }:
-with lib.kernel;
-{
+{ lib, ... }: with lib.kernel; {
   PREEMPT_VOLUNTARY = yes;
 
   SUSPEND = yes;
diff --git a/profiles.nix b/profiles.nix
index 55202df..c8bd676 100644
--- a/profiles.nix
+++ b/profiles.nix
@@ -44,6 +44,7 @@
       firmware = [ ];
     };
   };
+
   riscv64-linux = {
     qemu-virtio = {
       arch = "rv64gc";
@@ -51,6 +52,7 @@
       firmware = [ ];
     };
   };
+
   aarch64-linux = {
     qemu-virtio = {
       arch = "armv8.2-a";
diff --git a/qemu-virtio.nix b/qemu-virtio.nix
index 8fb7e18..6a3c3a0 100644
--- a/qemu-virtio.nix
+++ b/qemu-virtio.nix
@@ -1,7 +1,4 @@
-{ lib, ... }:
-
-with lib.kernel;
-{
+{ lib, ... }: with lib.kernel; {
   NR_CPUS = freeform "8";
 
   HYPERVISOR_GUEST = yes;
diff --git a/riscv.nix b/riscv.nix
index b3bc8a0..245843f 100644
--- a/riscv.nix
+++ b/riscv.nix
@@ -1,6 +1,4 @@
-{ lib, ... }:
-with lib.kernel;
-{
+{ lib, ... }: with lib.kernel; {
   ARCH_RV64I = yes;
   COMPAT = no;
 
diff --git a/router.nix b/router.nix
index dd234df..8813b94 100644
--- a/router.nix
+++ b/router.nix
@@ -1,7 +1,4 @@
-{ lib, ... }:
-
-with lib.kernel;
-{
+{ lib, ... }: with lib.kernel; {
   IP_ADVANCED_ROUTER = yes;
   IP_MULTIPLE_TABLES = yes;
   IP_ROUTE_MULTIPATH = yes;
diff --git a/systemd.nix b/systemd.nix
index cf008bf..9b5dd44 100644
--- a/systemd.nix
+++ b/systemd.nix
@@ -1,6 +1,4 @@
-{ lib, ... }:
-with lib.kernel;
-{
+{ lib, ... }: with lib.kernel; {
   # Base requirements
   DEVTMPFS = yes;
   CGROUPS = yes;
diff --git a/wireless.nix b/wireless.nix
index f72c048..703679f 100644
--- a/wireless.nix
+++ b/wireless.nix
@@ -1,6 +1,4 @@
-{ lib, hostPlatform, ... }:
-with lib.kernel;
-{
+{ lib, hostPlatform, ... }: with lib.kernel; {
   WIRELESS = yes;
   CFG80211 = yes;
   CFG80211_DEFAULT_PS = yes;
@@ -45,20 +43,17 @@ with lib.kernel;
   X509_CERTIFICATE_PARSER = option yes;
   PKCS7_MESSAGE_PARSER = option yes;
   PKCS8_PRIVATE_KEY_PARSER = option yes;
-}
-// lib.optionalAttrs hostPlatform.isx86_64 {
+} // lib.optionalAttrs hostPlatform.isx86_64 {
   CRYPTO_AES_NI_INTEL = option yes;
   CRYPTO_DES3_EDE_X86_64 = option yes;
   CRYPTO_SHA1_SSSE3 = option yes;
   CRYPTO_SHA256_SSSE3 = option yes;
   CRYPTO_SHA512_SSSE3 = option yes;
-}
-// lib.optionalAttrs hostPlatform.isRiscV64 {
+} // lib.optionalAttrs hostPlatform.isRiscV64 {
   CRYPTO_AES_RISCV64 = option yes;
   CRYPTO_SHA256_RISCV64 = option yes;
   CRYPTO_SHA512_RISCV64 = option yes;
-}
-// lib.optionalAttrs hostPlatform.isAarch64 {
+} // lib.optionalAttrs hostPlatform.isAarch64 {
   CRYPTO_AES_ARM64_CE = option yes;
   CRYPTO_AES_ARM64_CE_BLK = option yes;
   CRYPTO_SHA1_ARM64_CE = option yes;
diff --git a/x86.nix b/x86.nix
index ed88279..e82a75d 100644
--- a/x86.nix
+++ b/x86.nix
@@ -1,6 +1,4 @@
-{ lib, hostPlatform, ... }:
-with lib.kernel;
-{
+{ lib, hostPlatform, ... }: with lib.kernel; {
   SCHED_OMIT_FRAME_POINTER = yes;
 
   X86_FRED = yes;