nicknase27/nicksOs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
nicknase27
2026-08-26 12:29:48 +02:00
parent 526dba65c0
commit fc064edeae
5 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+3 -3
View File
@@ -104,11 +104,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1786599213, "lastModified": 1786862985,
"narHash": "sha256-yNJd40f11EzXBjSByCB7IPpeFFAdeoSKKM67dGkfFoU=", "narHash": "sha256-FBJRXmbGXiSUDvYEbfLYRkckayyZ6SK1UEqhCrIZ2Cs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0e251e24a4f24e036a084b6b4b2d2491af4167f4", "rev": "e5bdc4a41d4c072fe1e3787eaa0320a384741d44",
"type": "github" "type": "github"
}, },
"original": { "original": {
modules/services/caddy.nix
+8 -3
View File
@@ -74,7 +74,7 @@
}; };
"jf.nicknase27.com" = { "jf.nicknase27.com" = {
extraConfig = '' extraConfig = ''
reverse_proxy storage.local:8096 reverse_proxy 10.0.0.5:8096
''; '';
serverAliases = ["watch.nicknase27.com"]; serverAliases = ["watch.nicknase27.com"];
}; };
@@ -108,12 +108,17 @@
}; };
"storage.nicknase27.com" = { "storage.nicknase27.com" = {
extraConfig = '' extraConfig = ''
reverse_proxy storage.local:80 reverse_proxy 10.0.0.5:80
''; '';
}; };
"photos.nicknase27.com" = { "photos.nicknase27.com" = {
extraConfig = '' extraConfig = ''
reverse_proxy storage.local:2283 reverse_proxy 10.0.0.5:2283
'';
};
"muse.nicknase27.com" = {
extraConfig = ''
reverse_proxy 10.0.0.5:30431
''; '';
}; };
}; };
modules/services/gitea.nix
+19 -19
View File
@@ -19,17 +19,17 @@
}; };
# Runner # Runner
gitea-actions-runner = { # gitea-actions-runner = {
instances.default = { # instances.default = {
enable = true; # enable = true;
name = "hermes"; # name = "hermes";
url = "https://git.nicknase27.com"; # url = "https://git.nicknase27.com";
tokenFile = config.age.secrets.gitea-runner.path; # tokenFile = config.age.secrets.gitea-runner.path;
labels = [ # labels = [
"ubuntu-latest:docker://node:20-bookworm" # "ubuntu-latest:docker://node:20-bookworm"
]; # ];
}; # };
}; # };
}; };
age.secrets = { age.secrets = {
@@ -39,14 +39,14 @@
owner = "gitea"; owner = "gitea";
group = "gitea"; group = "gitea";
}; };
gitea-runner = { # gitea-runner = {
file = ../../secrets/gitea-runner.age; # file = ../../secrets/gitea-runner.age;
path = "/run/secrets/gitea-runner"; # path = "/run/secrets/gitea-runner";
owner = "gitea-runner"; # owner = "gitea-runner";
group = "gitea-runner"; # group = "gitea-runner";
}; # };
}; };
networking.firewall = { networking.firewall = {
allowedTCPPorts = [3000]; allowedTCPPorts = [3000];
}; };
} }
modules/system/networking.nix
+2 -3
View File
@@ -1,11 +1,10 @@
{...}: { {...}: {
networking = { networking = {
hostName = "Hermes"; hostName = "Hermes";
#nameservers = ["1.1.1.1" "1.0.0.1"]; nameservers = ["1.1.1.1" "1.0.0.1"];
nameservers = ["10.0.0.1"];
firewall = { firewall = {
enable = true; enable = true;
trustedInterfaces = ["podman0"]; trustedInterfaces = ["podman0" "docker0" "cni-podman0"];
}; };
nftables = { nftables = {
enable = true; enable = true;
secrets/secrets.nix
+1 -1
View File
@@ -12,7 +12,7 @@ in {
"livekit-keys.age".publicKeys = systems; "livekit-keys.age".publicKeys = systems;
"truenas-ssh.age".publicKeys = systems; "truenas-ssh.age".publicKeys = systems;
"gitea-db.age".publicKeys = systems; "gitea-db.age".publicKeys = systems;
"gitea-runner.age".publicKeys = systems; # "gitea-runner.age".publicKeys = systems;
"navidrome.age".publicKeys = systems; "navidrome.age".publicKeys = systems;
"vaultwarden.age".publicKeys = systems; "vaultwarden.age".publicKeys = systems;
"wg0.age".publicKeys = systems; "wg0.age".publicKeys = systems;