Compare commits

..

No commits in common. "74c12e9658bd456aa0a411653e07c01ee8ffc798" and "34725c3aebc4da3820d070e9c096cfad75bcca7f" have entirely different histories.

10 changed files with 72 additions and 64 deletions

View file

@ -3,6 +3,7 @@
services.forgejo = { services.forgejo = {
enable = true; enable = true;
database.type = "postgres"; database.type = "postgres";
mailerPasswordFile = "/secrets/forgejo-mailer-password.secret";
settings = { settings = {
DEFAULT = { DEFAULT = {
@ -59,6 +60,5 @@
HOST = "redis+socket:///run/redis-forgejo/redis.sock"; HOST = "redis+socket:///run/redis-forgejo/redis.sock";
}; };
}; };
secrets.mailer.PASSWD = "/secrets/forgejo-mailer-password.secret";
}; };
} }

View file

@ -3,10 +3,10 @@
services.keycloak = { services.keycloak = {
enable = true; enable = true;
settings = { settings = {
hostname = "https://id.nekover.se"; hostname = "id.nekover.se";
hostname-admin = "https://keycloak-admin.nekover.se"; hostname-admin = "keycloak-admin.nekover.se";
proxy-headers = "forwarded"; hostname-strict-backchannel = true;
http-enabled = true; proxy = "edge";
http-host = "127.0.0.1"; http-host = "127.0.0.1";
http-port = 8080; http-port = 8080;
}; };

View file

@ -15,20 +15,28 @@
]; ];
routes = [ routes = [
{ {
routeConfig = {
Gateway = "10.202.41.1"; Gateway = "10.202.41.1";
Destination = "10.201.0.0/16"; Destination = "10.201.0.0/16";
};
} }
{ {
routeConfig = {
Gateway = "10.202.41.1"; Gateway = "10.202.41.1";
Destination = "10.202.0.0/16"; Destination = "10.202.0.0/16";
};
} }
{ {
routeConfig = {
Gateway = "10.202.41.1"; Gateway = "10.202.41.1";
Destination = "172.21.87.0/24"; Destination = "172.21.87.0/24";
};
} }
{ {
routeConfig = {
Gateway = "10.202.41.1"; Gateway = "10.202.41.1";
Destination = "212.53.203.19/32"; Destination = "212.53.203.19/32";
};
} }
]; ];
linkConfig.RequiredForOnline = "routable"; linkConfig.RequiredForOnline = "routable";
@ -54,11 +62,13 @@
PrivateKeyFile = "/secrets/wireguard-mail-1-wg0-privatekey.secret"; PrivateKeyFile = "/secrets/wireguard-mail-1-wg0-privatekey.secret";
}; };
wireguardPeers = [{ wireguardPeers = [{
wireguardPeerConfig = {
PublicKey = "ik480irMZtGBs1AFpf1KGzDBekjdziD3ck7XK8r1WXQ="; PublicKey = "ik480irMZtGBs1AFpf1KGzDBekjdziD3ck7XK8r1WXQ=";
PresharedKeyFile = "/secrets/wireguard-valkyrie-mail-1-mail-1-psk.secret"; PresharedKeyFile = "/secrets/wireguard-valkyrie-mail-1-mail-1-psk.secret";
Endpoint = "212.53.203.19:51822"; Endpoint = "212.53.203.19:51822";
AllowedIPs = [ "0.0.0.0/0" ]; AllowedIPs = [ "0.0.0.0/0" ];
PersistentKeepalive = 25; PersistentKeepalive = 25;
};
}]; }];
}; };
}; };

View file

@ -15,20 +15,28 @@
]; ];
routes = [ routes = [
{ {
routeConfig = {
Gateway = "10.201.41.1"; Gateway = "10.201.41.1";
Destination = "10.201.0.0/16"; Destination = "10.201.0.0/16";
};
} }
{ {
routeConfig = {
Gateway = "10.201.41.1"; Gateway = "10.201.41.1";
Destination = "10.202.0.0/16"; Destination = "10.202.0.0/16";
};
} }
{ {
routeConfig = {
Gateway = "10.201.41.1"; Gateway = "10.201.41.1";
Destination = "172.21.87.0/24"; Destination = "172.21.87.0/24";
};
} }
{ {
routeConfig = {
Gateway = "10.201.41.1"; Gateway = "10.201.41.1";
Destination = "217.160.117.160/32"; Destination = "217.160.117.160/32";
};
} }
]; ];
linkConfig.RequiredForOnline = "routable"; linkConfig.RequiredForOnline = "routable";
@ -54,11 +62,13 @@
PrivateKeyFile = "/secrets/wireguard-mail-2-wg0-privatekey.secret"; PrivateKeyFile = "/secrets/wireguard-mail-2-wg0-privatekey.secret";
}; };
wireguardPeers = [{ wireguardPeers = [{
wireguardPeerConfig = {
PublicKey = "Nnf7x+Yd+l8ZkK2BTq1lK3iiTYgdrgL9PQ/je8smug4="; PublicKey = "Nnf7x+Yd+l8ZkK2BTq1lK3iiTYgdrgL9PQ/je8smug4=";
PresharedKeyFile = "/secrets/wireguard-lifeline-mail-2-mail-2-psk.secret"; PresharedKeyFile = "/secrets/wireguard-lifeline-mail-2-mail-2-psk.secret";
Endpoint = "217.160.117.160:51820"; Endpoint = "217.160.117.160:51820";
AllowedIPs = [ "0.0.0.0/0" ]; AllowedIPs = [ "0.0.0.0/0" ];
PersistentKeepalive = 25; PersistentKeepalive = 25;
};
}]; }];
}; };
}; };

