Reformat code for compactness

arm64.nix

@@ -1,6 +1,4 @@
-{ lib, ... }:
+{ lib, ... }: with lib.kernel; {
-with lib.kernel;
-{
   ARM64_VA_BITS_48 = yes;
   ARM64_PAN = yes;
   ARM64_USE_LSE_ATOMICS = yes;

audio.nix

@@ -1,6 +1,4 @@
-{ lib, ... }:
+{ lib, ... }: with lib.kernel; {
-with lib.kernel;
-{
   SOUND = yes;
   SND = yes;
   SND_PCM_TIMER = yes;

base.nix

@@ -1,9 +1,7 @@
-{ lib, hostPlatform, ... }@args:
+{ lib, hostPlatform, ... }@args: with lib.kernel;
-with lib.kernel;
 
-(import ./disable.nix args)
+(import ./disable.nix args) //
-// (import ./systemd.nix args)
+(import ./systemd.nix args) // {
-// {
   KERNEL_ZSTD = yes;
 
   SYSVIPC = yes;

disable.nix

@@ -1,6 +1,4 @@
-{ lib, ... }:
+{ lib, ... }: with lib.kernel; {
-with lib.kernel;
-{
   X86_MPPARSE = option no;
   AMD_NUMA = option no;
 

dm-crypt.nix

@@ -1,6 +1,4 @@
-{ lib, hostPlatform, ... }:
+{ lib, hostPlatform, ... }: with lib.kernel; {
-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;

flake.nix

@@ -8,52 +8,36 @@
     extra-trusted-public-keys = [ "cache.kyouma.net:Frjwu4q1rnwE/MnSTmX9yx86GNA/z3p/oElGvucLiZg=" ];
   };
 
-  outputs =
+  outputs = { self, nixpkgs, ... }:
-    { 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
+  in {
-    {
+    packages = mapAttrs
-      packages = mapAttrs (
+      (system: profiles: mapAttrs
-        system: profiles: mapAttrs (name: profile: linux-hardened legacyPackages.${system} profile) profiles
+        (name: profile: linux-hardened legacyPackages.${system} profile)
-      ) profiles;
+      profiles) profiles;
 
-      devShells = mapAttrs (
+    devShells = mapAttrs (system: profile:
-        system: profile:
     let
       pkgs = legacyPackages.${system};
-          dummy = linux-hardened pkgs {
+      dummy = linux-hardened pkgs { arch = ""; config = ./dummy.nix; firmware = [ ]; };
-            arch = "";
-            config = ./dummy.nix;
-            firmware = [ ];
-          };
 
-          mkShell =
+      mkShell = packages:
-            packages:
         pkgs.mkShell {
           inherit packages;
           shellHook = ''
             exec $SHELL
           '';
         };
-        in
+    in {
-        {
+      default = mkShell
-          default = mkShell (
+        (with pkgs; dummy.nativeBuildInputs ++ [ ncurses pkg-config ]);
-            with pkgs;
+    }) profiles;
-            dummy.nativeBuildInputs
-            ++ [
-              ncurses
-              pkg-config
-            ]
-          );
-        }
-      ) profiles;
 
     hydraJobs = {
       kernel = self.packages;

linux-hardened.nix

@@ -1,9 +1,4 @@
-pkgs:
+pkgs: { arch, config, firmware }:
-{
-  arch,
-  config,
-  firmware,
-}:
 let
   inherit (pkgs)
     lib
@@ -11,11 +6,9 @@ let
     buildLinux
     fetchFromGitHub
     gccStdenv
-    runCommand
+    runCommand;
-    ;
 
-  kernel =
+  kernel = let
-    let
     args = {
       inherit (pkgs) lib hostPlatform;
     };
@@ -29,8 +22,7 @@ let
         wireless-regdb
       ];
     };
-    in
+  in buildLinux rec {
-    buildLinux rec {
       pname = "linux-hardened";
       version = "6.10.4-hardened1";
 
@@ -46,9 +38,9 @@ let
       enableCommonConfig = false;
 
       structuredExtraConfig =
-        (import ./base.nix args)
+        (import ./base.nix args) //
-        // (import config args)
+        (import config args) //
-        // lib.optionalAttrs (firmware != [ ]) {
+        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
+in kernel.overrideAttrs (base: {
-kernel.overrideAttrs (base: {
   installFlags = base.installFlags or [ ] ++ [ "INSTALL_MOD_PATH=$(out)" ];
 
   postInstall = ''

physical.nix

@@ -1,6 +1,4 @@
-{ lib, ... }:
+{ lib, ... }: with lib.kernel; {
-with lib.kernel;
-{
   MICROCODE = yes;
 
   ENERGY_MODEL = yes;

portable.nix

@@ -1,6 +1,4 @@
-{ lib, ... }:
+{ lib, ... }: with lib.kernel; {
-with lib.kernel;
-{
   PREEMPT_VOLUNTARY = yes;
 
   SUSPEND = yes;

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";

qemu-virtio.nix

@@ -1,7 +1,4 @@
-{ lib, ... }:
+{ lib, ... }: with lib.kernel; {
-
-with lib.kernel;
-{
   NR_CPUS = freeform "8";
 
   HYPERVISOR_GUEST = yes;

riscv.nix

@@ -1,6 +1,4 @@
-{ lib, ... }:
+{ lib, ... }: with lib.kernel; {
-with lib.kernel;
-{
   ARCH_RV64I = yes;
   COMPAT = no;
 

router.nix

@@ -1,7 +1,4 @@
-{ lib, ... }:
+{ lib, ... }: with lib.kernel; {
-
-with lib.kernel;
-{
   IP_ADVANCED_ROUTER = yes;
   IP_MULTIPLE_TABLES = yes;
   IP_ROUTE_MULTIPATH = yes;

systemd.nix

@@ -1,6 +1,4 @@
-{ lib, ... }:
+{ lib, ... }: with lib.kernel; {
-with lib.kernel;
-{
   # Base requirements
   DEVTMPFS = yes;
   CGROUPS = yes;

wireless.nix

@@ -1,6 +1,4 @@
-{ lib, hostPlatform, ... }:
+{ lib, hostPlatform, ... }: with lib.kernel; {
-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;

x86.nix

@@ -1,6 +1,4 @@
-{ lib, hostPlatform, ... }:
+{ lib, hostPlatform, ... }: with lib.kernel; {
-with lib.kernel;
-{
   SCHED_OMIT_FRAME_POINTER = yes;
 
   X86_FRED = yes;