mirror of
https://github.com/kmein/niveum
synced 2026-03-20 12:01:06 +01:00
feat(zaatar): fix kiosk, spotifyd, containers warning
This commit is contained in:
@@ -1,29 +1,10 @@
|
|||||||
{
|
{pkgs, ...}: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
inherit (import ../../lib) tmpfilesConfig;
|
|
||||||
in {
|
|
||||||
services.postgresql = {
|
|
||||||
dataDir = "/var/state/postgresql/${config.services.postgresql.package.psqlSchema}";
|
|
||||||
package = pkgs.postgresql_11;
|
|
||||||
};
|
|
||||||
|
|
||||||
services.postgresqlBackup = {
|
services.postgresqlBackup = {
|
||||||
enable = true;
|
enable = true;
|
||||||
databases = ["atuin"];
|
databases = ["atuin"];
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [
|
services.postgresql.package = pkgs.postgresql_14;
|
||||||
(tmpfilesConfig {
|
|
||||||
type = "d";
|
|
||||||
path = "/var/state/postgresql";
|
|
||||||
mode = "0700";
|
|
||||||
user = "postgres";
|
|
||||||
group = "postgres";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
services.atuin = {
|
services.atuin = {
|
||||||
host = "0.0.0.0";
|
host = "0.0.0.0";
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ in {
|
|||||||
./atuin.nix
|
./atuin.nix
|
||||||
./backup.nix
|
./backup.nix
|
||||||
./gaslight.nix
|
./gaslight.nix
|
||||||
|
./kiosk.nix
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
./moodle-dl-meinhark.nix
|
./moodle-dl-meinhark.nix
|
||||||
./pulseaudio.nix
|
./pulseaudio.nix
|
||||||
@@ -89,5 +90,5 @@ in {
|
|||||||
retiolum = retiolumAddresses.zaatar;
|
retiolum = retiolumAddresses.zaatar;
|
||||||
};
|
};
|
||||||
|
|
||||||
system.stateVersion = "20.09";
|
system.stateVersion = "22.05";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +1,10 @@
|
|||||||
{
|
{config, ...}: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
services.spotifyd = {
|
services.spotifyd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
global = {
|
global = {
|
||||||
username_cmd = "cat ${config.age.secrets.spotify-username.path}";
|
username_cmd = "cat $CREDENTIALS_DIRECTORY/username";
|
||||||
password_cmd = "cat ${config.age.secrets.spotify-password.path}";
|
password_cmd = "cat $CREDENTIALS_DIRECTORY/password";
|
||||||
backend = "pulseaudio";
|
backend = "pulseaudio";
|
||||||
bitrate = 320;
|
bitrate = 320;
|
||||||
device_type = "s_t_b"; # set-top box
|
device_type = "s_t_b"; # set-top box
|
||||||
@@ -18,6 +13,13 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
systemd.services.spotifyd = {
|
||||||
|
serviceConfig.LoadCredential = [
|
||||||
|
"username:${config.age.secrets.spotify-username.path}"
|
||||||
|
"password:${config.age.secrets.spotify-password.path}"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
age.secrets = {
|
age.secrets = {
|
||||||
spotify-username.file = ../../secrets/spotify-username.age;
|
spotify-username.file = ../../secrets/spotify-username.age;
|
||||||
spotify-password.file = ../../secrets/spotify-password.age;
|
spotify-password.file = ../../secrets/spotify-password.age;
|
||||||
@@ -28,6 +30,4 @@
|
|||||||
unload-module module-native-protocol-unix
|
unload-module module-native-protocol-unix
|
||||||
load-module module-native-protocol-unix auth-anonymous=1
|
load-module module-native-protocol-unix auth-anonymous=1
|
||||||
'';
|
'';
|
||||||
|
|
||||||
systemd.services.spotifyd.serviceConfig.Restart = "always";
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user