From d788440daa1ba026a86b4c1dd73e8c606d5917f9 Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 29 Nov 2025 05:00:50 -0600 Subject: [PATCH 1/5] chore: added missing justfile --- packages/zookeeper/justfile | 2 ++ 1 file changed, 2 insertions(+) create mode 100755 packages/zookeeper/justfile diff --git a/packages/zookeeper/justfile b/packages/zookeeper/justfile new file mode 100755 index 0000000..ee85f43 --- /dev/null +++ b/packages/zookeeper/justfile @@ -0,0 +1,2 @@ +cabal: + cabal clean ; cabal run From ecbbebfd9006f5bfb54b571ad56d829beb8b4d3e Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 29 Nov 2025 05:01:10 -0600 Subject: [PATCH 2/5] fix: samba perms unfucked --- modules/config/default.nix | 4 +-- modules/nixos/guests/jellyfin/default.nix | 28 +++++++++++++++++-- .../services/samba/sambaCeres/default.nix | 5 ++-- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/modules/config/default.nix b/modules/config/default.nix index 84398dc..a266aad 100755 --- a/modules/config/default.nix +++ b/modules/config/default.nix @@ -234,8 +234,8 @@ in "IdentityFile=/var/run/secrets/ssh/private" ]; fileModeAndDirMode = [ - "file_mode=0644" - "dir_mode=0755" + "file_mode=0664" + "dir_mode=0775" ]; userIdForUser0 = [ "uid=1000" diff --git a/modules/nixos/guests/jellyfin/default.nix b/modules/nixos/guests/jellyfin/default.nix index 782d37d..0a4320f 100755 --- a/modules/nixos/guests/jellyfin/default.nix +++ b/modules/nixos/guests/jellyfin/default.nix @@ -37,6 +37,16 @@ in }; }; + users.users.jellyfin = { + isSystemUser = true; + group = serviceCfg.name; + uid = 993; + }; + + users.groups.jellyfin = { + gid = 993; + }; + networking.firewall.allowedTCPPorts = [ 22 serviceCfg.ports.port0 @@ -48,7 +58,7 @@ in device = "tmpfs"; fsType = "tmpfs"; options = [ - "size=4G" + "size=6G" "mode=1777" ]; }; @@ -166,13 +176,27 @@ in }; }; }; + users = { + groups.jellyfin = { + gid = 993; + members = [ user0 ]; + }; - users.users.caddy.extraGroups = [ "acme" ]; + users = { + jellyfin = { + isSystemUser = true; + group = serviceCfg.name; + uid = 993; + }; + caddy.extraGroups = [ "acme" ]; + }; + }; systemd.tmpfiles.rules = [ "d ${serviceCfg.mntPaths.path0} 0755 microvm wheel - -" "d ${serviceCfg.mntPaths.path0}/data 0755 microvm wheel - -" "d ${serviceCfg.mntPaths.path0}/cache 0755 microvm wheel - -" "d ${serviceCfg.mntPaths.path0}/media 0775 microvm wheel - -" + "Z ${serviceCfg.mntPaths.path0}/media 0775 jellyfin jellyfin - -" ]; } diff --git a/modules/nixos/services/samba/sambaCeres/default.nix b/modules/nixos/services/samba/sambaCeres/default.nix index 1364334..c1af1a6 100755 --- a/modules/nixos/services/samba/sambaCeres/default.nix +++ b/modules/nixos/services/samba/sambaCeres/default.nix @@ -6,6 +6,7 @@ let inherit (flake.config.services) instances; inherit (flake.config.people) user0; service = instances.samba; + jellyfin = instances.jellyfin; in { # If you ever need to start fresh, you need to add yourself to the Samba users database: @@ -23,8 +24,8 @@ in "guest ok" = "no"; "create mask" = "0664"; "directory mask" = "0775"; - "force user" = user0; - "force group" = "users"; + "force user" = jellyfin.name; + "force group" = jellyfin.name; "force create mode" = "0664"; "force directory mode" = "0775"; }; From cf581e30ccb532625deccc734c6fef2c73eb8d33 Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 29 Nov 2025 05:01:24 -0600 Subject: [PATCH 3/5] feat: added metadata editors --- modules/home/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home/default.nix b/modules/home/default.nix index b42f50e..26095ba 100755 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -75,6 +75,7 @@ in zathura zed test + audioMetadata ; }; }; From d96797892ee5347ab1f1b861e17cbb612198f1aa Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 29 Nov 2025 05:01:37 -0600 Subject: [PATCH 4/5] feat: new tabs in rmpc --- modules/home/cli/fun/rmpc/config/config.ron | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/modules/home/cli/fun/rmpc/config/config.ron b/modules/home/cli/fun/rmpc/config/config.ron index 0289e3b..22a51b4 100755 --- a/modules/home/cli/fun/rmpc/config/config.ron +++ b/modules/home/cli/fun/rmpc/config/config.ron @@ -21,7 +21,7 @@ directories_sort: SortFormat(group_by_type: true, reverse: false), album_art: ( method: Auto, - max_size_px: (width: 1200, height: 1200), + max_size_px: (width: 480, height: 480), disabled_protocols: ["http://", "https://"], vertical_align: Center, horizontal_align: Center, @@ -34,13 +34,11 @@ ".": VolumeUp, "": NextTab, "": PreviousTab, - "1": SwitchToTab("Queue"), - "2": SwitchToTab("Directories"), + "1": SwitchToTab("Home"), + "2": SwitchToTab("Collection"), "3": SwitchToTab("Artists"), - "4": SwitchToTab("Album Artists"), - "5": SwitchToTab("Albums"), - "6": SwitchToTab("Playlists"), - "7": SwitchToTab("Search"), + "4": SwitchToTab("Playlists"), + "5": SwitchToTab("Search"), "q": Quit, ">": NextTrack, "p": TogglePause, @@ -138,6 +136,11 @@ (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: [ (size: "100%", borders: "ALL", pane: Pane(Playlists)), ]) @@ -149,7 +152,7 @@ ], cava: ( framerate: 200, autosens: true, sensitivity: 100, - lower_cutoff_freq: 50, higher_cutoff_freq: 15000, + lower_cutoff_freq: 20, higher_cutoff_freq: 20000, input: ( method: Fifo, source: "/tmp/mpd.fifo", From a6c78e07e55e512f273db03477772cf251131326 Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 29 Nov 2025 05:42:40 -0600 Subject: [PATCH 5/5] fix: samba perms unfucked --- modules/nixos/guests/jellyfin/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/nixos/guests/jellyfin/default.nix b/modules/nixos/guests/jellyfin/default.nix index 0a4320f..3f309a2 100755 --- a/modules/nixos/guests/jellyfin/default.nix +++ b/modules/nixos/guests/jellyfin/default.nix @@ -12,6 +12,7 @@ let dns0 = instances.web.dns.provider0; host = serviceCfg.domains.url0; dns0Path = "dns/${dns0}"; + id = 993; in { microvm.vms = { @@ -40,11 +41,11 @@ in users.users.jellyfin = { isSystemUser = true; group = serviceCfg.name; - uid = 993; + uid = id; }; users.groups.jellyfin = { - gid = 993; + gid = id; }; networking.firewall.allowedTCPPorts = [ @@ -178,7 +179,7 @@ in }; users = { groups.jellyfin = { - gid = 993; + gid = id; members = [ user0 ]; }; @@ -186,7 +187,7 @@ in jellyfin = { isSystemUser = true; group = serviceCfg.name; - uid = 993; + uid = id; }; caddy.extraGroups = [ "acme" ]; }; @@ -197,6 +198,5 @@ in "d ${serviceCfg.mntPaths.path0}/data 0755 microvm wheel - -" "d ${serviceCfg.mntPaths.path0}/cache 0755 microvm wheel - -" "d ${serviceCfg.mntPaths.path0}/media 0775 microvm wheel - -" - "Z ${serviceCfg.mntPaths.path0}/media 0775 jellyfin jellyfin - -" ]; }