diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix index fdb3a18..8ec091d 100644 --- a/hosts/yodaTab/configuration.nix +++ b/hosts/yodaTab/configuration.nix @@ -48,4 +48,6 @@ in ]; networking.hostName = "yodaTab"; + services.openssh.ports = [ 22 ]; + boot.initrd.network.ssh.port = 22; } diff --git a/hosts/yodaTux/configuration.nix b/hosts/yodaTux/configuration.nix index d9fa9d9..9e7d913 100644 --- a/hosts/yodaTux/configuration.nix +++ b/hosts/yodaTux/configuration.nix @@ -6,6 +6,7 @@ let # Import Home Manager with niv. home-manager = (import ../../nix/sources.nix).home-manager; + #home-manager-source = import (import ../../nix/sources.nix).home-manager {}; in { # Paths to other modules. @@ -17,6 +18,7 @@ in ./hardware-configuration.nix # Home Manager. (import "${home-manager}/nixos") + #home-manager-source.nixos ../../modules/home-manager.nix # NUR. ../../modules/nur.nix @@ -48,4 +50,6 @@ in ]; networking.hostName = "yodaTux"; + services.openssh.ports = [ 22 ]; + boot.initrd.network.ssh.port = 22; } diff --git a/hosts/yodaYoga/configuration.nix b/hosts/yodaYoga/configuration.nix index dcdaa3d..8d0d744 100644 --- a/hosts/yodaYoga/configuration.nix +++ b/hosts/yodaYoga/configuration.nix @@ -50,4 +50,6 @@ in ]; networking.hostName = "yodaYoga"; + services.openssh.ports = [ 2223 ]; + boot.initrd.network.ssh.port = 2223; } diff --git a/modules/fde-ssh-unlock.nix b/modules/fde-ssh-unlock.nix index 466aa77..636f258 100644 --- a/modules/fde-ssh-unlock.nix +++ b/modules/fde-ssh-unlock.nix @@ -11,7 +11,7 @@ boot.initrd.network.enable = true; boot.initrd.network.ssh = { enable = true; - port = 22; + #port = 22; shell = "/bin/cryptsetup-askpass"; authorizedKeys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCpgihAg8Qzu5q+AGXHLR7p+rrS1yB0KlZb/Y/EwZT15EhEtsUMqBMRiY0TdjKQU0broyygZnymccLmCXvihEgk3zk/hP8VEDmN5wmE2tRBPR4lSjo8E1R8N79G+gaFkwi93QYh57MsGfa9k4tvGrJy0yaD7GrPqtQf+IIuvV14WJQAqnikTdbFqRjk5JGearYLU7jSKa+9NmR7JQ9NExoyIPgmQ/pd0Xc2qt8k5UGfz3HM9MAmIVQ30whK6m1iYZ8nxEidHrfreQx8NOa7ujo4zQnV1NYvRUjObr/qyIhPU6DYLT2mVRNupQFKx6LI38O4U13heugUFqJ3zvog3aDsriFiv8jzJAJvWXx7Q3TqKhqiG9VTkwBw1NDbCAOXKiEdMfiCYbdCfpNgdepU75bMloJcSQQVUqoH2tQhSbwKLuRFgOnyaHpvWbieXBRcUnfG8gg4p4jqiwx5laweEeOIOD/i7G1Mjx7Dj2ctnT/ILat/xsf+Y0W4eJr3bc5L9ghgw6wsKbNSqwjFUCFcHcARK3gvSH+hO2/BpgMVoyvZjO5PNuUqfsZ7bIIs5cDdyB/ly3irKuaRz1+3x1x4gPgSiOcji7HxPwogzhPsyfoRLHNt9tJ5X4nF2Iz1M5RTJpbZCi6yEj+9Q85FVjD76BEWuZe18kRrwhuLf/XgKdF9tQ== openpgp:0xA8B75370" diff --git a/modules/ssh.nix b/modules/ssh.nix index 65af1cc..d630883 100644 --- a/modules/ssh.nix +++ b/modules/ssh.nix @@ -4,6 +4,7 @@ # Enable SSH server. services.openssh = { enable = true; + #ports = [ 22 ]; # Forbid root login through SSH. settings.PermitRootLogin = "no"; # Use authorized keys only. @@ -27,13 +28,13 @@ "yodaYoga" = { hostname = "192.168.178.99"; user = "yoda"; - port = 22; + port = 2223; compression = false; }; "unlockYodaYoga" = { hostname = "192.168.178.99"; user = "root"; - port = 22; + port = 2223; compression = false; }; "pi3bplus" = {