titaniumtown/server-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

formatting and nits

Browse Source
This commit is contained in:
Simon Gardling 2025-03-22 17:20:56 -04:00
parent e573a1b8ed
commit b9fab67b53
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
5 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configuration.nix
View File

@ -19,11 +19,13 @@
./services/immich.nix ./services/immich.nix
./services/gitea.nix ./services/gitea.nix
./services/minecraft.nix ./services/minecraft.nix
./services/wg.nix ./services/wg.nix
./services/qbittorrent.nix ./services/qbittorrent.nix
./services/bitmagnet.nix ./services/bitmagnet.nix
./services/matrix.nix
./services/owntracks.nix # ./services/matrix.nix
# ./services/owntracks.nix
./services/soulseek.nix ./services/soulseek.nix
]; ];
@ -98,7 +100,10 @@
services.openssh = { services.openssh = {
enable = true; enable = true;
settings = { settings = {
AllowUsers = [ username "root" ]; AllowUsers = [
username
"root"
];
PasswordAuthentication = false; PasswordAuthentication = false;
PermitRootLogin = "yes"; # for deploying configs PermitRootLogin = "yes"; # for deploying configs
}; };
@ -288,7 +293,8 @@
]; ];
}; };
users.users.root.openssh.authorizedKeys.keys = config.users.users.${username}.openssh.authorizedKeys.keys; users.users.root.openssh.authorizedKeys.keys =
config.users.users.${username}.openssh.authorizedKeys.keys;
# https://nixos.wiki/wiki/Fish#Setting_fish_as_your_shell # https://nixos.wiki/wiki/Fish#Setting_fish_as_your_shell
programs.fish.enable = true; programs.fish.enable = true;

24
flake.lock generated
View File

@ -135,11 +135,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742234739, "lastModified": 1742655702,
"narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=", "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59", "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -183,11 +183,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742522051, "lastModified": 1742608263,
"narHash": "sha256-uDlj+5J7eTuFkDaNl9cYf++gJdEW23Z4zSuDcNANIQc=", "narHash": "sha256-NMd7fpj04y0srAbHa19o7xMk19MzIrwkOKz57mxJC5E=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "57464e795fd31ceef845d7ce454d3b83e80e283e", "rev": "341dc497af2d985ec97a9b5c935674b885706e52",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -198,11 +198,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1742376361, "lastModified": 1742631601,
"narHash": "sha256-VFMgJkp/COvkt5dnkZB4D2szVdmF6DGm5ZdVvTUy61c=", "narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "daaae13dff0ecc692509a1332ff9003d9952d7a9", "rev": "380ed15bcd6440606c6856db44a99140d422b46f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -214,11 +214,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1742562948, "lastModified": 1742596159,
"narHash": "sha256-QUnzAW7CW0sCkFN1Kez/8UVq8EbBGNKOfHZHIZON0XQ=", "narHash": "sha256-SH9ein8zlFHD1xk/se3OXE3ZuxGHNyY8DlVb0fFj/bg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e7a04ccc42104e0554f0a2325930fe98db9a5325", "rev": "904178ac5c12ff07a359fbb20453a977f0b7effd",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View File

@ -86,6 +86,7 @@
postgres = { postgres = {
socket = "/run/postgresql"; socket = "/run/postgresql";
dataDir = "${service_configs.services_dir}/sql";
}; };
immich = { immich = {
@ -103,7 +104,8 @@
}; };
jellyfin = { jellyfin = {
dir = services_dir + "/jellyfin"; dataDir = services_dir + "/jellyfin";
cacheDir = services_dir + "/jellyfin_cache";
}; };
owntracks = { owntracks = {

6
services/jellyfin.nix
View File

@ -12,13 +12,13 @@
jellyfin-ffmpeg jellyfin-ffmpeg
]; ];
services.jellyfin = rec { services.jellyfin = {
enable = true; enable = true;
# used for local streaming # used for local streaming
openFirewall = true; openFirewall = true;
dataDir = service_configs.jellyfin.dir; dataDir = service_configs.jellyfin.dataDir;
cacheDir = dataDir + "_cache"; cacheDir = service_configs.jellyfin.cacheDir;
}; };
services.caddy.virtualHosts."jellyfin.${service_configs.https.domain}".extraConfig = '' services.caddy.virtualHosts."jellyfin.${service_configs.https.domain}".extraConfig = ''

3
services/postgresql.nix
View File

@ -2,13 +2,14 @@
pkgs, pkgs,
config, config,
username, username,
service_configs,
... ...
}: }:
{ {
services.postgresql = { services.postgresql = {
enable = true; enable = true;
package = pkgs.postgresql_16; package = pkgs.postgresql_16;
dataDir = "/tank/services/sql"; dataDir = service_configs.postgres.dataDir;
}; };
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [