Richie/dotfiles
1
0
Fork 0
mirror of https://github.com/RichieCahill/dotfiles.git synced 2026-04-17 04:58:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

updated then vars names

Browse Source
This commit is contained in:
Richie Cahill
2025-04-01 20:10:49 -04:00
parent c349af60ce
commit 7dbf67a2d3
15 changed files with 47 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
systems/jeeves/docker/qbitvpn.nix
View File

@@ -21,9 +21,9 @@ in
"8118:8118"
];
volumes = [
"${vars.media_docker_configs}/qbitvpn:/config"
"${vars.storage_qbitvpn}:/data"
"${vars.scratch_qbitvpn}:/data/incomplete"
"${vars.docker_configs}/qbitvpn:/config"
"${vars.qbitvpn}:/data"
"${vars.qbitvpn_scratch}:/data/incomplete"
"/etc/localtime:/etc/localtime:ro"
];
environment = {
@@ -41,7 +41,7 @@ in
DELUGE_DAEMON_LOG_LEVEL = "debug";
DELUGE_WEB_LOG_LEVEL = "debug";
};
environmentFiles = [ "${vars.storage_secrets}/docker/qbitvpn" ];
environmentFiles = [ "${vars.secrets}/docker/qbitvpn" ];
autoStart = true;
};
}

2
systems/jeeves/docker/share.nix
View File

@@ -7,7 +7,7 @@ in
ports = [ "8091:80" ];
volumes = [
"${../../../common/docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/"
"${vars.media_share}:/data"
"${vars.share}:/data"
];
extraOptions = [ "--network=web" ];
autoStart = true;

8
systems/jeeves/runners/nix_builder.nix
View File

@@ -28,8 +28,8 @@ in
mountPoint = "/zfs/media/github-runners/${name}";
isReadOnly = false;
};
"/secrets".mountPoint = "${vars.storage_secrets}/services/github-runners/${name}";
"ssh-keys".mountPoint = "${vars.storage_secrets}/services/github-runners/id_ed25519_github-runners";
"/secrets".mountPoint = "${vars.secrets}/services/github-runners/${name}";
"ssh-keys".mountPoint = "${vars.secrets}/services/github-runners/id_ed25519_github-runners";
};
config =
{
@@ -65,7 +65,7 @@ in
Port 629
User github-runners
HostName 192.168.95.14
IdentityFile ${vars.storage_secrets}/services/github-runners/id_ed25519_github-runners
IdentityFile ${vars.secrets}/services/github-runners/id_ed25519_github-runners
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
'';
@@ -75,7 +75,7 @@ in
workDir = "/zfs/media/github-runners/${name}";
url = "https://github.com/RichieCahill/dotfiles";
extraLabels = [ "nixos" ];
tokenFile = "${vars.storage_secrets}/services/github-runners/${name}";
tokenFile = "${vars.secrets}/services/github-runners/${name}";
user = "github-runners";
group = "github-runners";
extraPackages = with pkgs; [

4
systems/jeeves/services/audiobookshelf.nix
View File

@@ -5,6 +5,6 @@ in
{
services.audiobookshelf.enable = true;
systemd.services.audiobookshelf.serviceConfig.WorkingDirectory =
lib.mkForce "${vars.media_docker_configs}/audiobookshelf";
users.users.audiobookshelf.home = lib.mkForce "${vars.media_docker_configs}/audiobookshelf";
lib.mkForce "${vars.docker_configs}/audiobookshelf";
users.users.audiobookshelf.home = lib.mkForce "${vars.docker_configs}/audiobookshelf";
}

2
systems/jeeves/services/cloud_flare_tunnel.nix
View File

@@ -9,7 +9,7 @@ in
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "simple";
EnvironmentFile = "${vars.storage_secrets}/docker/cloud_flare_tunnel";
EnvironmentFile = "${vars.secrets}/docker/cloud_flare_tunnel";
ExecStart = "${pkgs.cloudflared}/bin/cloudflared --no-autoupdate tunnel run";
Restart = "on-failure";
};

4
systems/jeeves/services/duckdns.nix
View File

@@ -4,7 +4,7 @@ in
{
services.duckdns = {
enable = true;
tokenFile = "${vars.storage_secrets}/services/duckdns/token";
domainsFile = "${vars.storage_secrets}/services/duckdns/domains";
tokenFile = "${vars.secrets}/services/duckdns/token";
domainsFile = "${vars.secrets}/services/duckdns/domains";
};
}

2
systems/jeeves/services/filebrowser.nix
View File

@@ -14,7 +14,7 @@ in
Type = "simple";
User = "richie";
Group = "users";
ExecStart = "${pkgs.filebrowser}/bin/filebrowser --root=/zfs --address=0.0.0.0 --database=${vars.media_docker_configs}/filebrowser/filebrowser.db";
ExecStart = "${pkgs.filebrowser}/bin/filebrowser --root=/zfs --address=0.0.0.0 --database=${vars.docker_configs}/filebrowser/filebrowser.db";
Restart = "on-failure";
};
};

