nix: increase nixfmt max width

Signed-off-by: Ophestra <cat@gensokyo.uk>

cmd/fpkg/build.nix

@@ -171,11 +171,7 @@ let
           broadcast = { };
         });
 
-    enablements =
+    enablements = (if allow_wayland then 1 else 0) + (if allow_x11 then 2 else 0) + (if allow_dbus then 4 else 0) + (if allow_pulse then 8 else 0);
-      (if allow_wayland then 1 else 0)
-      + (if allow_x11 then 2 else 0)
-      + (if allow_dbus then 4 else 0)
-      + (if allow_pulse then 8 else 0);
 
     mesa = if gpu then mesaWrappers else null;
     nix_gl = if gpu then nixGL else null;

flake.nix

@@ -68,7 +68,7 @@
             cd ${./.}
 
             echo "running nixfmt..."
-            nixfmt --check .
+            nixfmt --width=256 --check .
 
             touch $out
           '';
@@ -115,21 +115,19 @@
           };
           fsu = pkgs.callPackage ./cmd/fsu/package.nix { inherit (self.packages.${system}) fortify; };
 
-          dist =
+          dist = pkgs.runCommand "${fortify.name}-dist" { inherit (self.devShells.${system}.default) buildInputs; } ''
-            pkgs.runCommand "${fortify.name}-dist" { inherit (self.devShells.${system}.default) buildInputs; }
+            # go requires XDG_CACHE_HOME for the build cache
-              ''
+            export XDG_CACHE_HOME="$(mktemp -d)"
-                # go requires XDG_CACHE_HOME for the build cache
-                export XDG_CACHE_HOME="$(mktemp -d)"
 
-                # get a different workdir as go does not like /build
+            # get a different workdir as go does not like /build
-                cd $(mktemp -d) \
+            cd $(mktemp -d) \
-                    && cp -r ${fortify.src}/. . \
+                && cp -r ${fortify.src}/. . \
-                    && chmod +w cmd && cp -r ${fsu.src}/. cmd/fsu/ \
+                && chmod +w cmd && cp -r ${fsu.src}/. cmd/fsu/ \
-                    && chmod -R +w .
+                && chmod -R +w .
 
-                export FORTIFY_VERSION="v${fortify.version}"
+            export FORTIFY_VERSION="v${fortify.version}"
-                ./dist/release.sh && mkdir $out && cp -v "dist/fortify-$FORTIFY_VERSION.tar.gz"* $out
+            ./dist/release.sh && mkdir $out && cp -v "dist/fortify-$FORTIFY_VERSION.tar.gz"* $out
-              '';
+          '';
 
           fhs = pkgs.buildFHSEnv {
             pname = "fortify-fhs";

nixos.nix

@@ -77,21 +77,12 @@ in
                       };
                     in
                     {
-                      session_bus =
+                      session_bus = if app.dbus.session != null then (app.dbus.session (extendDBusDefault app.id)) else (extendDBusDefault app.id default);
-                        if app.dbus.session != null then
-                          (app.dbus.session (extendDBusDefault app.id))
-                        else
-                          (extendDBusDefault app.id default);
                       system_bus = app.dbus.system;
                     };
                   command = if app.command == null then app.name else app.command;
                   script = if app.script == null then ("exec " + command + " $@") else app.script;
-                  enablements =
+                  enablements = with app.capability; (if wayland then 1 else 0) + (if x11 then 2 else 0) + (if dbus then 4 else 0) + (if pulse then 8 else 0);
-                    with app.capability;
-                    (if wayland then 1 else 0)
-                    + (if x11 then 2 else 0)
-                    + (if dbus then 4 else 0)
-                    + (if pulse then 8 else 0);
                   conf = {
                     inherit (app) id;
                     command = [
@@ -165,9 +156,7 @@ in
                   };
                 in
                 pkgs.writeShellScriptBin app.name ''
-                  exec fortify${
+                  exec fortify${if app.verbose then " -v" else ""} app ${pkgs.writeText "fortify-${app.name}.json" (builtins.toJSON conf)} $@
-                    if app.verbose then " -v" else ""
-                  } app ${pkgs.writeText "fortify-${app.name}.json" (builtins.toJSON conf)} $@
                 ''
               ) cfg.apps;
             in

package.nix

@@ -30,10 +30,7 @@ buildGoModule rec {
   src = builtins.path {
     name = "${pname}-src";
     path = lib.cleanSource ./.;
-    filter =
+    filter = path: type: !(type == "regular" && (lib.hasSuffix ".nix" path || lib.hasSuffix ".py" path)) && !(type == "directory" && lib.hasSuffix "/cmd/fsu" path);
-      path: type:
-      !(type == "regular" && (lib.hasSuffix ".nix" path || lib.hasSuffix ".py" path))
-      && !(type == "directory" && lib.hasSuffix "/cmd/fsu" path);
   };
   vendorHash = null;