mirror of
https://github.com/kmein/niveum
synced 2026-03-16 10:11:08 +01:00
feat: use more tmpfiles.d
This commit is contained in:
@@ -3,7 +3,9 @@
|
|||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: {
|
}: let
|
||||||
|
inherit (import <niveum/lib>) tmpfilesConfig;
|
||||||
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
<niveum/modules/dropbox.nix>
|
<niveum/modules/dropbox.nix>
|
||||||
];
|
];
|
||||||
@@ -12,11 +14,32 @@
|
|||||||
dropbox.enable = false;
|
dropbox.enable = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
system.activationScripts.home-symlinks = ''
|
systemd.tmpfiles.rules = map tmpfilesConfig [
|
||||||
ln -sfn ${config.users.users.me.home}/cloud/syncthing/common/mahlzeit ${config.users.users.me.home}/mahlzeit
|
{
|
||||||
ln -sfn ${config.users.users.me.home}/cloud/Seafile/Wiki ${config.users.users.me.home}/notes
|
type = "L+";
|
||||||
ln -sfn ${config.users.users.me.home}/cloud/Seafile/Uni ${config.users.users.me.home}/uni
|
user = config.users.users.me.name;
|
||||||
'';
|
group = "users";
|
||||||
|
mode = "0755";
|
||||||
|
argument = "${config.users.users.me.home}/cloud/Seafile/Wiki";
|
||||||
|
path = "${config.users.users.me.home}/notes";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
type = "L+";
|
||||||
|
user = config.users.users.me.name;
|
||||||
|
group = "users";
|
||||||
|
mode = "0755";
|
||||||
|
argument = "${config.users.users.me.home}/cloud/Seafile/Uni";
|
||||||
|
path = "${config.users.users.me.home}/uni";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
type = "L+";
|
||||||
|
user = config.users.users.me.name;
|
||||||
|
group = "users";
|
||||||
|
mode = "0755";
|
||||||
|
argument = "${config.users.users.me.home}/cloud/syncthing/common/mahlzeit";
|
||||||
|
path = "${config.users.users.me.home}/mahlzeit";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
services.gnome-keyring.enable = true;
|
services.gnome-keyring.enable = true;
|
||||||
|
|||||||
@@ -7,9 +7,8 @@
|
|||||||
stateLocation = "/var/lib/codimd/state.sqlite";
|
stateLocation = "/var/lib/codimd/state.sqlite";
|
||||||
nixpkgs-unstable = import <nixpkgs-unstable> {};
|
nixpkgs-unstable = import <nixpkgs-unstable> {};
|
||||||
domain = "pad.kmein.de";
|
domain = "pad.kmein.de";
|
||||||
|
inherit (import <niveum/lib>) tmpfilesConfig;
|
||||||
in {
|
in {
|
||||||
imports = [<stockholm/krebs/3modules/permown.nix>];
|
|
||||||
|
|
||||||
services.nginx.virtualHosts.${domain} = {
|
services.nginx.virtualHosts.${domain} = {
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
@@ -49,11 +48,15 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
krebs.permown.${backupLocation} = {
|
systemd.tmpfiles.rules = [
|
||||||
owner = "codimd";
|
(tmpfilesConfig {
|
||||||
group = "codimd";
|
user = "codimd";
|
||||||
umask = "0002";
|
group = "codimd";
|
||||||
};
|
mode = "0755";
|
||||||
|
type = "d";
|
||||||
|
path = backupLocation;
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
systemd.services.hedgedoc-backup = {
|
systemd.services.hedgedoc-backup = {
|
||||||
description = "Hedgedoc backup service";
|
description = "Hedgedoc backup service";
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
firewall = (import <niveum/lib>).firewall lib;
|
firewall = (import <niveum/lib>).firewall lib;
|
||||||
|
inherit (import <niveum/lib>) tmpfilesConfig;
|
||||||
|
|
||||||
streams = import <niveum/lib/streams.nix> {
|
streams = import <niveum/lib/streams.nix> {
|
||||||
di-fm-key = lib.strings.fileContents <secrets/di.fm/key>;
|
di-fm-key = lib.strings.fileContents <secrets/di.fm/key>;
|
||||||
@@ -71,22 +72,31 @@ in {
|
|||||||
extraStopCommands = firewall.removeRules rules;
|
extraStopCommands = firewall.removeRules rules;
|
||||||
};
|
};
|
||||||
|
|
||||||
system.activationScripts.mpd-playlists = let
|
systemd.tmpfiles.rules = let
|
||||||
makePlaylist = name: streams: pkgs.writeText "name.m3u" (lib.concatMapStringsSep "\n" (lib.getAttr "stream") streams);
|
|
||||||
tags = lib.lists.unique (lib.concatMap ({tags ? [], ...}: tags) streams);
|
tags = lib.lists.unique (lib.concatMap ({tags ? [], ...}: tags) streams);
|
||||||
in ''
|
tagStreams = tag: map (lib.getAttr "stream") (lib.filter ({tags ? [], ...}: lib.elem tag tags) streams);
|
||||||
rm -rf /var/lib/mpd/playlists
|
makePlaylist = name: urls: pkgs.writeText "${name}.m3u" (lib.concatStringsSep "\n" urls);
|
||||||
install -d /var/lib/mpd/playlists
|
in
|
||||||
ln -sfn "${toString (makePlaylist "all" streams)}" "/var/lib/mpd/playlists/all.m3u"
|
map (tag:
|
||||||
${lib.concatMapStringsSep "\n" (
|
tmpfilesConfig {
|
||||||
tag: let
|
type = "L+";
|
||||||
playlistStreams = lib.filter ({tags ? [], ...}: lib.elem tag tags) streams;
|
path = "/var/lib/mpd/playlists/${tag}.m3u";
|
||||||
in ''
|
mode = "0644";
|
||||||
ln -sfn "${toString (makePlaylist tag playlistStreams)}" "/var/lib/mpd/playlists/${tag}.m3u"
|
user = "mpd";
|
||||||
''
|
group = "mpd";
|
||||||
)
|
argument = makePlaylist tag (tagStreams tag);
|
||||||
tags}
|
})
|
||||||
'';
|
tags
|
||||||
|
+ [
|
||||||
|
(tmpfilesConfig {
|
||||||
|
type = "L+";
|
||||||
|
mode = "0644";
|
||||||
|
user = "mpd";
|
||||||
|
group = "mpd";
|
||||||
|
path = "/var/lib/mpd/playlist/all.m3u";
|
||||||
|
argument = makePlaylist "all" streams;
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
services.tuna = {
|
services.tuna = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user