From cc2dec177259e2bd0d8a09bad79b611b4ac912f2 Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 6 Jun 2023 09:19:47 +0200 Subject: [PATCH] small updates to fix attic --- nixos/common/hm-modules/nvim.nix | 1 + nixos/hosts/hades/attic/configuration.nix | 19 ++++++++++++++++--- nixos/hosts/hades/nginx/configuration.nix | 1 + 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/nixos/common/hm-modules/nvim.nix b/nixos/common/hm-modules/nvim.nix index 4818d83..46c5fbf 100644 --- a/nixos/common/hm-modules/nvim.nix +++ b/nixos/common/hm-modules/nvim.nix @@ -70,6 +70,7 @@ in { servers.pyright.enable = true; servers.elixirls.enable = true; servers.clangd.enable = true; + servers.yamlls.enable = true; }; trouble.enable = true; lspkind.enable = true; diff --git a/nixos/hosts/hades/attic/configuration.nix b/nixos/hosts/hades/attic/configuration.nix index c13b430..7b088d3 100644 --- a/nixos/hosts/hades/attic/configuration.nix +++ b/nixos/hosts/hades/attic/configuration.nix @@ -18,10 +18,21 @@ in { # Additional packages environment.systemPackages = with pkgs; [ ]; - vault-secrets.secrets.attic = { - services = [ "atticd" ]; - }; + vault-secrets.secrets.attic = { services = [ "atticd" ]; }; + services.postgresql = { + enable = true; + package = pkgs.postgresql_15; + ensureDatabases = [ "atticd" ]; + ensureUsers = [{ + name = "atticd"; + ensurePermissions = { + "DATABASE atticd" = "ALL PRIVILEGES"; + "schema public" = "ALL"; + }; + }]; + + }; services.atticd = { enable = true; @@ -44,6 +55,8 @@ in { level = 8; }; + database.url = "postgresql://atticd?host=/run/postgresql"; + storage = { type = "s3"; region = "hades"; diff --git a/nixos/hosts/hades/nginx/configuration.nix b/nixos/hosts/hades/nginx/configuration.nix index 5b38cac..343dd1d 100644 --- a/nixos/hosts/hades/nginx/configuration.nix +++ b/nixos/hosts/hades/nginx/configuration.nix @@ -59,6 +59,7 @@ in { virtualHosts."git.xirion.net" = proxy "http://10.10.10.12"; virtualHosts."mail.xirion.net" = proxy "http://192.168.0.118"; virtualHosts."o.xirion.net" = proxy "http://192.168.0.112:9000"; + virtualHosts."g.xirion.net" = proxy "http://garage.hades:3900"; virtualHosts."requests.xirion.net" = proxy "http://overseerr.hades:5055"; virtualHosts."pass.xirion.net" = proxy "http://bitwarden_rs"; virtualHosts."repo.xirion.net" = proxy "http://archlinux";