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

removed sops dependency

Browse Source 
fixed syncthing
This commit is contained in:
Richie Cahill
2024-09-14 16:05:53 -04:00
parent 76d67502e6
commit d19a485c54
6 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
systems/common/optional/syncthing_base.nix
View File

@@ -9,9 +9,9 @@
settings = { settings = {
devices = { devices = {
phone.id = "LTGPLAE-M4ZDJTM-TZ3DJGY-SLLAVWF-CQDVEVS-RGCS75T-GAPZYK3-KUM6LA5"; # cspell:disable-line phone.id = "LTGPLAE-M4ZDJTM-TZ3DJGY-SLLAVWF-CQDVEVS-RGCS75T-GAPZYK3-KUM6LA5"; # cspell:disable-line
jeeves.id = "7YQ4UEW-OPQEBH4-6YKJH4B-ZCE3SAX-5EIK5JL-WJDIWUA-WA2N3D5-MNK6GAV"; # cspell:disable-line jeeves.id = "RCDU465-AIQRBEJ-VWC4EZF-2AMXABC-F3S4NFW-QA4ZUAQ-OVNUBLI-BUJJTA2"; # cspell:disable-line
rhapsody-in-green.id = "INKUNKN-KILXGL5-2TQ5JTH-ORJOLOM-WYD2PYO-YRDLQIX-3AKZFWT-ZN7OJAE"; # cspell:disable-line ipad.id = "KI76T3X-SFUGV2L-VSNYTKR-TSIUV5L-SHWD3HE-GQRGRCN-GY4UFMD-CW6Z6AX"; # cspell:disable-line
bob.id = "YP6UYKF-KFZ3FG3-5XM3XM3-5Q24AZS-LZK67PN-LAERKU2-K4WMYBH-N57ZBA5"; # cspell:disable-line bob.id = "CJIAPEJ-VO74RR4-F75VU6M-QNZAMYG-FYUJG7Y-6AT62HJ-355PRPL-PJFETAZ"; # cspell:disable-line
}; };
}; };
}; };

10
systems/jeeves/default.nix
View File

@@ -10,7 +10,7 @@ in
../common/optional/systemd-boot.nix ../common/optional/systemd-boot.nix
../common/optional/zerotier.nix ../common/optional/zerotier.nix
./arch_mirror.nix ./arch_mirror.nix
# ./docker ./docker
./hardware.nix ./hardware.nix
./networking.nix ./networking.nix
./programs.nix ./programs.nix
@@ -24,8 +24,6 @@ in
]; ];
# services.openssh.settings.PermitRootLogin = "yes";
services = { services = {
openssh.ports = [ 629 ]; openssh.ports = [ 629 ];
@@ -45,8 +43,6 @@ in
path = vars.media_notes; path = vars.media_notes;
devices = [ devices = [
"bob" "bob"
"phone"
"rhapsody-in-green"
]; ];
fsWatcherEnabled = true; fsWatcherEnabled = true;
}; };
@@ -56,7 +52,6 @@ in
devices = [ devices = [
"bob" "bob"
"phone" "phone"
"rhapsody-in-green"
]; ];
fsWatcherEnabled = true; fsWatcherEnabled = true;
}; };
@@ -66,7 +61,6 @@ in
devices = [ devices = [
"bob" "bob"
"phone" "phone"
"rhapsody-in-green"
]; ];
fsWatcherEnabled = true; fsWatcherEnabled = true;
}; };
@@ -76,7 +70,6 @@ in
devices = [ devices = [
"bob" "bob"
"phone" "phone"
"rhapsody-in-green"
]; ];
fsWatcherEnabled = true; fsWatcherEnabled = true;
}; };
@@ -85,7 +78,6 @@ in
path = "${vars.storage_syncthing}/projects"; path = "${vars.storage_syncthing}/projects";
devices = [ devices = [
"bob" "bob"
"rhapsody-in-green"
]; ];
fsWatcherEnabled = true; fsWatcherEnabled = true;
}; };

3
systems/jeeves/docker/internal.nix
View File

@@ -1,4 +1,3 @@
{ config, ... }:
let let
vars = import ../vars.nix; vars = import ../vars.nix;
in in
@@ -53,7 +52,7 @@ in
DELUGE_DAEMON_LOG_LEVEL = "debug"; DELUGE_DAEMON_LOG_LEVEL = "debug";
DELUGE_WEB_LOG_LEVEL = "debug"; DELUGE_WEB_LOG_LEVEL = "debug";
}; };
# environmentFiles = [ config.sops.secrets."docker/qbit_vpn".path ]; environmentFiles = /root/secrets/docker/qbit_vpn;
autoStart = true; autoStart = true;
}; };
bazarr = { bazarr = {

3
systems/jeeves/docker/postgresql.nix
View File

@@ -1,4 +1,3 @@
{ config, ... }:
let let
vars = import ../vars.nix; vars = import ../vars.nix;
in in
@@ -24,7 +23,7 @@ in
POSTGRES_DB = "archive"; POSTGRES_DB = "archive";
POSTGRES_INITDB_ARGS = "--auth-host=scram-sha-256"; POSTGRES_INITDB_ARGS = "--auth-host=scram-sha-256";
}; };
# environmentFiles = [ config.sops.secrets."docker/postgres".path ]; environmentFiles = /root/secrets/docker/postgres;
autoStart = true; autoStart = true;
user = "postgres:postgres"; user = "postgres:postgres";
}; };

4
systems/jeeves/docker/web.nix
View File

@@ -26,7 +26,7 @@ in
TZ = "Etc/EST"; TZ = "Etc/EST";
}; };
volumes = [ volumes = [
# "${config.sops.secrets."docker/haproxy_cert".path}:/etc/ssl/certs/cloudflare.pem" "/root/secrets/docker/cloudflare.pem:/etc/ssl/certs/cloudflare.pem"
"${./haproxy.cfg}:/usr/local/etc/haproxy/haproxy.cfg" "${./haproxy.cfg}:/usr/local/etc/haproxy/haproxy.cfg"
]; ];
dependsOn = [ dependsOn = [
@@ -47,7 +47,7 @@ in
"tunnel" "tunnel"
"run" "run"
]; ];
# environmentFiles = [ config.sops.secrets."docker/cloud_flare_tunnel".path ]; environmentFiles = /root/secrets/docker/cloud_flare_tunnel;
dependsOn = [ "haproxy" ]; dependsOn = [ "haproxy" ];
extraOptions = [ "--network=web" ]; extraOptions = [ "--network=web" ];
autoStart = true; autoStart = true;

2
systems/jeeves/services.nix
View File

@@ -20,7 +20,7 @@
description = "validates startup"; description = "validates startup";
path = [ pkgs.zfs ]; path = [ pkgs.zfs ];
serviceConfig = { serviceConfig = {
# EnvironmentFile = config.sops.secrets."server-validation/webhook".path; EnvironmentFile = "/root/secrets/services/server-validation";
Type = "oneshot"; Type = "oneshot";
ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/validate_jeeves"; ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/validate_jeeves";
}; };