adjustments

nixos/components/network/hosts.nix

@@ -1,6 +1,5 @@
 {
   networking.extraHosts = ''
-    192.168.0.24 scanner
     144.76.13.147 robi
   '';
 }

nixos/components/network/sshd/default.nix

@@ -1,11 +1,9 @@
 { pkgs, config, lib, ... }:
-
 with lib;
 with types;
-
 let
-  cfg = config.components.network.sshd;
   defaultRootKeyFiles = [ (toString ../../../assets/ssh/palo_rsa.pub) ];
+  cfg = config.components.network.sshd;
 in
 {
 
@@ -19,18 +17,12 @@ in
     enable = mkOption {
       type = bool;
       default = true;
-      description = "add ssh tools";
     };
     rootKeyFiles = mkOption {
       type = with types; listOf path;
       default = [ ];
       description = "keys to root login";
     };
-    tools.enable = mkOption {
-      type = bool;
-      default = true;
-      description = "add ssh tools";
-    };
     onlyTincAccess = mkOption {
       type = bool;
       default = false;
@@ -42,12 +34,10 @@ in
 
   config = mkMerge [
 
-    (mkIf cfg.tools.enable {
-      environment.systemPackages = [ pkgs.sshfs ];
-    })
-
     (mkIf cfg.enable {
 
+      environment.systemPackages = [ pkgs.sshfs ];
+
       services.openssh = {
         enable = true;
         forwardX11 = false;

nixos/components/network/sshd/known-hosts-bootup.nix

@@ -18,6 +18,8 @@ let
 in
 {
 
+  config = mkIf (config.components.network.sshd.enable) {
+
     services.openssh.knownHosts = {
       "robi-init-ssh" = {
         hostNames = [
@@ -64,4 +66,5 @@ in
       in
       sshTor ++ passwordTor;
 
+  };
 }

nixos/components/network/sshd/known-hosts-private.nix

@@ -1,4 +1,7 @@
-{ config, lib, ... }: {
+{ config, lib, ... }:
+with lib;
+{
+  config = mkIf (config.components.network.sshd.enable) {
 
     services.openssh.knownHosts = {
       #"robi_init" = {
@@ -22,4 +25,5 @@
         publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK2PGX6cZuBUGX4VweMzi0aRh4uQ61yngCzZGcK3w5XV";
       };
     };
+  };
 }

nixos/components/network/sshd/known-hosts-public.nix

@@ -1,8 +1,7 @@
-{ config, pkgs, lib, ... }:
+{ pkgs, config, lib, ... }:
-
 with lib;
-
 {
+  config = mkIf (config.components.network.sshd.enable) {
 
     services.openssh.knownHosts = {
       github = {
@@ -91,4 +90,5 @@ with lib;
       };
     };
 
+  };
 }