rename tree to modules

flake.nix

@@ -39,7 +39,7 @@
         inputs.flake-parts.flakeModules.easyOverlay
         inputs.pre-commit-hooks.flakeModule
         inputs.treefmt-nix.flakeModule
-        (inputs.import-tree ./tree)
+        (inputs.import-tree ./modules)
       ];
 
       systems = import inputs.systems;

modules/boot.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   flake.nixosModules.boot = {
     boot = {
       loader = {

modules/deploy.nix

@@ -1,13 +1,17 @@
-{...}: {
+{ ... }:
-  flake.nixosModules.deploy = {
+{
-    config,
+  flake.nixosModules.deploy =
-    pkgs,
+    {
-    lib,
+      config,
-    ...
+      pkgs,
-  }:
+      lib,
-    with lib; let
+      ...
+    }:
+    with lib;
+    let
       cfg = config.c.services.remote-deploy;
-    in {
+    in
+    {
       options.c.services.remote-deploy = {
         enable = mkEnableOption "Enable remote deployment with nixinate.";
         host = mkOption {
@@ -50,8 +54,7 @@
       config = mkIf cfg.enable {
         _module.args = {
           nixinate = {
-            inherit
+            inherit (cfg)
-              (cfg)
               host
               buildOn
               port
@@ -60,21 +63,21 @@
             sshUser = cfg.user;
           };
         };
-        users.groups."${cfg.group}" = {};
+        users.groups."${cfg.group}" = { };
         users.users."${cfg.user}" = {
           isSystemUser = true;
           shell = pkgs.bash;
           inherit (cfg) group;
           openssh.authorizedKeys.keys = cfg.keys;
         };
-        nix.settings.trusted-users = [cfg.user];
+        nix.settings.trusted-users = [ cfg.user ];
         security.sudo.extraRules = [
           {
-            groups = [cfg.group];
+            groups = [ cfg.group ];
             commands = [
               {
                 command = "ALL";
-                options = ["NOPASSWD"];
+                options = [ "NOPASSWD" ];
               }
             ];
           }

modules/gpg-pinentry-wayland.nix

@@ -0,0 +1,8 @@
+{ ... }:
+{
+  flake.nixosModules.gpg-pinentry-wayland =
+    { pkgs, ... }:
+    {
+      services.dbus.packages = [ pkgs.gcr ];
+    };
+}

modules/hm.nix

@@ -0,0 +1,9 @@
+{ ... }:
+{
+  flake.nixosModules.hm =
+    { ... }:
+    {
+      home-manager.useGlobalPkgs = true;
+      home-manager.useUserPackages = true;
+    };
+}

modules/keys.nix

@@ -0,0 +1,10 @@
+{ ... }:
+{
+  flake.nixosModules.keys =
+    { lib, ... }:
+    {
+      options.keys = lib.mkOption {
+        default = import ../lib/keys.nix;
+      };
+    };
+}

modules/nix.nix

@@ -1,4 +1,5 @@
-{inputs, ...}: {
+{ inputs, ... }:
+{
   flake.nixosModules.nix-config = {
     nix = {
       registry.nixpkgs.flake = inputs.nixpkgs;

modules/secrets.nix

@@ -0,0 +1,8 @@
+{ ... }:
+{
+  flake.nixosModules.secrets =
+    { ... }:
+    {
+      imports = [ ../secrets/secrets-configuration.nix ];
+    };
+}

modules/tailscale.nix

@@ -1,12 +1,16 @@
-{...}: {
+{ ... }:
-  flake.nixosModules.tailscale = {
+{
-    config,
+  flake.nixosModules.tailscale =
-    lib,
+    {
-    ...
+      config,
-  }:
+      lib,
-    with lib; let
+      ...
+    }:
+    with lib;
+    let
       cfg = config.c.services.mesh;
-    in {
+    in
+    {
       options.c.services.mesh = {
         enable = mkEnableOption "Enable tailscale daemon.";
         exitNode = mkOption {
@@ -28,10 +32,10 @@
             "--login-server"
             "https://mesh.cleslie.uk"
           ];
-          extraSetFlags = [(mkIf cfg.exitNode "--advertise-exit-node")];
+          extraSetFlags = [ (mkIf cfg.exitNode "--advertise-exit-node") ];
         };
         networking.firewall = {
-          trustedInterfaces = [config.services.tailscale.interfaceName];
+          trustedInterfaces = [ config.services.tailscale.interfaceName ];
         };
       };
     };

tree/gpg-pinentry-wayland.nix

@@ -1,5 +0,0 @@
-{...}: {
-  flake.nixosModules.gpg-pinentry-wayland = {pkgs, ...}: {
-    services.dbus.packages = [pkgs.gcr];
-  };
-}

tree/hm.nix

@@ -1,6 +0,0 @@
-{...}: {
-  flake.nixosModules.hm = {...}: {
-    home-manager.useGlobalPkgs = true;
-    home-manager.useUserPackages = true;
-  };
-}

tree/keys.nix

@@ -1,7 +0,0 @@
-{...}: {
-  flake.nixosModules.keys = {lib, ...}: {
-    options.keys = lib.mkOption {
-      default = import ../lib/keys.nix;
-    };
-  };
-}

tree/secrets.nix

@@ -1,5 +0,0 @@
-{...}: {
-  flake.nixosModules.secrets = {...}: {
-    imports = [../secrets/secrets-configuration.nix];
-  };
-}