diff --git a/apps/jellyfin-mpv-shim/conf.json.template b/apps/jellyfin-mpv-shim/conf.json.template deleted file mode 100644 index 97812b6..0000000 --- a/apps/jellyfin-mpv-shim/conf.json.template +++ /dev/null @@ -1,117 +0,0 @@ -{ - "allow_transcode_to_h265": false, - "always_transcode": false, - "audio_output": "hdmi", - "auto_play": true, - "check_updates": false, - "client_uuid": "d7364f8e-c8bc-4442-982c-81848f474d48", - "connect_retry_mins": 0, - "direct_paths": false, - "discord_presence": true, - "display_mirroring": false, - "enable_gui": true, - "enable_osc": true, - "force_audio_codec": null, - "force_set_played": false, - "force_video_codec": null, - "fullscreen": true, - "health_check_interval": 300, - "idle_cmd": null, - "idle_cmd_delay": 60, - "idle_ended_cmd": null, - "idle_when_paused": false, - "ignore_ssl_cert": false, - "kb_debug": "~", - "kb_fullscreen": "f", - "kb_kill_shader": "k", - "kb_menu": "c", - "kb_menu_down": "down", - "kb_menu_esc": "esc", - "kb_menu_left": "left", - "kb_menu_ok": "enter", - "kb_menu_right": "right", - "kb_menu_up": "up", - "kb_next": ">", - "kb_pause": "space", - "kb_prev": "<", - "kb_stop": "q", - "kb_unwatched": "u", - "kb_watched": "w", - "lang": null, - "lang_filter": "und,eng,jpn,mis,mul,zxx", - "lang_filter_audio": false, - "lang_filter_sub": false, - "local_kbps": 2147483, - "log_decisions": false, - "media_ended_cmd": null, - "media_key_seek": true, - "media_keys": true, - "menu_mouse": true, - "mpv_ext": false, - "mpv_ext_ipc": null, - "mpv_ext_no_ovr": false, - "mpv_ext_path": null, - "mpv_ext_start": true, - "mpv_log_level": "info", - "notify_updates": false, - "play_cmd": null, - "playback_timeout": 30, - "player_name": "hakase", - "pre_media_cmd": null, - "prefer_transcode_to_h265": false, - "raise_mpv": true, - "remote_direct_paths": false, - "remote_kbps": 10000, - "sanitize_output": true, - "screenshot_dir": null, - "screenshot_menu": true, - "seek_down": -60, - "seek_h_exact": false, - "seek_left": -5, - "seek_right": 5, - "seek_up": 60, - "seek_v_exact": false, - "shader_pack_custom": false, - "shader_pack_enable": true, - "shader_pack_profile": null, - "shader_pack_remember": true, - "shader_pack_subtype": "lq", - "skip_credits_always": false, - "skip_credits_enable": true, - "skip_intro_always": false, - "skip_intro_enable": true, - "stop_cmd": null, - "stop_idle": false, - "subtitle_color": "#FFFFFFFF", - "subtitle_position": "bottom", - "subtitle_size": 100, - "svp_enable": false, - "svp_socket": null, - "svp_url": "http://127.0.0.1:9901/", - "sync_attempts": 5, - "sync_max_delay_skip": 300, - "sync_max_delay_speed": 50, - "sync_method_thresh": 2000, - "sync_osd_message": true, - "sync_revert_seek": true, - "sync_speed_attempts": 3, - "sync_speed_time": 1000, - "thumbnail_enable": true, - "thumbnail_osc_builtin": true, - "thumbnail_preferred_size": 320, - "tls_client_cert": null, - "tls_client_key": null, - "tls_server_ca": null, - "transcode_4k": false, - "transcode_av1": false, - "transcode_dolby_vision": true, - "transcode_hdr": false, - "transcode_hevc": false, - "transcode_hi10p": false, - "transcode_warning": true, - "use_web_seek": false, - "write_logs": false, - "use_mpv_config": true, - "menu_style": "osc", - "osc_color": "{{colors.primary.default.hex}}" -} diff --git a/apps/jellyfin-mpv-shim/default.nix b/apps/jellyfin-mpv-shim/default.nix index ac73203..c65c7be 100644 --- a/apps/jellyfin-mpv-shim/default.nix +++ b/apps/jellyfin-mpv-shim/default.nix @@ -1,7 +1,37 @@ {pkgs, ...}: { - home.packages = with pkgs; [ - jellyfin-mpv-shim - ]; + services.jellyfin-mpv-shim = { + enable = true; + package = pkgs.jellyfin-mpv-shim; + settings = { + audio_output = "hdmi"; + auto_play = true; + check_updates = false; + discord_presence = true; + enable_gui = true; + enable_osc = true; + fullscreen = true; + menu_mouse = true; + player_name = "hakase"; + raise_mpv = true; + shader_pack_enable = true; + shader_pack_remember = true; + shader_pack_subtype = "lq"; + skip_credits_enable = true; + skip_intro_enable = true; + thumbnail_enable = true; + thumbnail_osc_builtin = true; + use_mpv_config = true; + menu_style = "osc"; + # Good UI/Quality defaults + remote_kbps = 100000; + local_kbps = 1000000; + lang_filter = "und,eng,jpn,mis,mul,zxx"; + subtitle_size = 100; + subtitle_color = "#FFFFFFFF"; + seek_left = -5; + seek_right = 5; + }; + }; wayland.windowManager.hyprland.settings.windowrulev2 = [ # --- JELLYFIN MPV SHIM --- @@ -12,8 +42,4 @@ "idleinhibit focus, class:^(jellyfin-mpv-shim)$" "noblur, class:^(jellyfin-mpv-shim)$" ]; - - wayland.windowManager.hyprland.settings.exec-once = [ - "uwsm app -- jellyfin-mpv-shim" - ]; } diff --git a/apps/matugen/config.toml b/apps/matugen/config.toml index 2d12a2e..7897ddb 100644 --- a/apps/matugen/config.toml +++ b/apps/matugen/config.toml @@ -51,10 +51,6 @@ input_path = "~/.config/matugen/templates/mako" output_path = "~/.config/mako/config" post_hook = "makoctl reload" -[templates.jellyfin-mpv-shim] -input_path = "~/.config/matugen/templates/jellyfin-mpv-shim" -output_path = "~/.config/jellyfin-mpv-shim/conf.json" - [templates.vicinae] input_path = "~/.config/matugen/templates/vicinae" output_path = "~/.local/share/vicinae/themes/matugen.toml" diff --git a/apps/matugen/default.nix b/apps/matugen/default.nix index 320e0ef..ee46fb5 100644 --- a/apps/matugen/default.nix +++ b/apps/matugen/default.nix @@ -22,7 +22,6 @@ home.file.".config/matugen/templates/hyprlock".source = ./templates/hyprlock; home.file.".config/matugen/templates/starship".source = ./templates/starship; home.file.".config/matugen/templates/waybar".source = ./templates/waybar; - home.file.".config/matugen/templates/jellyfin-mpv-shim".source = ../jellyfin-mpv-shim/conf.json.template; home.file.".config/matugen/templates/vicinae".text = '' # Vicinae Matugen Theme Template diff --git a/mpv-shot0001.jpg b/mpv-shot0001.jpg new file mode 100644 index 0000000..49d57b2 Binary files /dev/null and b/mpv-shot0001.jpg differ