treewide: nixfmt everything

ElXreno · Jul 18, 2024 · eb8c1f7 · eb8c1f7
1 parent 735432c
commit eb8c1f7
Show file tree

Hide file tree

Showing 75 changed files with 905 additions and 921 deletions.
diff --git a/devshell/android.nix b/devshell/android.nix
@@ -1,9 +1,6 @@
 { pkgs, ... }:
 pkgs.mkShell {
-  nativeBuildInputs = with pkgs; [
-    androidStudioPackages.canary
-    flutter
-  ];
+  nativeBuildInputs = with pkgs; [ androidStudioPackages.canary flutter ];
 
   buildInputs = with pkgs; [ ];
 }
diff --git a/devshell/default.nix b/devshell/default.nix
@@ -1,14 +1,13 @@
 { pkgs, ... }:
 pkgs.mkShell {
-  nativeBuildInputs = with pkgs; [
-    # Rust
-    pkg-config
-    clang
-    gnumake
-    rustup
-  ] ++ (with jetbrains; [
-    clion
-  ]);
+  nativeBuildInputs = with pkgs;
+    [
+      # Rust
+      pkg-config
+      clang
+      gnumake
+      rustup
+    ] ++ (with jetbrains; [ clion ]);
 
   buildInputs = with pkgs; [
     # Rust

diff --git a/devshell/dotnet.nix b/devshell/dotnet.nix
@@ -4,16 +4,10 @@ let
 
   dotnetSdkPackage = pkgs."dotnet-sdk_${dotnetMajorVer}";
   monoPackage = pkgs."mono${dotnetMajorVer}";
-in
-pkgs.mkShell {
-  nativeBuildInputs = with pkgs; [
-    jetbrains.rider
-  ];
+in pkgs.mkShell {
+  nativeBuildInputs = with pkgs; [ jetbrains.rider ];
 
-  buildInputs = with pkgs; [
-    dotnetSdkPackage
-    monoPackage
-  ];
+  buildInputs = with pkgs; [ dotnetSdkPackage monoPackage ];
 
   NIX_LD = pkgs.lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker";
 

diff --git a/devshell/fhs-android.nix b/devshell/fhs-android.nix
@@ -2,36 +2,33 @@
 
 (pkgs.buildFHSUserEnv {
   name = "fhs-android";
-  targetPkgs = pkgs: (with pkgs; [
-    bison
-    curl
-    flex
-    git
-    gitRepo
-    gnumake
-    gnupg
-    gperf
-    jdk
-    libxml2
-    lzop
-    m4
-    nettools
-    openssl
-    perl
-    procps
-    python2
-    python3
-    schedtool
-    unzip
-    utillinux
-    zip
-    pkgconfig
-  ]);
-  multiPkgs = pkgs: (with pkgs; [
-    ncurses5
-    zlib
-    glibc.dev
-  ]);
+  targetPkgs = pkgs:
+    (with pkgs; [
+      bison
+      curl
+      flex
+      git
+      gitRepo
+      gnumake
+      gnupg
+      gperf
+      jdk
+      libxml2
+      lzop
+      m4
+      nettools
+      openssl
+      perl
+      procps
+      python2
+      python3
+      schedtool
+      unzip
+      utillinux
+      zip
+      pkgconfig
+    ]);
+  multiPkgs = pkgs: (with pkgs; [ ncurses5 zlib glibc.dev ]);
   runScript = "bash";
   profile = ''
     export ALLOW_NINJA_ENV=true

diff --git a/devshell/java.nix b/devshell/java.nix
@@ -1,8 +1,6 @@
 { pkgs, ... }:
 pkgs.mkShell {
-  nativeBuildInputs = with pkgs; [
-    jetbrains.idea-ultimate
-  ];
+  nativeBuildInputs = with pkgs; [ jetbrains.idea-ultimate ];
 
   buildInputs = with pkgs; [ ];
 }
diff --git a/devshell/php.nix b/devshell/php.nix
@@ -3,19 +3,13 @@ let
   phpMajorVer = toString 82;
 
   php = pkgs."php${phpMajorVer}".buildEnv {
-    extensions = { enabled, all }: enabled ++ (with all; [
-        xdebug
-    ]);
+    extensions = { enabled, all }: enabled ++ (with all; [ xdebug ]);
     extraConfig = ''
-        xdebug.mode=debug
+      xdebug.mode=debug
     '';
-};
-in
-pkgs.mkShell {
-  nativeBuildInputs = with pkgs; [
-    php
-    jetbrains.phpstorm
-  ];
+  };
+in pkgs.mkShell {
+  nativeBuildInputs = with pkgs; [ php jetbrains.phpstorm ];
 
   buildInputs = with pkgs; [ ];
 }
diff --git a/devshell/python.nix b/devshell/python.nix
@@ -1,20 +1,16 @@
 { pkgs, ... }:
 let python = pkgs.python311;
-in
-pkgs.mkShell {
-  nativeBuildInputs = with pkgs; [
-    pkg-config
-    clang
-    gnumake
-    python
-  ] ++ (with jetbrains; [
-    pycharm-professional
-  ]);
+in pkgs.mkShell {
+  nativeBuildInputs = with pkgs;
+    [ pkg-config clang gnumake python ]
+    ++ (with jetbrains; [ pycharm-professional ]);
 
-  buildInputs = with pkgs; with python.pkgs; [
-    # Python
-    venvShellHook
-  ];
+  buildInputs = with pkgs;
+    with python.pkgs;
+    [
+      # Python
+      venvShellHook
+    ];
 
   NIX_LD = pkgs.lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker";
 

diff --git a/disko/external-hdd.nix b/disko/external-hdd.nix
@@ -7,17 +7,15 @@
         content = {
           type = "table";
           format = "gpt";
-          partitions = [
-            {
-              name = "zfs";
-              start = "1MiB";
-              end = "100%";
-              content = {
-                type = "zfs";
-                pool = "externalhdd";
-              };
-            }
-          ];
+          partitions = [{
+            name = "zfs";
+            start = "1MiB";
+            end = "100%";
+            content = {
+              type = "zfs";
+              pool = "externalhdd";
+            };
+          }];
         };
       };
     };

diff --git a/disko/infinity.nix b/disko/infinity.nix
@@ -1,8 +1,6 @@
-{ ... }: 
-let 
-  defaultMountOptions = [ "compress-force=zstd" ];
-in
-{
+{ ... }:
+let defaultMountOptions = [ "compress-force=zstd" ];
+in {
   disko.devices = {
     disk = {
       nvme = {
@@ -32,9 +30,7 @@ in
                 type = "luks";
                 name = "crypted";
                 extraOpenArgs = [ "--allow-discards" ];
-                settings = {
-                  allowDiscards = true;
-                };
+                settings = { allowDiscards = true; };
                 content = {
                   type = "btrfs";
                   extraArgs = [ "-f" ];
@@ -51,7 +47,7 @@ in
                       mountpoint = "/nix";
                       mountOptions = defaultMountOptions ++ [ "noatime" ];
                     };
-                    "/var" = { 
+                    "/var" = {
                       mountpoint = "/var";
                       mountOptions = defaultMountOptions;
                     };
@@ -66,7 +62,8 @@ in
   };
 
   fileSystems = {
-    "/var".neededForBoot = true; # Ensure that /var will be mounted with the sops key
+    "/var".neededForBoot =
+      true; # Ensure that /var will be mounted with the sops key
   };
 }
 
diff --git a/disko/timeweb.nix b/disko/timeweb.nix
@@ -1,8 +1,6 @@
 { ... }:
-let
-  defaultMountOptions = [ "compress-force=zstd:1" ];
-in
- {
+let defaultMountOptions = [ "compress-force=zstd:1" ];
+in {
   disko.devices = {
     disk = {
       x = {

diff --git a/flake.nix b/flake.nix
@@ -64,40 +64,35 @@
       findModules = dir:
         builtins.concatLists (builtins.attrValues (builtins.mapAttrs
           (name: type:
-            if type == "regular" then
-              [{
-                name = builtins.elemAt (builtins.match "(.*)\\.nix" name) 0;
-                value = dir + "/${name}";
-              }]
-            else if (builtins.readDir (dir + "/${name}"))
-              ? "default.nix" then [{
+            if type == "regular" then [{
+              name = builtins.elemAt (builtins.match "(.*)\\.nix" name) 0;
+              value = dir + "/${name}";
+            }] else if (builtins.readDir (dir + "/${name}"))
+            ? "default.nix" then [{
               inherit name;
               value = dir + "/${name}";
             }] else
-              findModules (dir + "/${name}"))
-          (builtins.readDir dir)));
-    in
-    {
+              findModules (dir + "/${name}")) (builtins.readDir dir)));
+    in {
       nixosModules = builtins.listToAttrs (findModules ./modules);
 
       nixosProfiles = builtins.listToAttrs (findModules ./profiles);
 
       nixosRoles = import ./roles;
 
-      nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration {
-        modules = [ ./nix-on-droid ];
-        extraSpecialArgs = { inherit inputs; };
+      nixOnDroidConfigurations.default =
+        nix-on-droid.lib.nixOnDroidConfiguration {
+          modules = [ ./nix-on-droid ];
+          extraSpecialArgs = { inherit inputs; };
 
-        pkgs = import nixpkgs {
-          system = "aarch64-linux";
+          pkgs = import nixpkgs {
+            system = "aarch64-linux";
 
-          overlays = [
-            nix-on-droid.overlays.default
-          ];
-        };
+            overlays = [ nix-on-droid.overlays.default ];
+          };
 
-        home-manager-path = inputs.home-manager.outPath;
-      };
+          home-manager-path = inputs.home-manager.outPath;
+        };
 
       nixosConfigurations = with nixpkgs.lib;
         let
@@ -109,8 +104,7 @@
                 [ (import (./machines + "/${name}")) { device = name; } ];
               specialArgs = { inherit inputs; };
             };
-        in
-        genAttrs hosts mkHost;
+        in genAttrs hosts mkHost;
 
       diskoConfigurations = builtins.listToAttrs (findModules ./disko);
 
@@ -121,11 +115,12 @@
 
       devShells.x86_64-linux = with nixpkgs.lib;
         let
-          inherit ((builtins.head (builtins.attrValues self.nixosConfigurations))) pkgs config;
-          mkShells = mapAttrs
-            (_name: value: import value { inherit pkgs config; });
-        in
-        mkShells (builtins.listToAttrs (findModules ./devshell));
+          inherit ((builtins.head
+            (builtins.attrValues self.nixosConfigurations)))
+            pkgs config;
+          mkShells =
+            mapAttrs (_name: value: import value { inherit pkgs config; });
+        in mkShells (builtins.listToAttrs (findModules ./devshell));
 
       deploy = {
         user = "root";
@@ -152,7 +147,6 @@
 
       hydraJobs = with nixpkgs.lib;
         (mapAttrs (_: val: val.config.system.build.toplevel)
-          self.nixosConfigurations
-        );
+          self.nixosConfigurations);
     };
 }