Compare commits

..

No commits in common. "307bbead601f470458a6c87ba292277011bdaae0" and "05583e3c159254e1547c7fcb65ff92992fe6271f" have entirely different histories.

5 changed files with 12 additions and 15 deletions

View file

@ -57,10 +57,6 @@
HostName 100.87.54.48 HostName 100.87.54.48
User notoh User notoh
IdentityFile ~/.ssh/sora IdentityFile ~/.ssh/sora
Host daphbot
Hostname 100.109.118.139
User root
IdentityFile ~/.ssh/daphbot
Host tsuru Host tsuru
HostName 100.82.146.40 HostName 100.82.146.40
User notoh User notoh

View file

@ -1,4 +1,9 @@
{lib, ...}: { {
pkgs,
lib,
config,
...
}: {
networking.firewall.allowedTCPPorts = [2222]; networking.firewall.allowedTCPPorts = [2222];
services.forgejo = { services.forgejo = {
enable = true; enable = true;
@ -6,7 +11,6 @@
settings = { settings = {
service.DISABLE_REGISTRATION = true; service.DISABLE_REGISTRATION = true;
DEFAULT.APP_NAME = "forgejo"; DEFAULT.APP_NAME = "forgejo";
log.LEVEL = "Debug";
ui = { ui = {
DEFAULT_THEME = "forgejo-dark"; DEFAULT_THEME = "forgejo-dark";
}; };

View file

@ -33,11 +33,6 @@
redirectscheme.scheme = "https"; redirectscheme.scheme = "https";
redirectscheme.permanent = true; redirectscheme.permanent = true;
}; };
cors = {
headers = {
accessControlAllowOriginList = "https://daphbot.notohh.dev";
};
};
}; };
routers = { routers = {
api = { api = {
@ -122,7 +117,6 @@
service = "forgejo"; service = "forgejo";
tls.domains = [{main = "*.flake.sh";}]; tls.domains = [{main = "*.flake.sh";}];
tls.certresolver = "production"; tls.certresolver = "production";
middlewares = "cors";
}; };
rustypaste-insecure = { rustypaste-insecure = {
rule = "Host(`i.flake.sh`)"; rule = "Host(`i.flake.sh`)";

View file

@ -1,6 +1,7 @@
{ {
config, config,
pkgs, pkgs,
inputs,
... ...
}: { }: {
imports = [ imports = [
@ -31,6 +32,8 @@
hostName = "tsuki"; hostName = "tsuki";
}; };
programs.sniffnet.enable = true;
services = { services = {
xserver = { xserver = {
enable = true; enable = true;
@ -107,7 +110,6 @@
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
nil
dconf dconf
polkit_gnome polkit_gnome
libvirt libvirt
@ -115,5 +117,6 @@
pinentry-gtk2 pinentry-gtk2
jdk17 jdk17
comma comma
inputs.matugen.packages.x86_64-linux.default
]; ];
} }

View file

@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SevenTV"; owner = "SevenTV";
repo = pname; repo = pname;
rev = "c7a11ebce0b4ef7acaa1a71389f242861726c3a7"; rev = "v${version}";
sha256 = "sha256-yDqkhlYuaLCWS//Z8ndN/LXSCL61N5vAJWe/SmEHt2Y="; sha256 = "sha256-WFmv15rZPnTFruoYpXHUBj1NduppNE3dt5S/ArWL1Wg=";
fetchSubmodules = true; fetchSubmodules = true;
}; };