diff --git a/flake.nix b/flake.nix index b2d6090..508729b 100644 --- a/flake.nix +++ b/flake.nix @@ -59,7 +59,6 @@ imports = [ ./host/roam mod.shared.all - mod.server.all ]; }; }; diff --git a/host/roam/default.nix b/host/roam/default.nix index fd505b0..83fbb4a 100644 --- a/host/roam/default.nix +++ b/host/roam/default.nix @@ -1,12 +1,8 @@ -{ ... }: +{ lib', ... }: { networking.hostName = "roam"; - imports = [ - ./hardware-configuration.nix - ]; - - services.openssh.enable = true; + imports = lib'.import-recursive ./.; # ====== DON'T CHANGE ====== system.stateVersion = "24.11"; diff --git a/mod/server/networking.nix b/host/roam/services/networking.nix similarity index 100% rename from mod/server/networking.nix rename to host/roam/services/networking.nix diff --git a/mod/server/security.nix b/host/roam/services/security.nix similarity index 100% rename from mod/server/security.nix rename to host/roam/services/security.nix diff --git a/mod/server/services.nix b/host/roam/services/services.nix similarity index 89% rename from mod/server/services.nix rename to host/roam/services/services.nix index 9bd0fa0..5d0eb59 100644 --- a/mod/server/services.nix +++ b/host/roam/services/services.nix @@ -31,5 +31,10 @@ in }; }; }; + + openssh = { + enable = true; + settings.PasswordAuthentication = false; + }; }; } diff --git a/lib.nix b/lib.nix index aca2364..89b3619 100644 --- a/lib.nix +++ b/lib.nix @@ -1,5 +1,6 @@ { lib, ... }: rec { + # TODO make a version that only includes nix paths. walk-dir = path: let @@ -15,4 +16,8 @@ rec { else builtins.throw "Items of type ${value} are unsupported."; }) dir; + + # Takes a path `p` and returns a flattened lists of all files in that + # directory, ignoring `p/default.nix`. + import-recursive = path: lib.attrsets.collect builtins.isPath (walk-dir path // { default = { }; }); } diff --git a/mod/server/all.nix b/mod/server/all.nix deleted file mode 100644 index fb02e56..0000000 --- a/mod/server/all.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ mod, ... }: -{ - imports = with mod.server; [ - services - networking - security - ]; -}