diff --git a/nixos/configs/pepe/configuration.nix b/nixos/configs/pepe/configuration.nix index 9389592..20b9f41 100644 --- a/nixos/configs/pepe/configuration.nix +++ b/nixos/configs/pepe/configuration.nix @@ -14,11 +14,13 @@ ./dms.nix ./borg.nix ./mpd.nix + ./grocy.nix ]; sops.defaultSopsFile = ../../secrets/pepe.yaml; + networking.hostName = "pepe"; # fonts diff --git a/nixos/configs/pepe/grocy.nix b/nixos/configs/pepe/grocy.nix new file mode 100644 index 0000000..5c828fb --- /dev/null +++ b/nixos/configs/pepe/grocy.nix @@ -0,0 +1,16 @@ +{ config, lib, pkgs, ... }: + +{ + services.grocy = { + enable = true; + settings = { + culture = "de"; + currency = "EUR"; + }; + hostName = "grocy.pepe.private"; + nginx.enableSSL = false; + }; + + backup.dirs = [ config.services.grocy.dataDir ]; + +} diff --git a/nixos/configs/pepe/tinc.nix b/nixos/configs/pepe/tinc.nix index 6f8c828..9d8c56c 100644 --- a/nixos/configs/pepe/tinc.nix +++ b/nixos/configs/pepe/tinc.nix @@ -15,4 +15,7 @@ with lib; }; }; + sops.secrets.tinc_retiolum_ed25519_key = { }; + sops.secrets.tinc_retiolum_rsa_key = { }; + } diff --git a/nixos/configs/sputnik/configuration.nix b/nixos/configs/sputnik/configuration.nix index c5797f0..fcd3f44 100644 --- a/nixos/configs/sputnik/configuration.nix +++ b/nixos/configs/sputnik/configuration.nix @@ -10,6 +10,7 @@ ./codimd.nix ./bitwarden.nix #./syncplay.nix + ./grocy.nix ]; diff --git a/nixos/configs/sputnik/grocy.nix b/nixos/configs/sputnik/grocy.nix new file mode 100644 index 0000000..614a8b9 --- /dev/null +++ b/nixos/configs/sputnik/grocy.nix @@ -0,0 +1,16 @@ +{ config, lib, pkgs, ... }: + +{ + services.grocy = { + enable = true; + settings = { + culture = "de"; + currency = "EUR"; + }; + hostName = "grocy.ingolf-wagner.de"; + nginx.enableSSL = true; + }; + + backup.dirs = [ config.services.grocy.dataDir ]; + +} diff --git a/nixos/configs/sputnik/nginx.nix b/nixos/configs/sputnik/nginx.nix index 8d95696..e677fb6 100644 --- a/nixos/configs/sputnik/nginx.nix +++ b/nixos/configs/sputnik/nginx.nix @@ -63,6 +63,7 @@ in { }; }; + "git.ingolf-wagner.de" = { listen = [ { @@ -116,6 +117,21 @@ in { } // error.locations; }; + "grocy.ingolf-wagner.de" = { + listen = [ + { + addr = "0.0.0.0"; + port = 4443; + ssl = true; + } + { + addr = "0.0.0.0"; + port = 80; + ssl = false; + } + ]; + }; + "paste.ingolf-wagner.de" = { listen = [ {