Compare commits

..

No commits in common. "a6c78e07e55e512f273db03477772cf251131326" and "9df4b8c8a0b21c8b99316a0d55786259b7ef49bd" have entirely different histories.

6 changed files with 14 additions and 45 deletions

View file

@ -234,8 +234,8 @@ in
"IdentityFile=/var/run/secrets/ssh/private" "IdentityFile=/var/run/secrets/ssh/private"
]; ];
fileModeAndDirMode = [ fileModeAndDirMode = [
"file_mode=0664" "file_mode=0644"
"dir_mode=0775" "dir_mode=0755"
]; ];
userIdForUser0 = [ userIdForUser0 = [
"uid=1000" "uid=1000"

View file

@ -21,7 +21,7 @@
directories_sort: SortFormat(group_by_type: true, reverse: false), directories_sort: SortFormat(group_by_type: true, reverse: false),
album_art: ( album_art: (
method: Auto, method: Auto,
max_size_px: (width: 480, height: 480), max_size_px: (width: 1200, height: 1200),
disabled_protocols: ["http://", "https://"], disabled_protocols: ["http://", "https://"],
vertical_align: Center, vertical_align: Center,
horizontal_align: Center, horizontal_align: Center,
@ -34,11 +34,13 @@
".": VolumeUp, ".": VolumeUp,
"<Tab>": NextTab, "<Tab>": NextTab,
"<S-Tab>": PreviousTab, "<S-Tab>": PreviousTab,
"1": SwitchToTab("Home"), "1": SwitchToTab("Queue"),
"2": SwitchToTab("Collection"), "2": SwitchToTab("Directories"),
"3": SwitchToTab("Artists"), "3": SwitchToTab("Artists"),
"4": SwitchToTab("Playlists"), "4": SwitchToTab("Album Artists"),
"5": SwitchToTab("Search"), "5": SwitchToTab("Albums"),
"6": SwitchToTab("Playlists"),
"7": SwitchToTab("Search"),
"q": Quit, "q": Quit,
">": NextTrack, ">": NextTrack,
"p": TogglePause, "p": TogglePause,
@ -136,11 +138,6 @@
(size: "100%", borders: "ALL", pane: Pane(Directories)), (size: "100%", borders: "ALL", pane: Pane(Directories)),
]) ])
), ),
(name: "Artists", pane: Split(direction: Horizontal, panes: [
(size: "100%", borders: "ALL", pane: Pane(AlbumArtists)),
])
),
(name: "Playlists", pane: Split(direction: Horizontal, panes: [ (name: "Playlists", pane: Split(direction: Horizontal, panes: [
(size: "100%", borders: "ALL", pane: Pane(Playlists)), (size: "100%", borders: "ALL", pane: Pane(Playlists)),
]) ])
@ -152,7 +149,7 @@
], ],
cava: ( cava: (
framerate: 200, autosens: true, sensitivity: 100, framerate: 200, autosens: true, sensitivity: 100,
lower_cutoff_freq: 20, higher_cutoff_freq: 20000, lower_cutoff_freq: 50, higher_cutoff_freq: 15000,
input: ( input: (
method: Fifo, method: Fifo,
source: "/tmp/mpd.fifo", source: "/tmp/mpd.fifo",

View file

@ -75,7 +75,6 @@ in
zathura zathura
zed zed
test test
audioMetadata
; ;
}; };
}; };

View file

@ -12,7 +12,6 @@ let
dns0 = instances.web.dns.provider0; dns0 = instances.web.dns.provider0;
host = serviceCfg.domains.url0; host = serviceCfg.domains.url0;
dns0Path = "dns/${dns0}"; dns0Path = "dns/${dns0}";
id = 993;
in in
{ {
microvm.vms = { microvm.vms = {
@ -38,16 +37,6 @@ in
}; };
}; };
users.users.jellyfin = {
isSystemUser = true;
group = serviceCfg.name;
uid = id;
};
users.groups.jellyfin = {
gid = id;
};
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [
22 22
serviceCfg.ports.port0 serviceCfg.ports.port0
@ -59,7 +48,7 @@ in
device = "tmpfs"; device = "tmpfs";
fsType = "tmpfs"; fsType = "tmpfs";
options = [ options = [
"size=6G" "size=4G"
"mode=1777" "mode=1777"
]; ];
}; };
@ -177,21 +166,8 @@ in
}; };
}; };
}; };
users = {
groups.jellyfin = {
gid = id;
members = [ user0 ];
};
users = { users.users.caddy.extraGroups = [ "acme" ];
jellyfin = {
isSystemUser = true;
group = serviceCfg.name;
uid = id;
};
caddy.extraGroups = [ "acme" ];
};
};
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"d ${serviceCfg.mntPaths.path0} 0755 microvm wheel - -" "d ${serviceCfg.mntPaths.path0} 0755 microvm wheel - -"

View file

@ -6,7 +6,6 @@ let
inherit (flake.config.services) instances; inherit (flake.config.services) instances;
inherit (flake.config.people) user0; inherit (flake.config.people) user0;
service = instances.samba; service = instances.samba;
jellyfin = instances.jellyfin;
in in
{ {
# If you ever need to start fresh, you need to add yourself to the Samba users database: # If you ever need to start fresh, you need to add yourself to the Samba users database:
@ -24,8 +23,8 @@ in
"guest ok" = "no"; "guest ok" = "no";
"create mask" = "0664"; "create mask" = "0664";
"directory mask" = "0775"; "directory mask" = "0775";
"force user" = jellyfin.name; "force user" = user0;
"force group" = jellyfin.name; "force group" = "users";
"force create mode" = "0664"; "force create mode" = "0664";
"force directory mode" = "0775"; "force directory mode" = "0775";
}; };

View file

@ -1,2 +0,0 @@
cabal:
cabal clean ; cabal run