From b1c13f4914043db3637ae64207088dcc86372bf3 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Sun, 10 Dec 2023 20:22:27 -0500 Subject: [PATCH] fix nix fmt --- hosts/game-desktop/main.nix | 2 +- hosts/gerg-desktop/main.nix | 2 +- lib/default.nix | 2 +- packages/lint/package.nix | 2 +- packages/nixfmt/package.nix | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hosts/game-desktop/main.nix b/hosts/game-desktop/main.nix index 9dc5b04..0be4e38 100644 --- a/hosts/game-desktop/main.nix +++ b/hosts/game-desktop/main.nix @@ -43,7 +43,7 @@ _: inherit (pkgs.wineWowPackages) unstableFull; inherit (pkgs.libsForQt5) kdenlive; - librewolf = pkgs.librewolf.override { cfg.speechSynthesisSupport = false; }; + librewolf = pkgs.librewolf.override {cfg.speechSynthesisSupport = false;}; }; etc = { "jdks/17".source = "${pkgs.openjdk17}/bin"; diff --git a/hosts/gerg-desktop/main.nix b/hosts/gerg-desktop/main.nix index 95691bf..eb4668f 100644 --- a/hosts/gerg-desktop/main.nix +++ b/hosts/gerg-desktop/main.nix @@ -68,7 +68,7 @@ ; inherit (nvim-flake.packages) neovim; inherit (self.packages) lint nixfmt; - librewolf = pkgs.librewolf.override { cfg.speechSynthesisSupport = false; }; + librewolf = pkgs.librewolf.override {cfg.speechSynthesisSupport = false;}; }; etc = { "jdks/17".source = "${pkgs.openjdk17}/bin"; diff --git a/lib/default.nix b/lib/default.nix index ac97d14..450543a 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -130,7 +130,7 @@ rec { callPackage = lib.callPackageWith ( pkgs // { - inputs = constructInputs' pkgs.stdenv.hostPlatform.system inputs; + inputs = constructInputs' pkgs.stdenv.hostPlatform.system inputs; # maybe add self? # inherit self; # npins sources if i need them diff --git a/packages/lint/package.nix b/packages/lint/package.nix index 2328a9c..8be7174 100644 --- a/packages/lint/package.nix +++ b/packages/lint/package.nix @@ -15,7 +15,7 @@ writeShellApplication { fd ]; text = '' - if [ -z "''${1:-""}" ]; then + if [ -z "''${1:-""}" ] || [ "$1" == "." ]; then fd '.*\.nix' . -x statix fix -- {} \; fd '.*\.nix' . -X deadnix -e -- {} \; -X nixfmt {} \; else diff --git a/packages/nixfmt/package.nix b/packages/nixfmt/package.nix index d9ac681..cc83132 100644 --- a/packages/nixfmt/package.nix +++ b/packages/nixfmt/package.nix @@ -1,6 +1,6 @@ {inputs, nixfmt}: (nixfmt.overrideAttrs { - version = "0.6.0-${inputs.nixfmt.shortRev}"; + version = "0.6.0-${inputs.nixfmt.shortRev}"; - src = inputs.nixfmt; - }) + src = inputs.nixfmt; +})