diff --git a/nixos/hosts/olympus/default.nix b/nixos/hosts/olympus/default.nix index 636647a..a2d0f55 100644 --- a/nixos/hosts/olympus/default.nix +++ b/nixos/hosts/olympus/default.nix @@ -29,6 +29,7 @@ hostname = "vault"; ip = "10.42.42.6"; mac = "16:2B:87:55:0C:0C"; + profile = "vault-0"; } { hostname = "mosquitto"; @@ -149,6 +150,12 @@ ip = "10.42.42.29"; mac = "A6:09:1D:A8:81:28"; } + { + hostname = "vault-1"; + ip = "10.42.42.30"; + mac = "26:69:0E:7C:B3:79"; + profile = "vault-1"; + } { hostname = "nuc"; ip = "10.42.42.42"; diff --git a/nixos/hosts/olympus/vault/configuration.nix b/nixos/hosts/olympus/vault-0/configuration.nix similarity index 100% rename from nixos/hosts/olympus/vault/configuration.nix rename to nixos/hosts/olympus/vault-0/configuration.nix diff --git a/nixos/hosts/olympus/vault/migrate.hcl b/nixos/hosts/olympus/vault-0/migrate.hcl similarity index 100% rename from nixos/hosts/olympus/vault/migrate.hcl rename to nixos/hosts/olympus/vault-0/migrate.hcl diff --git a/nixos/hosts/olympus/vault-1/configuration.nix b/nixos/hosts/olympus/vault-1/configuration.nix new file mode 100644 index 0000000..94629a7 --- /dev/null +++ b/nixos/hosts/olympus/vault-1/configuration.nix @@ -0,0 +1,45 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, hosts, ... }: +let + port = 8200; + clusterPort = 8201; +in { + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "21.05"; # Did you read the comment? + + # Additional packages + environment.systemPackages = with pkgs; [ ]; + + # Vault + networking.firewall.allowedTCPPorts = [ port clusterPort ]; + + services.vault = { + enable = false; + # bin version includes the UI + package = pkgs.vault-bin; + address = "0.0.0.0:${toString port}"; + storageBackend = "raft"; + storagePath = "/var/lib/vault-raft"; + storageConfig = '' + node_id = "olympus-2" + + retry_join { + leader_api_addr = "http://10.42.42.6:${toString port}" + } + ''; + extraConfig = '' + ui = true + disable_mlock = true + api_addr = "http://10.42.42.30:${toString port}" + cluster_addr = "http://10.42.42.30:${toString clusterPort}" + ''; + }; +} diff --git a/nixos/hosts/thalassa/null/home/default.nix b/nixos/hosts/thalassa/null/home/default.nix index a0397c0..9c97d49 100644 --- a/nixos/hosts/thalassa/null/home/default.nix +++ b/nixos/hosts/thalassa/null/home/default.nix @@ -2,7 +2,12 @@ let tex = (pkgs.texlive.combine { inherit (pkgs.texlive) scheme-full; - dnd-5e-latex-template = { pkgs = [ pkgs.v.dnd-5e-latex-template ]; }; + dnd-5e-latex-template = { + pkgs = [ + pkgs.v.dnd-5e-latex-template + pkgs.v.dnd-5e-latex-character-sheet-template + ]; + }; }); in { programs.home-manager.enable = true; diff --git a/nixos/pkgs/default.nix b/nixos/pkgs/default.nix index acc9d28..fc3a172 100644 --- a/nixos/pkgs/default.nix +++ b/nixos/pkgs/default.nix @@ -14,6 +14,7 @@ final: prev: { }; dnd-5e-latex-template = prev.callPackage ./dnd-5e-latex-template { }; + dnd-5e-latex-character-sheet-template = prev.callPackage ./dnd-5e-latex-character-sheet-template { }; gitea-agatheme = prev.callPackage ./gitea-agatheme { }; }; diff --git a/nixos/pkgs/dnd-5e-latex-character-sheet-template/default.nix b/nixos/pkgs/dnd-5e-latex-character-sheet-template/default.nix new file mode 100644 index 0000000..6b82487 --- /dev/null +++ b/nixos/pkgs/dnd-5e-latex-character-sheet-template/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: stdenvNoCC.mkDerivation rec { + pname = "dnd-5e-latex-character-sheet-template"; + version = "0.1.0"; + tlType = "run"; + + src = fetchFromGitHub { + owner = "matsavage"; + repo = "DND-5e-LaTeX-Character-Sheet-Template"; + rev = "d9ab382c7c9da4680a99355cb99510a318f159e3"; + sha256 = lib.fakeSha256; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + runHook preInstall + + path="$out/tex/latex/${pname}" + mkdir -p "$path" + cp -r $src/* $path + + runHook postInstall + ''; + + meta = { + description = "DnD 5e latex character template"; + }; +}