diff --git a/common/desktopApps.nix b/common/desktopApps.nix index 3ec2707..6a1f269 100644 --- a/common/desktopApps.nix +++ b/common/desktopApps.nix @@ -1,8 +1,4 @@ -{ - lib, - vacuModuleType, - ... -}: +{ lib, vacuModuleType, ... }: lib.optionalAttrs (vacuModuleType == "nixos") { options.vacu.desktopApps = lib.mkEnableOption "asdf"; #todo diff --git a/common/nix-command-extensions/default.nix b/common/nix-command-extensions/default.nix index 0d7a220..facb35d 100644 --- a/common/nix-command-extensions/default.nix +++ b/common/nix-command-extensions/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: +{ ... }: { } diff --git a/flake.nix b/flake.nix index e79b633..c704fff 100644 --- a/flake.nix +++ b/flake.nix @@ -142,12 +142,12 @@ argAttr = lib.removeAttrs argAttrAll [ "useUnstable" ]; config = { allowUnfree = true; - permittedInsecurePackages = [ - "olm-3.2.16" - ]; + permittedInsecurePackages = [ "olm-3.2.16" ]; } // (argAttr.config or { }); in - import whichpkgs (argAttr // { inherit config; } // { overlays = (argAttr.overlays or []) ++ overlays; }); + import whichpkgs ( + argAttr // { inherit config; } // { overlays = (argAttr.overlays or [ ]) ++ overlays; } + ); pkgs = mkPkgs x86; defaultInputs = [ "nix-search-cli" @@ -420,8 +420,12 @@ config.allowUnfree = true; overlays = [ inputs.sm64baserom.overlays.default ]; }; - pkgs-unstable = mkPkgs nixpkgs-args // { useUnstable = true; }; - pkgs-stable = mkPkgs nixpkgs-args // { useUnstable = false; }; + pkgs-unstable = mkPkgs nixpkgs-args // { + useUnstable = true; + }; + pkgs-stable = mkPkgs nixpkgs-args // { + useUnstable = false; + }; _plain = mkPlain pkgs-unstable; plain = _plain.config.vacu.withAsserts _plain; treefmtEval = inputs.treefmt-nix.lib.evalModule pkgs-unstable ./treefmt.nix; diff --git a/liam/dovecot.nix b/liam/dovecot.nix index d07656d..a5d4a4c 100644 --- a/liam/dovecot.nix +++ b/liam/dovecot.nix @@ -1,8 +1,4 @@ -{ - config, - lib, - ... -}: +{ config, lib, ... }: { networking.firewall.allowedTCPPorts = [ 993 ]; systemd.tmpfiles.settings.whatever."/var/lib/mail".d = { diff --git a/lp0/hardware-config.nix b/lp0/hardware-config.nix index b911b36..756a930 100644 --- a/lp0/hardware-config.nix +++ b/lp0/hardware-config.nix @@ -1,11 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ - lib, - modulesPath, - ... -}: +{ lib, modulesPath, ... }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; diff --git a/overlays/newPackages.nix b/overlays/newPackages.nix index c8f98ba..8dbd637 100644 --- a/overlays/newPackages.nix +++ b/overlays/newPackages.nix @@ -1,5 +1,4 @@ -self: _super: -{ +self: _super: { bandcamp-collection-downloader = self.callPackage ../packages/bcd { }; haproxy-auth-request = self.callPackage ../packages/haproxy-auth-request.nix { }; haproxy-lua-http = self.callPackage ../packages/haproxy-lua-http.nix { }; diff --git a/overlays/nheko.nix b/overlays/nheko.nix index 8e41feb..f81724f 100644 --- a/overlays/nheko.nix +++ b/overlays/nheko.nix @@ -1,11 +1,10 @@ -self: super: -{ +self: super: { nheko = super.nheko.overrideAttrs (old: { - patches = (old.patches or []) ++ [( - self.fetchpatch { + patches = (old.patches or [ ]) ++ [ + (self.fetchpatch { url = "https://github.com/Nheko-Reborn/nheko/pull/1838.patch"; hash = "sha256-hYG/nFPTJSRVadt7H4CgefBCwEAKCR7xU5hA5pTzpXU="; - } - )]; + }) + ]; }); } diff --git a/packages/sm64coopdx.nix b/packages/sm64coopdx.nix index d324ca3..1ae76d4 100644 --- a/packages/sm64coopdx.nix +++ b/packages/sm64coopdx.nix @@ -1,7 +1,4 @@ -{ - sm64coopdx, - fetchFromGitHub, -}: +{ sm64coopdx, fetchFromGitHub }: sm64coopdx.overrideAttrs { version = "1.2.1"; src = fetchFromGitHub { diff --git a/tests/liam.nix b/tests/liam.nix index e5acd38..13a1f09 100644 --- a/tests/liam.nix +++ b/tests/liam.nix @@ -106,11 +106,7 @@ in }; nodes.relay = - { - pkgs, - config, - ... - }: + { pkgs, config, ... }: let mailpit = pkgs.mailpit; dir = "/var/lib/mailpit"; diff --git a/toptop/default.nix b/toptop/default.nix index 45c5bdf..991fd71 100644 --- a/toptop/default.nix +++ b/toptop/default.nix @@ -1,6 +1,4 @@ -{ - ... -}: +{ ... }: { imports = [ diff --git a/triple-dezert/default.nix b/triple-dezert/default.nix index e8624dc..dd57cac 100644 --- a/triple-dezert/default.nix +++ b/triple-dezert/default.nix @@ -51,17 +51,17 @@ "ffmpeg-allvrything" config.services.postgresql.package (pkgs.writeScriptBin "into-nix-cache" '' - if [[ $UID -ne 0 ]]; then exec sudo $0 "$@";fi - cmd=( - ${pkgs.nix}/bin/nix - copy - --no-update-lock-file - --no-write-lock-file - --keep-going - --to 'file:///trip/nix-binary-cache?parallel-compression=true&secret-key=/root/cache-priv-key.pem&want-mass-query=true&write-nar-listing=true' - "$@" - ) - "''${cmd[@]}" + if [[ $UID -ne 0 ]]; then exec sudo $0 "$@";fi + cmd=( + ${pkgs.nix}/bin/nix + copy + --no-update-lock-file + --no-write-lock-file + --keep-going + --to 'file:///trip/nix-binary-cache?parallel-compression=true&secret-key=/root/cache-priv-key.pem&want-mass-query=true&write-nar-listing=true' + "$@" + ) + "''${cmd[@]}" '') ]; hardware.graphics.extraPackages = [ diff --git a/triple-dezert/gallerygrab.nix b/triple-dezert/gallerygrab.nix index 5ace2f1..51a9bda 100644 --- a/triple-dezert/gallerygrab.nix +++ b/triple-dezert/gallerygrab.nix @@ -39,10 +39,7 @@ in }; config = - { - lib, - ... - }: + { lib, ... }: { system.stateVersion = "24.05"; diff --git a/triple-dezert/proxied/services/mira/mira-wisdom.nix b/triple-dezert/proxied/services/mira/mira-wisdom.nix index 20556f8..59ea052 100644 --- a/triple-dezert/proxied/services/mira/mira-wisdom.nix +++ b/triple-dezert/proxied/services/mira/mira-wisdom.nix @@ -34,11 +34,7 @@ in # }; config = - { - config, - lib, - ... - }: + { config, lib, ... }: { system.stateVersion = "latest"; diff --git a/triple-dezert/proxied/services/template.nix b/triple-dezert/proxied/services/template.nix index 47f1e3c..f9d01c0 100644 --- a/triple-dezert/proxied/services/template.nix +++ b/triple-dezert/proxied/services/template.nix @@ -29,10 +29,7 @@ assert false; # this is a template }; config = - { - lib, - ... - }: + { lib, ... }: { system.stateVersion = "latest"; diff --git a/triple-dezert/sops.nix b/triple-dezert/sops.nix index 0fc1cf4..a8021c6 100644 --- a/triple-dezert/sops.nix +++ b/triple-dezert/sops.nix @@ -1,6 +1,4 @@ -{ - ... -}: +{ ... }: { # imports = [ inputs.sops-nix.nixosModules.sops ]; # diff --git a/triple-dezert/yt-archiver.nix b/triple-dezert/yt-archiver.nix index c63003e..098d177 100644 --- a/triple-dezert/yt-archiver.nix +++ b/triple-dezert/yt-archiver.nix @@ -24,11 +24,7 @@ }; config = - { - pkgs, - lib, - ... - }: + { pkgs, lib, ... }: { system.stateVersion = "23.05";