View file

@ -2,7 +2,7 @@
{ {
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud30; package = pkgs.nextcloud29;
hostName = "cloud.nekover.se"; hostName = "cloud.nekover.se";
https = true; https = true;
config = { config = {

View file

@ -25,5 +25,5 @@
}; };
}; };
system.stateVersion = "24.11"; system.stateVersion = "23.11";
} }

View file

@ -1,19 +1,8 @@
{ ... }: { nixpkgs-unstable, ... }:
{ {
# The sonarr package is dependend on .NET 6 which is marked as insecure.
# It doesn't seem to build with the later .NET versions.
# In the meantime allow the installation of these insecure packages since sonarr is only reachable locally.
nixpkgs.config = {
permittedInsecurePackages = [
"aspnetcore-runtime-wrapped-6.0.36"
"aspnetcore-runtime-6.0.36"
"dotnet-sdk-wrapped-6.0.428"
"dotnet-sdk-6.0.428"
];
};
services.sonarr = { services.sonarr = {
enable = true; enable = true;
package = nixpkgs-unstable.legacyPackages."x86_64-linux".sonarr;
user = "torrent"; user = "torrent";
group = "torrent"; group = "torrent";
}; };

View file

@ -34,11 +34,11 @@
}, },
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1732410305, "lastModified": 1731805462,
"narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=", "narHash": "sha256-yhEMW4MBi+IAyEJyiKbnFvY1uARyMKJpLUhkczI49wk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "87b6978992e2eb605732fba842cad0a7e14b2047", "rev": "b9f04e3cf71c23bea21d2768051e6b3068d44734",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -55,11 +55,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732496924, "lastModified": 1732151224,
"narHash": "sha256-/MNhZLR0eh9z/d3l+ammq+F5XxHln0RHgO4Bhtjr0IM=", "narHash": "sha256-5IgpueM8SGLOadzUJK6Gk37zEBXGd56BkNOtoWmnZos=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "098e8b6ff72c86944a8d54b64ddd7b7e6635830a", "rev": "3280fdde8c8f0276c9f5286ad5c0f433dfa5d56c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -70,16 +70,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1732954812, "lastModified": 1732244845,
"narHash": "sha256-RvyWCxT6O9ugSqSXHAMaFTIZtKS7SBHdUHKLoPW1/xg=", "narHash": "sha256-aspop5sCDNpDMS23BplGFtQDadwkSb/sOxpuC3lafvo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "809802e9ab4b56e7a3db576832e95e3f7b74781a", "rev": "df94f897ffe1af1bcd60cb68697c5d8e6431346e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.11-small", "ref": "nixos-24.05-small",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -101,11 +101,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1732997066, "lastModified": 1732479666,
"narHash": "sha256-9Vvu3a1ep1LB6F/kVE2hHH2HQzhSFtUyJYiJRkUkC4Q=", "narHash": "sha256-1wRCB9ZbD+9fQ/JL2nllb4vH6J3ojSHew6FazRPjqqc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "33b9d57c656e65a9c88c5f34e4eb00b83e2b0ca9", "rev": "4a58b6f6b83d29354def3125c45530d7e1bda0fd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -117,11 +117,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1732951447, "lastModified": 1732446744,
"narHash": "sha256-ndq0dD5E6FkqwmNYFS1wUAHa/5HixS3jLjulogM+7/E=", "narHash": "sha256-yXqgr+GiC/RBr8n/6Bn9eRagitXbKXNcoSaZUCovuwI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "57feb2a16f705eeffb075888d92a986e66473012", "rev": "2570b87e71ea16daadf0a93f1eae2d3ad4478a94",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,6 +1,6 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11-small"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05-small";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small";
nixpkgs-master.url = "github:NixOS/nixpkgs/master"; nixpkgs-master.url = "github:NixOS/nixpkgs/master";
nixos-generators = { nixos-generators = {

View file

@ -92,7 +92,6 @@ in
environment = "proxmox"; environment = "proxmox";
}; };
torrent = { torrent = {
hostNixpkgs = nixpkgs-unstable;
site = "vs"; site = "vs";
environment = "proxmox"; environment = "proxmox";
}; };