From 32ac87ee41e470ce6cc03825cfb426bfb8bf9104 Mon Sep 17 00:00:00 2001 From: Emelie Graven Date: Tue, 21 Feb 2023 11:30:39 +0100 Subject: [PATCH] Add ssh keys, disable gitea reg --- config/common/users.nix | 3 ++- config/hosts/wind/services/gitea.nix | 32 ++++++++++++---------------- config/sources/nix/sources.json | 18 ++++++++-------- 3 files changed, 25 insertions(+), 28 deletions(-) diff --git a/config/common/users.nix b/config/common/users.nix index 58ed82f..b2e389c 100644 --- a/config/common/users.nix +++ b/config/common/users.nix @@ -23,7 +23,8 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILwmREgBmckocQerEfO4XhB+dbKDsZopok37ePWHwCEj id_ed25519" "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAILrZWS1PBVRbdmPh8IJdIPHhK0+ZuSnQCR10a8Bl11VZAAAABHNzaDo= amanda@sharpy" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO6v5D/aJuIhuIVcnzFA7ocxPMI8JgHEnxSPuD+SaLHX amanda@sharpy" - "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIH0o3EApXEP3vZMP9sVG9CQZ122KemUQuT6BZF2uhZnHAAAABHNzaDo= amanda@ed25519_resident_nk3" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG+0x2uHcuXpFQdeXeUWeLGPefWo6Sd7yy2FJlyZy8V+ amanda@tappy" + "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIFKWhc20jOFF+pVVT/Mf1ACYOtppkYWkP7NkY0/fPvjPAAAAFHNzaDphMy1uazNhLXBlcnNvbmFs ssh:a3-nk3a-personal" ]; }; }; diff --git a/config/hosts/wind/services/gitea.nix b/config/hosts/wind/services/gitea.nix index 4a488d8..87d1a5c 100644 --- a/config/hosts/wind/services/gitea.nix +++ b/config/hosts/wind/services/gitea.nix @@ -1,22 +1,18 @@ { ... }: { - services.gitea = { - enable = true; - domain = "git.graven.dev"; - rootUrl = "https://git.graven.dev"; - enableUnixSocket = true; - appName = "Graven Gitea"; - settings = { - ui = { - "DEFAULT_THEME" = "arc-green"; - }; - session = { - "COOKIE_SECURE" = true; - }; - }; - database = { - type = "postgres"; - }; - }; + services.gitea = { + enable = true; + domain = "git.graven.dev"; + rootUrl = "https://git.graven.dev"; + enableUnixSocket = true; + cookieSecure = true; + appName = "Graven Gitea"; + settings = { "ui" = { "DEFAULT_THEME" = "arc-green"; }; }; + database = { + type = "postgres"; + }; + settings.service.DISABLE_REGISTRATION = true; + settings.session.COOKIE_SECURE = true; + }; } diff --git a/config/sources/nix/sources.json b/config/sources/nix/sources.json index d2a75b5..440f106 100644 --- a/config/sources/nix/sources.json +++ b/config/sources/nix/sources.json @@ -17,10 +17,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7bd6b87b3712e68007823e8dd5c37ee9b114fee3", - "sha256": "0yz1xzwdq72avic7s6569i23xwbha75788jb57w08yspf6a478nd", + "rev": "d24ea777c57b69c6b143cf11d83184ef71b0dbbf", + "sha256": "0hzjm3jvaplm9vrsmnc7ir6jpnf1hnchmm7f2m8r5rwgxkqvpkgg", "type": "tarball", - "url": "https://github.com/NixOS/nixos-hardware/archive/7bd6b87b3712e68007823e8dd5c37ee9b114fee3.tar.gz", + "url": "https://github.com/NixOS/nixos-hardware/archive/d24ea777c57b69c6b143cf11d83184ef71b0dbbf.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { @@ -29,10 +29,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32b9320b43c15e743c9bc6b790d353330edf2419", - "sha256": "057ll5i95v90h6vgsbrw0f43wiynq8mzyh5ix1g2d5g4blym27va", + "rev": "a7af1abd95b89782e24fd7f7b0fb1f12972785cd", + "sha256": "0g8vwn18n9vr14jpv1kd0a8qqdmhx47arjcf196x0ki5rqgvkpb5", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/32b9320b43c15e743c9bc6b790d353330edf2419.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/a7af1abd95b89782e24fd7f7b0fb1f12972785cd.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixus": { @@ -41,10 +41,10 @@ "homepage": "", "owner": "Infinisil", "repo": "nixus", - "rev": "16be55591873689dd9422143d3cc456b4bb97dfc", - "sha256": "0zfj4kr92bz0dajgqi3hy477jx58qr26qwdy1f76w5gk9y4kas4f", + "rev": "9ff2a3923f733849100f99102b57a0d6c7240f2e", + "sha256": "1a2dhfrckhv94j4m3q42va1z5k21qk5s25s3m1qj3gkqyxvpilc5", "type": "tarball", - "url": "https://github.com/Infinisil/nixus/archive/16be55591873689dd9422143d3cc456b4bb97dfc.tar.gz", + "url": "https://github.com/Infinisil/nixus/archive/9ff2a3923f733849100f99102b57a0d6c7240f2e.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } }