diff --git a/modules/config/default.nix b/modules/config/default.nix index a266aad..84398dc 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=0664" - "dir_mode=0775" + "file_mode=0644" + "dir_mode=0755" ]; userIdForUser0 = [ "uid=1000" diff --git a/modules/home/cli/fun/rmpc/config/config.ron b/modules/home/cli/fun/rmpc/config/config.ron index 22a51b4..0289e3b 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: 480, height: 480), + max_size_px: (width: 1200, height: 1200), disabled_protocols: ["http://", "https://"], vertical_align: Center, horizontal_align: Center, @@ -34,11 +34,13 @@ ".": VolumeUp, "": NextTab, "": PreviousTab, - "1": SwitchToTab("Home"), - "2": SwitchToTab("Collection"), + "1": SwitchToTab("Queue"), + "2": SwitchToTab("Directories"), "3": SwitchToTab("Artists"), - "4": SwitchToTab("Playlists"), - "5": SwitchToTab("Search"), + "4": SwitchToTab("Album Artists"), + "5": SwitchToTab("Albums"), + "6": SwitchToTab("Playlists"), + "7": SwitchToTab("Search"), "q": Quit, ">": NextTrack, "p": TogglePause, @@ -136,11 +138,6 @@ (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)), ]) @@ -152,7 +149,7 @@ ], cava: ( framerate: 200, autosens: true, sensitivity: 100, - lower_cutoff_freq: 20, higher_cutoff_freq: 20000, + lower_cutoff_freq: 50, higher_cutoff_freq: 15000, input: ( method: Fifo, source: "/tmp/mpd.fifo", diff --git a/modules/home/default.nix b/modules/home/default.nix index 26095ba..b42f50e 100755 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -75,7 +75,6 @@ in zathura zed test - audioMetadata ; }; }; diff --git a/modules/nixos/guests/jellyfin/default.nix b/modules/nixos/guests/jellyfin/default.nix index 3f309a2..782d37d 100755 --- a/modules/nixos/guests/jellyfin/default.nix +++ b/modules/nixos/guests/jellyfin/default.nix @@ -12,7 +12,6 @@ let dns0 = instances.web.dns.provider0; host = serviceCfg.domains.url0; dns0Path = "dns/${dns0}"; - id = 993; in { 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 = [ 22 serviceCfg.ports.port0 @@ -59,7 +48,7 @@ in device = "tmpfs"; fsType = "tmpfs"; options = [ - "size=6G" + "size=4G" "mode=1777" ]; }; @@ -177,21 +166,8 @@ in }; }; }; - users = { - groups.jellyfin = { - gid = id; - members = [ user0 ]; - }; - users = { - jellyfin = { - isSystemUser = true; - group = serviceCfg.name; - uid = id; - }; - caddy.extraGroups = [ "acme" ]; - }; - }; + users.users.caddy.extraGroups = [ "acme" ]; systemd.tmpfiles.rules = [ "d ${serviceCfg.mntPaths.path0} 0755 microvm wheel - -" diff --git a/modules/nixos/services/samba/sambaCeres/default.nix b/modules/nixos/services/samba/sambaCeres/default.nix index c1af1a6..1364334 100755 --- a/modules/nixos/services/samba/sambaCeres/default.nix +++ b/modules/nixos/services/samba/sambaCeres/default.nix @@ -6,7 +6,6 @@ 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: @@ -24,8 +23,8 @@ in "guest ok" = "no"; "create mask" = "0664"; "directory mask" = "0775"; - "force user" = jellyfin.name; - "force group" = jellyfin.name; + "force user" = user0; + "force group" = "users"; "force create mode" = "0664"; "force directory mode" = "0775"; }; diff --git a/packages/zookeeper/justfile b/packages/zookeeper/justfile deleted file mode 100755 index ee85f43..0000000 --- a/packages/zookeeper/justfile +++ /dev/null @@ -1,2 +0,0 @@ -cabal: - cabal clean ; cabal run