2
systems/jeeves/services/home_assistant.nix
View File

@@ -14,7 +14,7 @@ in
home-assistant = {
enable = true;
openFirewall = true;
configDir = vars.media_home_assistant;
configDir = vars.home_assistant;
config = {
http = {
server_port = 8123;

2
systems/jeeves/services/jellyfin.nix
View File

@@ -5,6 +5,6 @@ in
services.jellyfin = {
enable = true;
openFirewall = true;
dataDir = "${vars.media_services}/jellyfin";
dataDir = "${vars.services}/jellyfin";
};
}

2
systems/jeeves/services/nix_serve.nix
View File

@@ -4,7 +4,7 @@ in
{
services.nix-serve = {
enable = true;
secretKeyFile = "${vars.storage_secrets}/services/nix-cache/cache-priv-key.pem";
secretKeyFile = "${vars.secrets}/services/nix-cache/cache-priv-key.pem";
openFirewall = true;
};
}

2
systems/jeeves/services/postgress.nix
View File

@@ -10,7 +10,7 @@ in
package = pkgs.postgresql_17_jit;
enableTCPIP = true;
enableJIT = true;
dataDir = "${vars.media_database}/postgres";
dataDir = "${vars.database}/postgres";
authentication = pkgs.lib.mkOverride 10 ''

2
systems/jeeves/services/systemd.nix
View File

@@ -23,7 +23,7 @@ in
description = "validates startup";
path = [ pkgs.zfs ];
serviceConfig = {
EnvironmentFile = "${vars.storage_secrets}/services/server-validation";
EnvironmentFile = "${vars.secrets}/services/server-validation";
Type = "oneshot";
ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/validate_system --config-file='${./validate_system.toml}'";
};

6
systems/jeeves/services/transmission.nix
View File

@@ -7,16 +7,16 @@ in
enable = true;
package = pkgs.transmission_4;
webHome = pkgs.flood-for-transmission;
home = "${vars.media_services}/transmission";
home = "${vars.services}/transmission";
openPeerPorts = true;
openRPCPort = true;
downloadDirPermissions = "770";
settings = {
bind-address-ipv4 = "192.168.95.14";
cache-size-mb = 0;
download-dir = "${vars.storage_transmission}/complete";
download-dir = "${vars.transmission}/complete";
download-queue-enabled = false;
incomplete-dir = "${vars.scratch_transmission}/incomplete";
incomplete-dir = "${vars.transmission_scratch}/incomplete";
incomplete-dir-enabled = true;
message-level = 3;
peer-port = 51413;

22
systems/jeeves/syncthing.nix
View File

@@ -20,7 +20,7 @@ in
};
"notes" = {
id = "l62ul-lpweo"; # cspell:disable-line
path = vars.media_notes;
path = vars.notes;
devices = [
"rhapsody-in-green"
"davids-server"
@@ -29,7 +29,7 @@ in
};
"important" = {
id = "4ckma-gtshs"; # cspell:disable-line
path = "${vars.storage_syncthing}/important";
path = "${vars.syncthing}/important";
devices = [
"bob"
"rhapsody-in-green"
@@ -39,7 +39,7 @@ in
};
"music" = {
id = "vprc5-3azqc"; # cspell:disable-line
path = "${vars.storage_syncthing}/music";
path = "${vars.syncthing}/music";
devices = [
"bob"
"rhapsody-in-green"
@@ -50,14 +50,14 @@ in
};
"projects" = {
id = "vyma6-lqqrz"; # cspell:disable-line
path = "${vars.storage_syncthing}/projects";
path = "${vars.syncthing}/projects";
devices = [
"rhapsody-in-green"
];
fsWatcherEnabled = true;
};
"rhapsody-in-green_temp" = {
path = "${vars.storage_syncthing}/rhapsody-in-green_temp";
path = "${vars.syncthing}/rhapsody-in-green_temp";
devices = [
"rhapsody-in-green"
];
@@ -72,7 +72,7 @@ in
fsWatcherEnabled = true;
};
"backup" = {
path = "${vars.storage_syncthing}/backup";
path = "${vars.syncthing}/backup";
devices = [
"davids-server"
];
@@ -81,7 +81,7 @@ in
#
"davids-backup1" = {
id = "8229p-8z3tm"; # cspell:disable-line
path = "${vars.storage_syncthing}/davids_backups/1";
path = "${vars.syncthing}/davids_backups/1";
devices = [
"davids-server"
];
@@ -90,7 +90,7 @@ in
};
"davids-backup2" = {
id = "iciw3-dp6ao"; # cspell:disable-line
path = "${vars.storage_syncthing}/davids_backups/2";
path = "${vars.syncthing}/davids_backups/2";
devices = [
"davids-server"
];
@@ -99,7 +99,7 @@ in
};
"davids-backup3" = {
id = "9si6m-bnkjb"; # cspell:disable-line
path = "${vars.storage_syncthing}/davids_backups/3";
path = "${vars.syncthing}/davids_backups/3";
devices = [
"davids-server"
];
@@ -108,7 +108,7 @@ in
};
"davids-backup4" = {
id = "qjyfy-uupj4"; # cspell:disable-line
path = "${vars.storage_syncthing}/davids_backups/4";
path = "${vars.syncthing}/davids_backups/4";
devices = [
"davids-server"
];
@@ -117,7 +117,7 @@ in
};
"davids-backup5" = {
id = "fm4h5-emsu2"; # cspell:disable-line
path = "${vars.storage_syncthing}/davids_backups/5";
path = "${vars.syncthing}/davids_backups/5";
devices = [
"davids-server"
];

35
systems/jeeves/vars.nix
View File

@@ -5,26 +5,17 @@ let
in
{
inherit zfs_media zfs_storage zfs_scratch;
# media
media_database = "${zfs_media}/database";
media_docker = "${zfs_media}/docker";
media_docker_configs = "${zfs_media}/docker/configs";
media_mirror = "${zfs_media}/mirror";
media_share = "${zfs_media}/share";
media_services = "${zfs_media}/services";
media_notes = "${zfs_media}/notes";
media_plex = "${zfs_media}/plex";
media_home_assistant = "${zfs_media}/home_assistant";
# storage
storage_main = "${zfs_storage}/main";
storage_photos = "${zfs_storage}/photos";
storage_plex = "${zfs_storage}/plex";
storage_secrets = "${zfs_storage}/secrets";
storage_syncthing = "${zfs_storage}/syncthing";
storage_library = "${zfs_storage}/library";
storage_qbitvpn = "${zfs_storage}/qbitvpn";
storage_transmission = "${zfs_storage}/transmission";
# scratch
scratch_qbitvpn = "${zfs_scratch}/qbitvpn";
scratch_transmission = "${zfs_scratch}/transmission";
database = "${zfs_media}/database";
docker = "${zfs_media}/docker";
docker_configs = "${zfs_media}/docker/configs";
home_assistant = "${zfs_media}/home_assistant";
notes = "${zfs_media}/notes";
qbitvpn = "${zfs_storage}/qbitvpn";
qbitvpn_scratch = "${zfs_scratch}/qbitvpn";
secrets = "${zfs_storage}/secrets";
services = "${zfs_media}/services";
share = "${zfs_media}/share";
syncthing = "${zfs_storage}/syncthing";
transmission = "${zfs_storage}/transmission";
transmission_scratch = "${zfs_scratch}/transmission";
}