fix the formatting according to nixfmt

somehow the formatting is off in these files. this has been adjusted now through running `nix fmt` Signed-off-by: Brian McGillion <[email protected]>
tiiuae · Dec 11, 2024 · 62385df · 62385df
1 parent 581aefe
commit 62385df
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 52 deletions.
diff --git a/lib.nix b/lib.nix
@@ -43,10 +43,14 @@ nixpkgs.lib.extend (
       lib.filterAttrs (
         _: value:
         let
-          platforms = lib.attrByPath [
-            "meta"
-            "platforms"
-          ] [ ] value;
+          platforms =
+            lib.attrByPath
+              [
+                "meta"
+                "platforms"
+              ]
+              [ ]
+              value;
         in
         lib.elem system platforms
       );

diff --git a/modules/common/boot/systemd-boot-dtb.nix b/modules/common/boot/systemd-boot-dtb.nix
@@ -23,7 +23,8 @@ in
 
   config = mkIf cfg.enable {
     boot.loader.systemd-boot = {
-      extraFiles."dtbs/${config.hardware.deviceTree.name}" = "${config.hardware.deviceTree.package}/${config.hardware.deviceTree.name}";
+      extraFiles."dtbs/${config.hardware.deviceTree.name}" =
+        "${config.hardware.deviceTree.package}/${config.hardware.deviceTree.name}";
       extraInstallCommands = ''
         # Find out the latest generation from loader.conf
         default_cfg=$(${pkgs.coreutils}/bin/cat /boot/loader/loader.conf | ${pkgs.gnugrep}/bin/grep default | ${pkgs.gawk}/bin/awk '{print $2}')

diff --git a/modules/desktop/graphics/labwc.config.nix b/modules/desktop/graphics/labwc.config.nix
@@ -105,16 +105,14 @@ let
     </desktops>
     <keyboard>
       <default />
-      ${
-        lib.concatStringsSep "\n" (
-          builtins.map (index: ''
-            <keybind key="W-${toString index}">
-              <action name="GoToDesktop" to="${toString index}" />
-              <action name="Execute" command="bash -c 'echo 1 > ~/.config/eww/workspace; ${ghaf-workspace}/bin/ghaf-workspace update ${toString index}'" />
-            </keybind>
-          '') (lib.lists.range 1 cfg.maxDesktops)
-        )
-      }
+      ${lib.concatStringsSep "\n" (
+        builtins.map (index: ''
+          <keybind key="W-${toString index}">
+            <action name="GoToDesktop" to="${toString index}" />
+            <action name="Execute" command="bash -c 'echo 1 > ~/.config/eww/workspace; ${ghaf-workspace}/bin/ghaf-workspace update ${toString index}'" />
+          </keybind>
+        '') (lib.lists.range 1 cfg.maxDesktops)
+      )}
       <keybind key="W-A-Right">
         <action name="Execute" command="bash -c 'echo 1 > ~/.config/eww/workspace; ${ghaf-workspace}/bin/ghaf-workspace next'" />
       </keybind>
@@ -162,31 +160,25 @@ let
       <context name="Root">
         <mousebind button="Left" action="Press" />
         <mousebind button="Middle" action="Press" />
-        ${
-          lib.optionalString (!config.ghaf.profiles.debug.enable) ''
-            <mousebind button="Right" action="Press" />
-          ''
-        }
+        ${lib.optionalString (!config.ghaf.profiles.debug.enable) ''
+          <mousebind button="Right" action="Press" />
+        ''}
       <!--Disable default scrolling behavior of switching workspaces-->
       <mousebind direction="Up" action="Scroll" />
       <mousebind direction="Down" action="Scroll" />
       </context>
     </mouse>
     <windowRules>
-      ${
-        lib.concatStringsSep "\n" (
-          map (rule: ''
-            <windowRule identifier="${rule.identifier}" borderColor="${rule.colour}" serverDecoration="yes" skipTaskbar="no"  />
-          '') cfg.frameColouring
-        )
-      }
-      ${
-        lib.concatStringsSep "\n" (
-          map (rule: ''
-            <windowRule sandboxAppId="${rule.identifier}" borderColor="${rule.color}" serverDecoration="yes" skipTaskbar="no"  />
-          '') cfg.securityContext
-        )
-      }
+      ${lib.concatStringsSep "\n" (
+        map (rule: ''
+          <windowRule identifier="${rule.identifier}" borderColor="${rule.colour}" serverDecoration="yes" skipTaskbar="no"  />
+        '') cfg.frameColouring
+      )}
+      ${lib.concatStringsSep "\n" (
+        map (rule: ''
+          <windowRule sandboxAppId="${rule.identifier}" borderColor="${rule.color}" serverDecoration="yes" skipTaskbar="no"  />
+        '') cfg.securityContext
+      )}
     </windowRules>
     <libinput>
       <device category="touchpad"><naturalScroll>yes</naturalScroll></device>

diff --git a/modules/desktop/graphics/styles/lock-layout.nix b/modules/desktop/graphics/styles/lock-layout.nix
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Ghaf lock screen layout
-# Base layout taken from gtklock upstream: https://github.com/jovanlanik/gtklock/blob/master/res/gtklock.ui 
+# Base layout taken from gtklock upstream: https://github.com/jovanlanik/gtklock/blob/master/res/gtklock.ui
 {
   writeText,
   ...

diff --git a/modules/microvm/virtualization/microvm/appvm.nix b/modules/microvm/virtualization/microvm/appvm.nix
@@ -137,11 +137,14 @@ let
               nixpkgs.buildPlatform.system = configHost.nixpkgs.buildPlatform.system;
               nixpkgs.hostPlatform.system = configHost.nixpkgs.hostPlatform.system;
 
-              environment.systemPackages = [
-                pkgs.tpm2-tools
-                pkgs.opensc
-                pkgs.givc-cli
-              ] ++ vm.packages ++ appPackages;
+              environment.systemPackages =
+                [
+                  pkgs.tpm2-tools
+                  pkgs.opensc
+                  pkgs.givc-cli
+                ]
+                ++ vm.packages
+                ++ appPackages;
 
               security.tpm2 = {
                 enable = true;

diff --git a/modules/reference/hardware/jetpack-microvm/agx-netvm-wlan-pci-passthrough.nix b/modules/reference/hardware/jetpack-microvm/agx-netvm-wlan-pci-passthrough.nix
@@ -10,7 +10,8 @@ let
   cfg = config.ghaf.hardware.nvidia.orin.agx;
 in
 {
-  options.ghaf.hardware.nvidia.orin.agx.enableNetvmWlanPCIPassthrough = lib.mkEnableOption "WLAN card PCI passthrough to NetVM";
+  options.ghaf.hardware.nvidia.orin.agx.enableNetvmWlanPCIPassthrough =
+    lib.mkEnableOption "WLAN card PCI passthrough to NetVM";
   config = lib.mkIf cfg.enableNetvmWlanPCIPassthrough {
     # Orin AGX WLAN card PCI passthrough
     ghaf.hardware.nvidia.orin.enablePCIPassthroughCommon = true;

diff --git a/modules/reference/hardware/jetpack-microvm/nx-netvm-ethernet-pci-passthrough.nix b/modules/reference/hardware/jetpack-microvm/nx-netvm-ethernet-pci-passthrough.nix
@@ -5,7 +5,8 @@ let
   cfg = config.ghaf.hardware.nvidia.orin.nx;
 in
 {
-  options.ghaf.hardware.nvidia.orin.nx.enableNetvmEthernetPCIPassthrough = lib.mkEnableOption "Ethernet card PCI passthrough to NetVM";
+  options.ghaf.hardware.nvidia.orin.nx.enableNetvmEthernetPCIPassthrough =
+    lib.mkEnableOption "Ethernet card PCI passthrough to NetVM";
   config = lib.mkIf cfg.enableNetvmEthernetPCIPassthrough {
     # Orin NX Ethernet card PCI Passthrough
     ghaf.hardware.nvidia.orin.enablePCIPassthroughCommon = true;

diff --git a/modules/reference/hardware/jetpack/nvidia-jetson-orin/pci-passthrough-common.nix b/modules/reference/hardware/jetpack/nvidia-jetson-orin/pci-passthrough-common.nix
@@ -5,7 +5,8 @@ let
   cfg = config.ghaf.hardware.nvidia.orin;
 in
 {
-  options.ghaf.hardware.nvidia.orin.enablePCIPassthroughCommon = lib.mkEnableOption "Enable common options related to PCI passthrough on Orin AGX and NX";
+  options.ghaf.hardware.nvidia.orin.enablePCIPassthroughCommon =
+    lib.mkEnableOption "Enable common options related to PCI passthrough on Orin AGX and NX";
   config = lib.mkIf cfg.enablePCIPassthroughCommon {
     boot.kernelModules = [
       "vfio_pci"

diff --git a/modules/reference/programs/google-chrome.nix b/modules/reference/programs/google-chrome.nix
@@ -42,9 +42,8 @@ in
         <https://cloud.google.com/docs/chrome-enterprise/policies/>
         Make sure the selected policy is supported on Linux and your browser version.
       '';
-      default =
-        {
-        };
+      default = {
+      };
       example = lib.literalExpression ''
         {
           "BrowserSignin" = 0;

diff --git a/modules/reference/services/proxy-server/3proxy-config.nix b/modules/reference/services/proxy-server/3proxy-config.nix
@@ -90,17 +90,16 @@ in
   };
 
   config = mkIf cfg.enable {
-    assertions =
-      [
-      ];
+    assertions = [
+    ];
     # Define a new group for proxy management
     users.groups.${proxyGroupName} = { }; # Create a group named proxy-admin
 
     # Define a new user with a specific username
     users.users.${proxyUserName} = {
       isSystemUser = true;
       description = "Proxy User for managing allowlist and services";
-      # extraGroups = [ "${proxyGroupName}" ]; # Adding to 'proxy-admin' for specific access     
+      # extraGroups = [ "${proxyGroupName}" ]; # Adding to 'proxy-admin' for specific access
       group = "${proxyGroupName}";
     };
 
@@ -126,8 +125,8 @@ in
       polkit = {
         enable = true;
         debug = true;
-        # Polkit rules for allowing proxy-user to run proxy related systemctl 
-        # commands without sudo and password requirement 
+        # Polkit rules for allowing proxy-user to run proxy related systemctl
+        # commands without sudo and password requirement
         extraConfig = ''
           polkit.addRule(function(action, subject) {
               if ((action.id == "org.freedesktop.systemd1.manage-units" &&