Compare commits

..

6 commits

4 changed files with 48 additions and 57 deletions

26
flake.lock generated
View file

@ -385,11 +385,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1738638143, "lastModified": 1738471961,
"narHash": "sha256-ZYMe4c4OCtIUBn5hx15PEGr0+B1cNEpl2dsaLxwY2W0=", "narHash": "sha256-cgXDFrplNGs7bCVzXhRofjD8oJYqqXGcmUzXjHmip6Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "9bdd53f5908453e4d03f395eb1615c3e9a351f70", "rev": "537286c3c59b40311e5418a180b38034661d2536",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -401,11 +401,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1738574474, "lastModified": 1738435198,
"narHash": "sha256-rvyfF49e/k6vkrRTV4ILrWd92W+nmBDfRYZgctOyolQ=", "narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fecfeb86328381268e29e998ddd3ebc70bbd7f7c", "rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -445,11 +445,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1738546358, "lastModified": 1738410390,
"narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=", "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c6e957d81b96751a3d5967a0fd73694f303cc914", "rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -701,11 +701,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738536830, "lastModified": 1738526440,
"narHash": "sha256-3QbNcI9qJ0tKv00w0r2Amqf9pylHVolcTyEi30WZxY8=", "narHash": "sha256-pveA7FOO6Y4pTnVIyx3xLUHUpq9JW9FqEj8E0t+YIjQ=",
"ref": "main", "ref": "main",
"rev": "6fd169aab3ce461fef6a1a4dcbb2ef643e12d9e6", "rev": "b1c65c444b21d1c8ddbefcfa339ac7861358d323",
"revCount": 5, "revCount": 4,
"type": "git", "type": "git",
"url": "https://codeberg.org/0xa/website.git" "url": "https://codeberg.org/0xa/website.git"
}, },

View file

@ -2,9 +2,7 @@
{ {
# ssh config for forgejo # ssh config for forgejo
# need ip forward for nat # need ip forward for nat
boot.kernel.sysctl = { boot.kernel.sysctl = { "net.ipv4.ip_forward" = 1; };
"net.ipv4.ip_forward" = 1;
};
networking.firewall = { networking.firewall = {
# open port explicitly # open port explicitly
@ -20,13 +18,11 @@
''; '';
}; };
# host sshd: only listen on oxapentane.com and mgmt vpn # host sshd: only listen on oxapentane.com and mgmt vpn
services.openssh.listenAddresses = services.openssh.listenAddresses = map (a :
map {
(a: {
addr = a; addr = a;
port = 22; port = 22;
}) }) [
[
# enp1s0 # enp1s0
"188.245.196.27" "188.245.196.27"
"2a01:4f8:c17:7f8a::1" "2a01:4f8:c17:7f8a::1"
@ -35,6 +31,7 @@
"fd31:185d:722e::1" "fd31:185d:722e::1"
]; ];
services.nginx.upstreams.forgejo = { services.nginx.upstreams.forgejo = {
servers = { servers = {
"10.89.88.15:3000" = { }; "10.89.88.15:3000" = { };

View file

@ -1,9 +1,4 @@
{ { config, pkgs, lib, ... }:
config,
pkgs,
lib,
...
}:
{ {
services.forgejo = { services.forgejo = {
enable = true; enable = true;
@ -32,8 +27,8 @@
SSH_LISTEN_PORT = 2222; SSH_LISTEN_PORT = 2222;
}; };
repository = { repository = {
DEFAULT_REPO_UNITS = "repo.code,repo.releases,repo.issues,repo.pulls"; DEFAULT_REPO_UNITS="repo.code,repo.releases,repo.issues,repo.pulls";
ENABLE_PUSH_CREATE_USER = true; ENABLE_PUSH_CREATE_USER=true;
}; };
service = { service = {
REGISTER_EMAIL_CONFIRM = false; REGISTER_EMAIL_CONFIRM = false;
@ -48,8 +43,7 @@
}; };
# expose forgejo cli # expose forgejo cli
environment.systemPackages = environment.systemPackages = let
let
cfg = config.services.forgejo; cfg = config.services.forgejo;
forgejo-cli = pkgs.writeScriptBin "forgejo-cli" '' forgejo-cli = pkgs.writeScriptBin "forgejo-cli" ''
#!${pkgs.runtimeShell} #!${pkgs.runtimeShell}
@ -62,9 +56,8 @@
export GITEA_WORK_DIR=${cfg.stateDir} export GITEA_WORK_DIR=${cfg.stateDir}
export GITEA_CUSTOM=${cfg.customDir} export GITEA_CUSTOM=${cfg.customDir}
$sudo ${lib.getExe cfg.package} "$@" $sudo ${lib.getExe cfg.package} "$@"
''; ''; in [
in
[
forgejo-cli forgejo-cli
]; ];
} }

View file

@ -9,6 +9,7 @@
USB_BLACKLIST = "1d50:604b 1d50:6089 1d50:cc15 1fc9:000c"; USB_BLACKLIST = "1d50:604b 1d50:6089 1d50:cc15 1fc9:000c";
CPU_SCALING_GOVERNOR_ON_AC = "performance"; CPU_SCALING_GOVERNOR_ON_AC = "performance";
CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
WIFI_PWR_ON_BAT = "off";
}; };
}; };
} }