diff --git a/machines/memere/default.nix b/machines/memere/default.nix index 658c138..33aa9a0 100644 --- a/machines/memere/default.nix +++ b/machines/memere/default.nix @@ -21,10 +21,11 @@ services.openssh.enable = true; services.openssh.listenAddresses = [ { - addr = "100.0.0.0"; + addr = "100.99.144.4"; port = 22; } ]; + services.openssh.settings.PermitRootLogin = "yes"; networking.hostName = "pepere"; networking.networkmanager.enable = true; diff --git a/machines/niczos/default.nix b/machines/niczos/default.nix index 59959c5..4d40c71 100644 --- a/machines/niczos/default.nix +++ b/machines/niczos/default.nix @@ -13,6 +13,7 @@ in # module /etc/nixos/modules/nix.nix /etc/nixos/modules/security.nix + /etc/nixos/modules/sops.nix /etc/nixos/modules/ssl.nix /etc/nixos/modules/tailscale.nix /etc/nixos/modules/backup diff --git a/modules/sops.nix b/modules/sops.nix new file mode 100644 index 0000000..04ca7d3 --- /dev/null +++ b/modules/sops.nix @@ -0,0 +1,16 @@ +{ + imports = [ + "${(import /etc/nixos/npins/default.nix).sops-nix}/modules/sops" + ]; + + sops.age.keyFile = "/home/zo/.config/sops/age/keys.txt"; + sops.validateSopsFiles = false; + sops.defaultSopsFile = "/etc/nixos/ssl/keys/default.yaml"; + sops.secrets.cert_main_key = { + sopsFile = "/etc/nixos/ssl/keys/main.yaml"; + mode = "0060"; + owner = "nobody"; + group = "nogroup"; + path = "/etc/ssl/keys/main.pem"; + }; +} diff --git a/modules/ssl.nix b/modules/ssl.nix index bc90569..9900a47 100644 --- a/modules/ssl.nix +++ b/modules/ssl.nix @@ -1,21 +1,6 @@ { - imports = [ - "${(import /etc/nixos/npins/default.nix).sops-nix}/modules/sops" - ]; - security.pki.certificateFiles = [ /etc/nixos/ssl/certs/main.pem ]; environment.etc."ssl/certs/main.pem".source = /etc/nixos/ssl/certs/main.pem; - - sops.age.keyFile = "/home/zo/.config/sops/age/keys.txt"; - sops.validateSopsFiles = false; - sops.defaultSopsFile = "/etc/nixos/ssl/keys/default.yaml"; - sops.secrets.cert_main_key = { - sopsFile = "/etc/nixos/ssl/keys/main.yaml"; - mode = "0060"; - owner = "nobody"; - group = "nogroup"; - path = "/etc/ssl/keys/main.pem"; - }; }