run deadnix and nix fmt (#70)

holochain · Mar 20, 2024 · 3082865 · 3082865
1 parent 382172c
commit 3082865
Show file tree

Hide file tree

Showing 26 changed files with 30 additions and 82 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
 {
-  config,
   self,
   lib,
   inputs,

diff --git 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
@@ -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
@@ -2,7 +2,6 @@
   self,
   config,
   lib,
-  magicPaths,
   pkgs,
   ...
 }: let

diff --git 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
@@ -1,5 +1,4 @@
 {
-  config,
   lib,
   pkgs,
   ...

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
 {
-  config,
   pkgs,
   lib,
   ...

diff --git 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}";
-} 
+}