magic_rb/dotfiles
1
0
Fork 0
mirror of https://git.sr.ht/~magic_rb/dotfiles synced 2024-11-25 09:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Create a way to deploy rest of terranix without containers"

Browse source 
This reverts commit 0d4698ab78.
This commit is contained in:
Magic_RB 2023-06-29 18:59:38 +02:00
parent 158ffab7c5
commit 64f95150e1
15 changed files with 20 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -1058,11 +1058,11 @@
"terranix": "terranix"
},
"locked": {
"lastModified": 1687982768,
"narHash": "sha256-GofM1CCW5l4hQtgea7lqUMQs4kRc/unx9As/vGG92hg=",
"lastModified": 1687130036,
"narHash": "sha256-U7q2iwNNdB0A7GHyLjNYLWluOVJO+K0LtiOV0Y3/vuY=",
"owner": "~magic_rb",
"repo": "uterranix",
"rev": "9ee50d0b284d76cd5b2abde709c927066d2c319b",
"rev": "30dd60117a71c3f6bb152af03ef6f7fd686abf1c",
"type": "sourcehut"
},
"original": {

9
flake.nix
View file

@ -110,15 +110,6 @@
nixos = mapAttrs (_: v: v.config.system.build.toplevel) config.flake.nixosConfigurations;
};
uterranix.preCommands = ''
TF_VAR_dont_deploy_containers=false
if [ "${self.rev or ""}" == "" ] || [ "${self.narHask or ""}" == "" ]
then
TF_VAR_dont_deploy_containers=true
fi
export TF_VAR_dont_deploy_containers
'';
uterranix.config = [
./terranix/default.nix
{

10
home-manager/modules/pantalaimon.nix
View file

@ -1,15 +1,7 @@
{ pkgs, ... }:
{ ... }:
{
services.pantalaimon = {
enable = true;
package = pkgs.pantalaimon.overrideAttrs (old: {
src = pkgs.fetchFromGitHub {
owner = "matrix-org";
repo = "pantalaimon";
rev = "3968c69aa846889970df1372ba9aa54c1c5e4290";
hash = "sha256-JdoJB68QtxPhFeZCHd+0ZOlUDbQV3HeBsxW0KbhnDSs=";
};
});
settings =
{
Default =

10
terranix/containers/email/default.nix
View file

@ -1,17 +1,10 @@
{ elib, tflib, vars, ... }:
{ elib, vars, ... }:
let
inherit (elib)
nfsVolume
nomadJob;
inherit (tflib)
tf;
in
{
variable."dont_deploy_containers" = {
type = "boolean";
description = "Whether the data to deploy containers properly is available.";
};
resource."vault_policy"."dovecot-policy" = nfsVolume {
name = "dovecot-policy";
policy = ''
@ -47,7 +40,6 @@ in
};
resource."nomad_job"."email" = {
count = tf "var.dont_deploy_containers ? 0 : 1";
jobspec = ./job.hcl;
vars = {
flake_ref = "${vars.flake_host}?rev=${vars.flake_rev}&ref=${vars.flake_ref}";

5
terranix/containers/gateway-mesh/default.nix
View file

@ -1,13 +1,10 @@
{ tflib, elib, ... }:
{ elib, ... }:
let
inherit (elib)
nomadJob;
inherit (tflib)
tf;
in
{
resource."nomad_job"."mesh" = nomadJob {
count = tf "var.dont_deploy_containers ? 0 : 1";
jobspec = ./job.hcl;
vars = {
"datacenters" = builtins.toJSON [

6
terranix/containers/gitea/default.nix
View file

@ -1,10 +1,8 @@
{ tflib, elib, vars, ... }:
{ elib, vars, ... }:
let
inherit (elib)
nfsVolume
nomadJob;
inherit (tflib)
tf;
in
{
resource."nomad_volume"."gitea-db" = nfsVolume {
@ -33,8 +31,8 @@ in
};
resource."nomad_job"."gitea" = nomadJob {
count = tf "var.dont_deploy_containers ? 0 : 1";
jobspec = ./job.hcl;
vars = {
flake_ref = "${vars.flake_host}?rev=${vars.flake_rev}&ref=${vars.flake_ref}";
flake_sha = vars.flake_sha;

6
terranix/containers/home-assistant/default.nix
View file

@ -1,10 +1,8 @@
{ tflib, elib, vars, ... }:
{ elib, vars, ... }:
let
inherit (elib)
nfsVolume
nomadJob;
inherit (tflib)
tf;
in
{
resource."nomad_volume"."home-assistant_hass" = nfsVolume {
@ -71,8 +69,8 @@ in
};
resource."nomad_job"."home-assistant" = nomadJob {
count = tf "var.dont_deploy_containers ? 0 : 1";
jobspec = ./job.hcl;
vars = {
flake_ref = "${vars.flake_host}?rev=${vars.flake_rev}&ref=${vars.flake_ref}";
flake_sha = vars.flake_sha;

6
terranix/containers/hydra/default.nix
View file

@ -1,10 +1,8 @@
{ config, tflib, elib, vars, ... }:
{ config, elib, vars, ... }:
let
inherit (elib)
nfsVolume
nomadJob;
inherit (tflib)
tf;
in
{
resource."nomad_volume"."hydra-db" = nfsVolume {
@ -41,8 +39,8 @@ in
};
resource."nomad_job"."hydra" = nomadJob {
count = tf "var.dont_deploy_containers ? 0 : 1";
jobspec = ./job.hcl;
vars = {
flake_ref = "${vars.flake_host}?rev=${vars.flake_rev}&ref=${vars.flake_ref}";
flake_sha = vars.flake_sha;

6
terranix/containers/ingress-blowhole/default.nix
View file

@ -1,14 +1,12 @@
{ tflib, elib, vars, ... }:
{ elib, vars, ... }:
let
inherit (elib)
nomadJob;
inherit (tflib)
tf;
in
{
resource."nomad_job"."ingress" = nomadJob {
count = tf "var.dont_deploy_containers ? 0 : 1";
jobspec = ./job.hcl;
vars = {
flake_ref = "${vars.flake_host}?rev=${vars.flake_rev}&ref=${vars.flake_ref}";
flake_sha = vars.flake_sha;

5
terranix/containers/ingress-toothpick/default.nix
View file

@ -1,10 +1,8 @@
{ tflib, elib, secret, vars, ... }:
{ elib, secret, vars, ... }:
let
inherit (elib)
nfsVolume
nomadJob;
inherit (tflib)
tf;
in
{
resource."nomad_volume"."ingress-letsencrypt" = nfsVolume {
@ -16,7 +14,6 @@ in
};
resource."nomad_job"."ingress" = nomadJob {
count = tf "var.dont_deploy_containers ? 0 : 1";
jobspec = ./job.hcl;
vars = {
flake_ref = "${vars.flake_host}?rev=${vars.flake_rev}&ref=${vars.flake_ref}";

5
terranix/containers/jellyfin/default.nix
View file

@ -1,10 +1,8 @@
{ tflib, elib, ... }:
{ elib, ... }:
let
inherit (elib)
nfsVolume
nomadJob;
inherit (tflib)
tf;
in
{
resource."nomad_volume"."jellyfin-cache" = nfsVolume {
@ -32,7 +30,6 @@ in
};
resource."nomad_job"."jellyfin" = nomadJob {
count = tf "var.dont_deploy_containers ? 0 : 1";
jobspec = ./job.hcl;
};
}

10
terranix/containers/matrix/default.nix
View file

@ -1,10 +1,8 @@
{ config, tflib, elib, vars, ... }:
{ config, elib, vars, ... }:
let
inherit (elib)
nfsVolume
nomadJob;
inherit (tflib)
tf;
in
{
resource."nomad_volume"."matrix-synapse" = nfsVolume {
@ -138,7 +136,6 @@ in
};
resource."nomad_job"."matrix-synapse" = nomadJob {
count = tf "var.dont_deploy_containers ? 0 : 1";
jobspec = ./matrix-synapse.hcl;
vars = {
flake_ref = "${vars.flake_host}?ref=${vars.flake_ref}&rev=${vars.flake_rev}";
@ -147,7 +144,6 @@ in
};
resource."nomad_job"."matrix-mautrix-discord" = nomadJob {
count = tf "var.dont_deploy_containers ? 0 : 1";
jobspec = ./matrix-mautrix-discord.hcl;
vars = {
flake_ref = "${vars.flake_host}?ref=${vars.flake_ref}&rev=${vars.flake_rev}";
@ -156,7 +152,6 @@ in
};
resource."nomad_job"."matrix-mautrix-facebook" = nomadJob {
count = tf "var.dont_deploy_containers ? 0 : 1";
jobspec = ./matrix-mautrix-facebook.hcl;
vars = {
flake_ref = "${vars.flake_host}?ref=${vars.flake_ref}&rev=${vars.flake_rev}";
@ -165,7 +160,6 @@ in
};
resource."nomad_job"."matrix-mautrix-signal" = nomadJob {
count = tf "var.dont_deploy_containers ? 0 : 1";
jobspec = ./matrix-mautrix-signal.hcl;
vars = {
flake_ref = "${vars.flake_host}?ref=${vars.flake_ref}&rev=${vars.flake_rev}";
@ -174,8 +168,8 @@ in
};
resource."nomad_job"."matrix-heisenbridge" = nomadJob {
count = tf "var.dont_deploy_containers ? 0 : 1";
jobspec = ./matrix-heisenbridge.hcl;
vars = {
flake_ref = "${vars.flake_host}?ref=${vars.flake_ref}&rev=${vars.flake_rev}";
flake_sha = vars.flake_sha;

5
terranix/containers/syncthing/default.nix
View file

@ -1,10 +1,8 @@
{ pkgs, tflib, elib, vars, ... }:
{ pkgs, elib, vars, ... }:
let
inherit (elib)
nfsVolume
nomadJob;
inherit (tflib)
tf;
sharePrefix = "/mnt/kyle/infrastructure/syncthing";
in
@ -34,7 +32,6 @@ in
};
resource."nomad_job"."syncthing" = nomadJob {
count = tf "var.dont_deploy_containers ? 0 : 1";
jobspec = ./job.hcl;
vars = {
flake_ref = "${vars.flake_host}?rev=${vars.flake_rev}&ref=${vars.flake_ref}";

5
terranix/containers/website/default.nix
View file

@ -1,14 +1,11 @@
{ pkgs, tflib, elib, vars, ... }:
{ pkgs, elib, vars, ... }:
let
inherit (elib)
nfsVolume
nomadJob;
inherit (tflib)
tf;
in
{
resource."nomad_job"."website" = nomadJob {
count = tf "var.dont_deploy_containers ? 0 : 1";
jobspec = ./job.hcl;
vars = {
flake_ref = "${vars.flake_host}?rev=${vars.flake_rev}&ref=${vars.flake_ref}";

5
terranix/default.nix
View file

@ -42,11 +42,6 @@ in
sensitive = true;
};
variable."dont_deploy_containers" = {
type = "boolean";
description = "Whether the data to deploy containers properly is available.";
};
provider."hcloud" = {
token = tf "var.hcloud_token";
};