add nix formatting

viperML · Nov 27, 2024 · ffce875 · ffce875
1 parent 51020a2
commit ffce875
Show file tree

Hide file tree

Showing 8 changed files with 109 additions and 117 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -23,10 +23,6 @@ jobs:
 
       - run: |
           eval "$(nix print-dev-env)"
-
-          cargo fix --allow-dirty
-          cargo clippy --fix --allow-dirty
-          cargo fmt
-
+          ./fix.sh
           git diff-index --quiet HEAD
-        name: Check clippy and formatting
+        name: Check formatting
diff --git a/fix.sh b/fix.sh
@@ -4,3 +4,4 @@ set -eux
 cargo fix --allow-dirty
 cargo clippy --fix --allow-dirty
 cargo fmt
+nix fmt
diff --git a/flake.nix b/flake.nix
@@ -3,36 +3,33 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
   };
 
-  outputs = {
-    self,
-    nixpkgs,
-  }: let
-    forAllSystems = function:
-      nixpkgs.lib.genAttrs [
-        "x86_64-linux"
-        "aarch64-linux"
-        # experimental
-        "x86_64-darwin"
-        "aarch64-darwin"
-      ] (system: function nixpkgs.legacyPackages.${system});
+  outputs =
+    { self, nixpkgs }:
+    let
+      forAllSystems =
+        function:
+        nixpkgs.lib.genAttrs [
+          "x86_64-linux"
+          "aarch64-linux"
+          # experimental
+          "x86_64-darwin"
+          "aarch64-darwin"
+        ] (system: function nixpkgs.legacyPackages.${system});
 
-    rev = self.shortRev or self.dirtyShortRev or "dirty";
-  in {
-    overlays.default = final: prev: {
-      nh = final.callPackage ./package.nix {
-        inherit rev;
-      };
-    };
+      rev = self.shortRev or self.dirtyShortRev or "dirty";
+    in
+    {
+      overlays.default = final: prev: { nh = final.callPackage ./package.nix { inherit rev; }; };
 
-    packages = forAllSystems (pkgs: rec {
-      nh = pkgs.callPackage ./package.nix {
-        inherit rev;
-      };
-      default = nh;
-    });
+      packages = forAllSystems (pkgs: rec {
+        nh = pkgs.callPackage ./package.nix { inherit rev; };
+        default = nh;
+      });
 
-    devShells = forAllSystems (pkgs: {
-      default = import ./shell.nix {inherit pkgs;};
-    });
-  };
+      devShells = forAllSystems (pkgs: {
+        default = import ./shell.nix { inherit pkgs; };
+      });
+
+      formatter = forAllSystems (pkgs: pkgs.nixfmt-rfc-style);
+    };
 }
diff --git a/package.nix b/package.nix
@@ -10,56 +10,59 @@
   nix-output-monitor ? null,
   rev ? "dirty",
 }:
-assert use-nom -> nix-output-monitor != null; let
-  runtimeDeps = [nvd] ++ lib.optionals use-nom [nix-output-monitor];
+assert use-nom -> nix-output-monitor != null;
+let
+  runtimeDeps = [ nvd ] ++ lib.optionals use-nom [ nix-output-monitor ];
   cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);
 in
