diff --git a/hosts/common/default.nix b/hosts/common/default.nix index ceb930a..7e9a6e1 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -90,9 +90,6 @@ in { }; networking.firewall.trustedInterfaces = ["tailscale0"]; - networking = { - networkmanager.enable = true; - }; programs.zsh.enable = true; programs.nm-applet.enable = true; diff --git a/hosts/common/graphical/default.nix b/hosts/common/graphical/default.nix index 4a938a3..f1526be 100644 --- a/hosts/common/graphical/default.nix +++ b/hosts/common/graphical/default.nix @@ -12,6 +12,10 @@ services.blueman.enable = true; programs.partition-manager.enable = true; + networking = { + networkmanager.enable = true; + }; + security.pam.services.swaylock = {}; age.secrets = { diff --git a/modules/gitea/default.nix b/modules/gitea/default.nix index 7c3cfcf..4154e31 100644 --- a/modules/gitea/default.nix +++ b/modules/gitea/default.nix @@ -3,6 +3,14 @@ pkgs, ... }: { + age.secrets = { + sendmail_email_key_gitea = { + file = ../../secrets/sendmail_email_key_gitea.age; + owner = "gitea"; + group = "gitea"; + }; + }; + services.gitea = { enable = true; appName = "The Broccoli Patch"; # Give the site a name @@ -23,11 +31,22 @@ DOMAIN = "git.broccoli.town"; }; service = { + REGISTER_EMAIL_CONFIRM = true; DISABLE_REGISTRATION = true; }; repository = { ENABLE_PUSH_CREATE_USER = true; }; + mailer = { + ENABLED = true; + FROM = "gitea@broccoli.town"; + MAILER_TYPE = "smtp"; + SMTP_ADDR = "smtp.sendgrid.net"; + SMTP_PORT = 465; + IS_TLS_ENABLED = true; + USER = "apikey"; + }; }; + mailerPasswordFile = config.age.secrets.sendmail_email_key_gitea.path; }; } diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 8a1f5e4..867e3a9 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -26,4 +26,5 @@ in { "minisign_private_key.age".publicKeys = users ++ [system1 system3]; "bigding_backup_s3_creds.age".publicKeys = users ++ [system4]; "bigding_backup_repo_password.age".publicKeys = users ++ [system4]; + "sendmail_email_key_gitea.age".publicKeys = users ++ [system4]; } diff --git a/secrets/sendmail_email_key_gitea.age b/secrets/sendmail_email_key_gitea.age new file mode 100644 index 0000000..00f0312 --- /dev/null +++ b/secrets/sendmail_email_key_gitea.age @@ -0,0 +1,17 @@ +age-encryption.org/v1 +-> ssh-ed25519 eYYv1Q XtRSlxUK8enDmGPLuaNTtRLfPcAw2adI0rg7tyrIsVg +wqS2sot8VBkg8AEIVT+8nqp/zQrgx60aO5+EDKAS6Eo +-> ssh-ed25519 Bp5IaA xxKUriiEdSH1oG9/vdyjEtyOq7b1zSBY6RyDr13OVUE +sWVBSJtX/TNBxINHv4NqmN4yPjNteoMyPH9vZRHp9t4 +-> ssh-ed25519 T/DpgA MnEwHXMOJIX6EL4j24QX1GD047lQvCLHKSDPvwEXYj0 +bMVQvcub7BE5kQ7nipQGAg0DLsHhA6y9pQxjG0vLDYo +-> ssh-ed25519 qMgRFg nLCDG0cPUGw0EHebVawxraulglOVEdwUWh/c5CFf6CM +MagTjYCuIyNF895Kk0Y2uDxZf3u9X5ZKatNPSfENZOA +-> ssh-ed25519 dMZXNw FZ2sXIfl1yxkvfuNC6njE/OrH8IptIo7MOwNeHeSrWQ +YBC1LUbStFBKX/rHIgtb70+W6mmdk7XOBDnrZBTeEyU +-> ssh-ed25519 70Nt2Q hUwnRFHLeArYMmIKh0ObeL+rh3PKgvIOZJjfhXH+fwU +vFasj2ysflk5M+KyGfoAkBrk+X0GcphlK8uQFFTvwB0 +-> C"2am-grease e )q x;Ej +gbqZ94TuSRUzfQ +--- o0NjU4u5RB1RSAeOGhud8VJSLLpbZSoU7suslTA3rbs +i$׼`Bp Jn,CutiWle$/}pCUn{*Cf>oʁL'}å8 R9I6 \ No newline at end of file