From 4716c3ed6f433d2bb4179be04ff36af0221eb7ed Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Wed, 20 Mar 2024 11:47:54 +0100 Subject: [PATCH] run deadnix and nix fmt --- flake.nix | 2 +- modules/flake-parts/_template.nix | 7 ------ modules/flake-parts/apps.ssh-/default.nix | 1 - .../darwinConfigurations.macos-01/default.nix | 2 -- .../darwinConfigurations.macos-02/default.nix | 2 -- .../darwinConfigurations.macos-03/default.nix | 2 -- .../darwinConfigurations.macos-04/default.nix | 2 -- .../darwinConfigurations.macos-05/default.nix | 2 -- .../darwinConfigurations.macos-06/default.nix | 2 -- modules/flake-parts/formatter.nix | 14 ++--------- .../microvms.nix-cache/configuration.nix | 2 -- .../microvms.nix-cache/default.nix | 7 +----- .../default.nix | 1 - .../configuration.nix | 1 - .../default.nix | 1 - modules/flake-parts/packages.nix | 11 +-------- modules/nixos/cachix-watch.nix | 2 -- modules/nixos/github-runner-multi-arch.nix | 1 - modules/nixos/holo-deploy.nix | 6 +---- modules/nixos/macos-remote-builder.nix | 1 - modules/nixos/macos.nix | 1 - modules/nixos/nix-build-distributor.nix | 3 +-- modules/nixos/shared-darwin.nix | 9 ++++++-- modules/nixos/shared-linux.nix | 6 ++++- modules/nixos/shared-nix-settings.nix | 1 - modules/nixos/shared.nix | 23 +++++++++---------- 26 files changed, 30 insertions(+), 82 deletions(-) diff --git a/flake.nix b/flake.nix index 9526a6f..312c56b 100644 --- a/flake.nix +++ b/flake.nix @@ -46,7 +46,7 @@ # url = "https://github.com/maackle.keys"; # flake = false; # }; - + # hash mismatch 20230821 # keys_neonphog = { # url = "https://github.com/neonphog.keys"; diff --git a/modules/flake-parts/_template.nix b/modules/flake-parts/_template.nix index a0742db..297557d 100644 --- a/modules/flake-parts/_template.nix +++ b/modules/flake-parts/_template.nix @@ -1,16 +1,9 @@ { # System independent arguments. - self, - lib, - inputs, ... }: { perSystem = { # Arguments specific to the `perSystem` context. - config, - self', - inputs', - pkgs, ... }: { # system specific outputs like, apps, checks, packages diff --git a/modules/flake-parts/apps.ssh-/default.nix b/modules/flake-parts/apps.ssh-/default.nix index 38bc7d8..2e78c66 100644 --- a/modules/flake-parts/apps.ssh-/default.nix +++ b/modules/flake-parts/apps.ssh-/default.nix @@ -6,7 +6,6 @@ }: { perSystem = {pkgs, ...}: let mkSsh = { - attrName, hostName, deployUser, }: diff --git a/modules/flake-parts/darwinConfigurations.macos-01/default.nix b/modules/flake-parts/darwinConfigurations.macos-01/default.nix index c6910a1..1c5f2f9 100644 --- a/modules/flake-parts/darwinConfigurations.macos-01/default.nix +++ b/modules/flake-parts/darwinConfigurations.macos-01/default.nix @@ -1,8 +1,6 @@ { - self, lib, inputs, - config, ... }: let system = "aarch64-darwin"; diff --git a/modules/flake-parts/darwinConfigurations.macos-02/default.nix b/modules/flake-parts/darwinConfigurations.macos-02/default.nix index 6f3ebef..e454dcc 100644 --- a/modules/flake-parts/darwinConfigurations.macos-02/default.nix +++ b/modules/flake-parts/darwinConfigurations.macos-02/default.nix @@ -1,8 +1,6 @@ { - self, lib, inputs, - config, ... }: let system = "x86_64-darwin"; diff --git a/modules/flake-parts/darwinConfigurations.macos-03/default.nix b/modules/flake-parts/darwinConfigurations.macos-03/default.nix index b33d480..2e355d0 100644 --- a/modules/flake-parts/darwinConfigurations.macos-03/default.nix +++ b/modules/flake-parts/darwinConfigurations.macos-03/default.nix @@ -1,8 +1,6 @@ { - self, lib, inputs, - config, ... }: let system = "aarch64-darwin"; diff --git a/modules/flake-parts/darwinConfigurations.macos-04/default.nix b/modules/flake-parts/darwinConfigurations.macos-04/default.nix index 2ed7651..9adde8c 100644 --- a/modules/flake-parts/darwinConfigurations.macos-04/default.nix +++ b/modules/flake-parts/darwinConfigurations.macos-04/default.nix @@ -1,8 +1,6 @@ { - self, lib, inputs, - config, ... }: let system = "aarch64-darwin"; diff --git a/modules/flake-parts/darwinConfigurations.macos-05/default.nix b/modules/flake-parts/darwinConfigurations.macos-05/default.nix index 73e6958..60e97fe 100644 --- a/modules/flake-parts/darwinConfigurations.macos-05/default.nix +++ b/modules/flake-parts/darwinConfigurations.macos-05/default.nix @@ -1,8 +1,6 @@ { - self, lib, inputs, - config, ... }: let system = "aarch64-darwin"; diff --git a/modules/flake-parts/darwinConfigurations.macos-06/default.nix b/modules/flake-parts/darwinConfigurations.macos-06/default.nix index 6b9a31b..301155d 100644 --- a/modules/flake-parts/darwinConfigurations.macos-06/default.nix +++ b/modules/flake-parts/darwinConfigurations.macos-06/default.nix @@ -1,8 +1,6 @@ { - self, lib, inputs, - config, ... }: let system = "x86_64-darwin"; diff --git a/modules/flake-parts/formatter.nix b/modules/flake-parts/formatter.nix index abfc0c0..905eb44 100644 --- a/modules/flake-parts/formatter.nix +++ b/modules/flake-parts/formatter.nix @@ -1,15 +1,5 @@ -{ - self, - lib, - ... -}: { - perSystem = { - config, - self', - inputs', - pkgs, - ... - }: { +{...}: { + perSystem = {pkgs, ...}: { # define formatter used by `nix fmt` formatter = pkgs.alejandra; }; diff --git a/modules/flake-parts/microvms.nix-cache/configuration.nix b/modules/flake-parts/microvms.nix-cache/configuration.nix index 8a29e5f..947ce41 100644 --- a/modules/flake-parts/microvms.nix-cache/configuration.nix +++ b/modules/flake-parts/microvms.nix-cache/configuration.nix @@ -1,8 +1,6 @@ { name, self, - config, - lib, pkgs, ... }: let diff --git a/modules/flake-parts/microvms.nix-cache/default.nix b/modules/flake-parts/microvms.nix-cache/default.nix index 8c2c576..a40a71e 100644 --- a/modules/flake-parts/microvms.nix-cache/default.nix +++ b/modules/flake-parts/microvms.nix-cache/default.nix @@ -13,12 +13,7 @@ in { # Include the microvm module inputs.microvm.nixosModules.microvm # Add more modules here - ({ - config, - lib, - pkgs, - ... - }: { + ({config, ...}: { microvm.mem = 1024 * 8; microvm.vcpu = 4; diff --git a/modules/flake-parts/nixosConfigurations.dweb-reverse-tls-proxy/default.nix b/modules/flake-parts/nixosConfigurations.dweb-reverse-tls-proxy/default.nix index dd1f2d8..a961336 100644 --- a/modules/flake-parts/nixosConfigurations.dweb-reverse-tls-proxy/default.nix +++ b/modules/flake-parts/nixosConfigurations.dweb-reverse-tls-proxy/default.nix @@ -1,5 +1,4 @@ { - config, self, lib, inputs, diff --git a/modules/flake-parts/nixosConfigurations.linux-builder-01/configuration.nix b/modules/flake-parts/nixosConfigurations.linux-builder-01/configuration.nix index 5496cfc..bb24ca6 100644 --- a/modules/flake-parts/nixosConfigurations.linux-builder-01/configuration.nix +++ b/modules/flake-parts/nixosConfigurations.linux-builder-01/configuration.nix @@ -1,6 +1,5 @@ { config, - lib, inputs, self, pkgs, diff --git a/modules/flake-parts/nixosConfigurations.linux-builder-01/default.nix b/modules/flake-parts/nixosConfigurations.linux-builder-01/default.nix index 19c3703..a6e80de 100644 --- a/modules/flake-parts/nixosConfigurations.linux-builder-01/default.nix +++ b/modules/flake-parts/nixosConfigurations.linux-builder-01/default.nix @@ -1,5 +1,4 @@ { - config, self, lib, inputs, diff --git a/modules/flake-parts/packages.nix b/modules/flake-parts/packages.nix index da2fd2b..bdc7084 100644 --- a/modules/flake-parts/packages.nix +++ b/modules/flake-parts/packages.nix @@ -1,27 +1,18 @@ { # System independent arguments. - self, - lib, - inputs, ... }: { perSystem = { # Arguments specific to the `perSystem` context. - config, - self', - inputs', pkgs, ... }: { # system specific outputs like, apps, checks, packages packages = { - reverse-proxy-nix-cache = let - - in pkgs.writeShellScriptBin "reverse-proxy-nix-cache" '' + reverse-proxy-nix-cache = pkgs.writeShellScriptBin "reverse-proxy-nix-cache" '' sudo ${pkgs.caddy}/bin/caddy reverse-proxy --from :80 --to :5000 ''; - }; }; flake = { diff --git a/modules/nixos/cachix-watch.nix b/modules/nixos/cachix-watch.nix index e86dd64..281adab 100644 --- a/modules/nixos/cachix-watch.nix +++ b/modules/nixos/cachix-watch.nix @@ -1,8 +1,6 @@ { inputs, pkgs, - config, - lib, magicPaths, ... }: { diff --git a/modules/nixos/github-runner-multi-arch.nix b/modules/nixos/github-runner-multi-arch.nix index 79d8b65..d853b06 100644 --- a/modules/nixos/github-runner-multi-arch.nix +++ b/modules/nixos/github-runner-multi-arch.nix @@ -2,7 +2,6 @@ self, config, lib, - magicPaths, pkgs, ... }: let diff --git a/modules/nixos/holo-deploy.nix b/modules/nixos/holo-deploy.nix index 6f4aa61..1bce3c6 100644 --- a/modules/nixos/holo-deploy.nix +++ b/modules/nixos/holo-deploy.nix @@ -1,8 +1,4 @@ -{ - config, - lib, - ... -}: { +{lib, ...}: { options = { deployUser = lib.mkOption { type = lib.types.str; diff --git a/modules/nixos/macos-remote-builder.nix b/modules/nixos/macos-remote-builder.nix index d64f8e2..530596b 100644 --- a/modules/nixos/macos-remote-builder.nix +++ b/modules/nixos/macos-remote-builder.nix @@ -1,5 +1,4 @@ { - config, lib, pkgs, ... diff --git a/modules/nixos/macos.nix b/modules/nixos/macos.nix index 863c545..b49af85 100644 --- a/modules/nixos/macos.nix +++ b/modules/nixos/macos.nix @@ -1,7 +1,6 @@ { inputs, config, - pkgs, lib, ... }: { diff --git a/modules/nixos/nix-build-distributor.nix b/modules/nixos/nix-build-distributor.nix index fa3e6dd..5682807 100644 --- a/modules/nixos/nix-build-distributor.nix +++ b/modules/nixos/nix-build-distributor.nix @@ -20,7 +20,7 @@ speedFactor = 1; supportedFeatures = config.nix.settings.experimental-features; } - + # macos-02 # - intel CPU { @@ -46,7 +46,6 @@ supportedFeatures = config.nix.settings.experimental-features; } - # macos-04 # - m1 cpu # - system integrity protection disabled diff --git a/modules/nixos/shared-darwin.nix b/modules/nixos/shared-darwin.nix index 103e255..cd2b217 100644 --- a/modules/nixos/shared-darwin.nix +++ b/modules/nixos/shared-darwin.nix @@ -1,5 +1,10 @@ -{ config, lib, pkgs, ...}: let - cleanup0sizeDrvs = (import ./shared-linux.nix { inherit config pkgs; }).systemd.services.nix-gc.preStart; +{ + config, + lib, + pkgs, + ... +}: let + cleanup0sizeDrvs = (import ./shared-linux.nix {inherit config pkgs;}).systemd.services.nix-gc.preStart; in { launchd.daemons.nix-gc.command = lib.mkForce (pkgs.writeShellScript "nix-gc" '' ${cleanup0sizeDrvs} diff --git a/modules/nixos/shared-linux.nix b/modules/nixos/shared-linux.nix index cf0e3f6..7474e29 100644 --- a/modules/nixos/shared-linux.nix +++ b/modules/nixos/shared-linux.nix @@ -1,4 +1,8 @@ -{ config, pkgs, ... }: { +{ + config, + pkgs, + ... +}: { systemd.services.nix-gc.preStart = '' # if the machine runs low on disk space it's possible for derivation files to be created but never get content which results in derivations that can't be removed by the gc. this is a workaround which finds and deletes those problem derivations. echo Removing 0-size derivations if any exist... diff --git a/modules/nixos/shared-nix-settings.nix b/modules/nixos/shared-nix-settings.nix index 93008ea..a1f04a1 100644 --- a/modules/nixos/shared-nix-settings.nix +++ b/modules/nixos/shared-nix-settings.nix @@ -1,5 +1,4 @@ { - config, pkgs, lib, ... diff --git a/modules/nixos/shared.nix b/modules/nixos/shared.nix index 93d39e6..6172329 100644 --- a/modules/nixos/shared.nix +++ b/modules/nixos/shared.nix @@ -2,20 +2,19 @@ config, pkgs, lib, - system, ... -}: let -in { +}: { # Nix configuration shared between all hosts - imports = [ - ./holo-deploy.nix - ] - # TODO: figure out why this results in infinite recursion - # ++ pkgs.stdenv.isLinux [ - # ./shared-linux.nix - # ] - ; + imports = + [ + ./holo-deploy.nix + ] + # TODO: figure out why this results in infinite recursion + # ++ pkgs.stdenv.isLinux [ + # ./shared-linux.nix + # ] + ; nix.package = lib.mkDefault pkgs.nixVersions.nix_2_17; @@ -88,4 +87,4 @@ in { else if config.deployUser == "root" then "/root" else "/home/${config.deployUser}"; -} +}