-  rustPlatform.buildRustPackage {
-    pname = "nh";
-    version = "${cargoToml.package.version}-${rev}";
+rustPlatform.buildRustPackage {
+  pname = "nh";
+  version = "${cargoToml.package.version}-${rev}";
 
-    src = lib.fileset.toSource {
-      root = ./.;
-      fileset =
-        lib.fileset.intersection
-        (lib.fileset.fromSource (lib.sources.cleanSource ./.))
-        (lib.fileset.unions [
-          ./src
-          ./Cargo.toml
-          ./Cargo.lock
-        ]);
-    };
+  src = lib.fileset.toSource {
+    root = ./.;
+    fileset = lib.fileset.intersection (lib.fileset.fromSource (lib.sources.cleanSource ./.)) (
+      lib.fileset.unions [
+        ./src
+        ./Cargo.toml
+        ./Cargo.lock
+      ]
+    );
+  };
 
-    strictDeps = true;
+  strictDeps = true;
 
-    nativeBuildInputs = [
-      installShellFiles
-      makeBinaryWrapper
-    ];
+  nativeBuildInputs = [
+    installShellFiles
+    makeBinaryWrapper
+  ];
 
-    buildInputs = lib.optionals stdenv.isDarwin [darwin.apple_sdk.frameworks.SystemConfiguration];
+  buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
 
-    preFixup = ''
-      mkdir completions
-      $out/bin/nh completions bash > completions/nh.bash
-      $out/bin/nh completions zsh > completions/nh.zsh
-      $out/bin/nh completions fish > completions/nh.fish
+  preFixup = ''
+    mkdir completions
+    $out/bin/nh completions bash > completions/nh.bash
+    $out/bin/nh completions zsh > completions/nh.zsh
+    $out/bin/nh completions fish > completions/nh.fish
 
-      installShellCompletion completions/*
-    '';
+    installShellCompletion completions/*
+  '';
 
-    postFixup = ''
-      wrapProgram $out/bin/nh \
-        --prefix PATH : ${lib.makeBinPath runtimeDeps}
-    '';
+  postFixup = ''
+    wrapProgram $out/bin/nh \
+      --prefix PATH : ${lib.makeBinPath runtimeDeps}
+  '';
 
-    cargoLock.lockFile = ./Cargo.lock;
+  cargoLock.lockFile = ./Cargo.lock;
 
-    meta = {
-      description = "Yet another nix cli helper";
-      homepage = "https://github.com/viperML/nh";
-      license = lib.licenses.eupl12;
-      mainProgram = "nh";
-      maintainers = with lib.maintainers; [drupol viperML];
-    };
-  }
+  meta = {
+    description = "Yet another nix cli helper";
+    homepage = "https://github.com/viperML/nh";
+    license = lib.licenses.eupl12;
+    mainProgram = "nh";
+    maintainers = with lib.maintainers; [
+      drupol
+      viperML
+    ];
+  };
+}
diff --git a/shell.nix b/shell.nix
@@ -1,26 +1,28 @@
-{pkgs ? import <nixpkgs> {}}:
+{
+  pkgs ? import <nixpkgs> { },
+}:
 with pkgs;
-  mkShell {
-    strictDeps = true;
+mkShell {
+  strictDeps = true;
 
-    nativeBuildInputs = [
-      cargo
-      rustc
+  nativeBuildInputs = [
+    cargo
+    rustc
 
-      rust-analyzer-unwrapped
-      (rustfmt.override {asNightly = true;})
-      clippy
-      nvd
-      nix-output-monitor
-      taplo
-      yaml-language-server
-    ];
+    rust-analyzer-unwrapped
+    (rustfmt.override { asNightly = true; })
+    clippy
+    nvd
+    nix-output-monitor
+    taplo
+    yaml-language-server
+  ];
 
-    buildInputs = [];
+  buildInputs = [ ];
 
-    env = {
-      NH_NOM = "1";
-      NH_LOG = "nh=trace";
-      RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
-    };
-  }
+  env = {
+    NH_NOM = "1";
+    NH_LOG = "nh=trace";
+    RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
+  };
+}
diff --git a/src/installable.rs b/src/installable.rs
@@ -179,11 +179,7 @@ where
                 }
             }
             '"' => {
-                if !in_quote {
-                    in_quote = true;
-                } else {
-                    in_quote = false;
-                }
+                in_quote = !in_quote;
             }
             _ => elem.push(char),
         }

diff --git a/test/home.nix b/test/home.nix
@@ -1,13 +1,13 @@
 let
   hm = builtins.getFlake "github:nix-community/home-manager";
-  pkgs = import <nixpkgs> {};
+  pkgs = import <nixpkgs> { };
 in
-  import "${hm}/modules" {
-    inherit pkgs;
-    configuration = {
-      home.stateVersion = "24.05";
-      home.packages = [pkgs.hello];
-      home.username = "anon";
-      home.homeDirectory = "/anonfiles";
-    };
-  }
+import "${hm}/modules" {
+  inherit pkgs;
+  configuration = {
+    home.stateVersion = "24.05";
+    home.packages = [ pkgs.hello ];
+    home.username = "anon";
+    home.homeDirectory = "/anonfiles";
+  };
+}
diff --git a/test/nixos.nix b/test/nixos.nix
@@ -1,4 +1 @@
-import <nixpkgs/nixos> {
-  configuration = {};
-}
-
+import <nixpkgs/nixos> { configuration = { }; }