move to using home-manager configured mpv

home/home.nix

@@ -1,9 +1,10 @@
 { config, lib, pkgs, ... }:
 
 let
-  laptop = builtins.readFile "/etc/hostname" == "syl\n";
+  laptop = builtins.readFile "/etc/hostname" == ''
-in
+    syl
-{
+  '';
+in {
   imports = [
     ./modules/hyprland.nix
     # ags.homeManagerModules.default
@@ -43,15 +44,11 @@ in
       enable = true;
       config = {
         common = {
-        default = [
+          default = [ pkgs.xdg-desktop-portal-kde ];
-          pkgs.xdg-desktop-portal-kde
-        ];
           "org.freedesktop.impl.portal.FileChooser" = [ "kde" ];
         };
         hyprland = {
-        default = [
+          default = [ "hyprland" ];
-          "hyprland"
-        ];
           "org.freedesktop.impl.portal.FileChooser" = [ "kde" ];
         };
       };
@@ -136,9 +133,7 @@ in
   #   '';
   # };
 
-  programs.gpg = {
+  programs.gpg = { enable = true; };
-    enable = true;
-  };
 
   services.gpg-agent = {
     enable = true;
@@ -148,9 +143,7 @@ in
     # '';
   };
 
-  qt = {
+  qt = { enable = true; };
-    enable = true;
-  };
 
   accounts.email = {
     maildirBasePath = "mail";
@@ -214,9 +207,7 @@ in
           create = "maildir";
           remove = "both";
           expunge = "both";
-          extraConfig.account = {
+          extraConfig.account = { AuthMechs = "XOAUTH2"; };
-            AuthMechs = "XOAUTH2";
-          };
         };
         maildir.path = "office";
         signature = {
@@ -239,8 +230,7 @@ in
     userEmail = "chris@cochrun.xyz";
   };
 
-  home.packages = with pkgs; [
+  home.packages = with pkgs; [ ];
-  ];
 
   programs.mu.enable = true;
 
@@ -256,8 +246,57 @@ in
     plugins = [ pkgs.obs-studio-plugins.obs-move-transition ];
   };
 
-  home.file.".config/mpv" = {
+  # home.file.".config/mpv" = {
-    source = ../.config/mpv;
+  #   source = ../.config/mpv;
+  # };
+
+  programs.mpv = {
+    enable = true;
+    scripts = with pkgs.mpvScripts; [
+      thumbfast
+      videoclip
+      mpris
+      quality-menu
+      modernx
+      modernx-zydezu
+      sponsorblock
+    ];
+    config = {
+      osc = "no";
+      vo = "gpu";
+      af = "scaletempo2";
+      input-ipc-server = "/tmp/mpvsocket";
+      hwdec = "auto";
+      rtsp-transport = "udp";
+      speed = 1.95;
+      gpu-context = "wayland";
+
+      ytdl-format =
+        "bestvideo[height<=?720][fps<=?30][vcodec!=?vp9]+bestaudio/best";
+
+    };
+    profiles = {
+      fast.speed = 1.95;
+
+      slow.speed = 1;
+
+      wc = {
+        speed = 1;
+        osd-level = 0;
+        load-scripts = "no";
+        profile = "low-latency";
+        demuxer-lavf-format = "video4linux2";
+        demuxer-lavf-o-set =
+          "input_format=mjpeg,video_size=1920x1080,framerate=60";
+        fps = 60;
+      };
+    };
+    scriptOpts = {
+      videoclip = {
+        video_folder_path = "/home/chris/vids";
+        audio_folder_path = "/home/chris/music";
+      };
+    };
   };
 
   # home.file.".config/ags" = {
@@ -280,28 +319,39 @@ in
       settings = {
         devices = {
           kaladin = {
-            id = (if laptop then "PMB4FRV-2CAPFCQ-UFELVNI-YAQRRHE-MMMXQ4P-RXEXBZV-QEUL6QN-KZEW5AM" else "");
+            id = (if laptop then
+              "PMB4FRV-2CAPFCQ-UFELVNI-YAQRRHE-MMMXQ4P-RXEXBZV-QEUL6QN-KZEW5AM"
+            else
+              "");
           };
           syl = {
-            id = (if laptop then "" else "AJMADOK-TENODAA-VSOEW2A-4RXY2XI-YNHIS7H-H3ZYAO5-3UQ64EE-O2N5BAY");
+            id = (if laptop then
+              ""
+            else
+              "AJMADOK-TENODAA-VSOEW2A-4RXY2XI-YNHIS7H-H3ZYAO5-3UQ64EE-O2N5BAY");
           };
           shadow = {
-            id = "B24VU6Z-URTMEXN-ZYKRWX7-XWSTHXD-XKX67EB-XSKMT4V-KWKGX7Q-W7DB2QV";
+            id =
+              "B24VU6Z-URTMEXN-ZYKRWX7-XWSTHXD-XKX67EB-XSKMT4V-KWKGX7Q-W7DB2QV";
           };
           tablet = {
-            id = "4HEXCNH-MCVBZQX-LQ735TG-P2VTJ7N-CZ5MK4P-ICZAPC7-YCXVEWV-7NILMA5";
+            id =
+              "4HEXCNH-MCVBZQX-LQ735TG-P2VTJ7N-CZ5MK4P-ICZAPC7-YCXVEWV-7NILMA5";
           };
           kohlin = {
-            id = "BSWKBRR-2IJBCHA-UQY7DE7-CV2U2IL-PMFQFCJ-D5ZZJMU-FPYRUPC-MCC32QQ";
+            id =
+              "BSWKBRR-2IJBCHA-UQY7DE7-CV2U2IL-PMFQFCJ-D5ZZJMU-FPYRUPC-MCC32QQ";
           };
           dalinar = {
-            id = "MPRMA33-XHW6SRE-D2EDBCP-TSMRNGI-ZCE2TAN-FE4BMKA-PSKGYJW-CRIEJQL";
+            id =
+              "MPRMA33-XHW6SRE-D2EDBCP-TSMRNGI-ZCE2TAN-FE4BMKA-PSKGYJW-CRIEJQL";
           };
         };
         folders = {
           docs = {
             path = "${config.home.homeDirectory}/docs";
-            devices = [ (if laptop then "kaladin" else "syl") "shadow" "dalinar" ];
+            devices =
+              [ (if laptop then "kaladin" else "syl") "shadow" "dalinar" ];
             # versioning = {
             #   type = "staggered";
             #   fsPath = "~/.local/share/syncthing/backup";
@@ -314,7 +364,8 @@ in
           music = {
             id = "teqqy-rzvec";
             path = "${config.home.homeDirectory}/music";
-            devices = [ "dalinar" (if laptop then "kaladin" else "syl") "shadow" ];
+            devices =
+              [ "dalinar" (if laptop then "kaladin" else "syl") "shadow" ];
           };
         };
       };
@@ -430,9 +481,7 @@ in
   };
 
   dconf.settings = {
-    "org/gnome/desktop/interface" = {
+    "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; };
-      color-scheme = "prefer-dark";
-    };
   };
 
   gtk = {
@@ -467,9 +516,7 @@ in
     };
   };
 
-  services.cliphist = {
+  services.cliphist = { enable = true; };
-    enable = true;
-  };
 
   home.file.".config/bottom" = {
     source = ../.config/bottom;
@@ -484,10 +531,8 @@ in
   programs.firefox = {
     enable = true;
     package = pkgs.firefox-wayland.override {
-      nativeMessagingHosts = [
+      nativeMessagingHosts =
-        pkgs.plasma-browser-integration
+        [ pkgs.plasma-browser-integration pkgs.tridactyl-native ];
-        pkgs.tridactyl-native
-      ];
     };
     profiles.chris = {
       name = "default";
@@ -508,17 +553,14 @@ in
         # Choose the order of the modules "custom/wintitle", 
         modules-left = [ "hyprland/workspaces" "hyprland/window" ];
         modules-center = [ "clock" ];
-        modules-right = ["pulseaudio" "backlight" "disk" "memory" "cpu" "battery" "tray"];
+        modules-right =
+          [ "pulseaudio" "backlight" "disk" "memory" "cpu" "battery" "tray" ];
         margin-top = if laptop then -5 else 5;
         margin-bottom = if laptop then 8 else 0;
         margin-left = 6;
         margin-right = 6;
-        "hyprland/window" = {
+        "hyprland/window" = { format = "  <span style='italic'>{}</span>"; };
-          format = "  <span style='italic'>{}</span>";
+        workspaces = { format = " {name} "; };
-        };
-        workspaces = {
-          format = " {name} ";
-        };
         "hyprland/workspaces" = {
           format = "{icon}";
           format-icons = {
@@ -541,16 +583,14 @@ in
           spacing = 10;
         };
         clock = {
-          tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
+          tooltip-format = ''
+            <big>{:%Y %B}</big>
+            <tt><small>{calendar}</small></tt>'';
           format-alt = "{:%Y-%m-%d}";
           format = "{:%a %b %e, %I:%M %p}";
         };
-        cpu = {
+        cpu = { format = "  {usage}%"; };
-          format = "  {usage}%";
+        memory = { format = "  {}%"; };
-        };
-        memory = {
-          format = "  {}%";
-        };
         temperature = {
           # "thermal-zone": 2,
           # "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
@@ -853,9 +893,7 @@ tooltip label {
   #   source = ../.config/fish/config.fish;
   # };
 
-  home.file.".config/fish/functions" = {
+  home.file.".config/fish/functions" = { source = ../.config/fish/functions; };
-    source = ../.config/fish/functions;
-  };
 
   # programs.ags = {
   #   enable = true;
@@ -1111,9 +1149,7 @@ end
         start_zellij
       '';
     };
-    environmentVariables = {
+    environmentVariables = { EDITOR = ''"emacsclient -t"''; };
-      EDITOR = "\"emacsclient -t\"";
-    };
   };
 
   # home.file.".config/dunst" = {
@@ -1153,7 +1189,9 @@ end
         sort = "yes";
         font = "VictorMono Nerd Font 10";
         markup = "full";
-        format = "<b>%s</b>\n%b";
+        format = ''
+          <b>%s</b>
+          %b'';
         alignment = "center";
         vertical_alignment = "center";
         corner_radius = 18;
@@ -1180,7 +1218,6 @@ end
     };
   };
 
-
   programs.atuin = {
     enable = true;
     enableNushellIntegration = false;
@@ -1229,9 +1266,7 @@ end
   #   source = ../.config/alacritty;
   # };
 
-  home.file.".config/picom.conf" = {
+  home.file.".config/picom.conf" = { source = ../.config/picom.conf; };
-    source = ../.config/picom.conf;
-  };
 
   # home.file.".config/networkmanager-dmenu/config.ini" = {
   #   source = ../networkmanager-dmenu/config.ini;
@@ -1256,7 +1291,7 @@ end
     sysuse = "systemctl --user";
     myip = "curl icanhazip.com";
     nixs = "nix search nixpkgs";
-    ytd = "yt-dlp -o \"~/vids/%(title)s.%(ext)s\" $1";
+    ytd = ''yt-dlp -o "~/vids/%(title)s.%(ext)s" $1'';
   };
 
   programs.alacritty = {
@@ -1340,31 +1375,21 @@ end
         show_notifications = true;
         min_time_to_notify = 20000;
       };
-      time = {
+      time = { format = "| $time"; };
-        format = "| $time";
+      status = { format = "| $status"; };
-      };
-      status = {
-        format = "| $status";
-      };
       scan_timeout = 10;
-      rust = {
+      rust = { format = "[$symbol($version )]($style)"; };
-        format = "[$symbol($version )]($style)";
-      };
       cmake = {
         format = "";
         disabled = true;
       };
       nix_shell = {
-        format = "[$symbol$state( \($name\))]($style) ";
+        format = "[$symbol$state( ($name))]($style) ";
         impure_msg = " ";
         pure_msg = " ";
       };
-      hostname = {
+      hostname = { format = "@[$ssh_symbol$hostname]($style) > '"; };
-        format = "@[$ssh_symbol$hostname]($style) > '";
+      git_branch = { format = "[$symbol$branch(:$remote_branch)]($style) "; };
-      };
-      git_branch = {
-        format = "[$symbol$branch(:$remote_branch)]($style) ";
-      };
       git_status = {
         format = "[\\[$all_status$ahead_behind\\]]($style) |(dimmed gray) ";
       };
@@ -1416,7 +1441,7 @@ end
       suspend = "systemctl suspend";
       sysuse = "systemctl --user";
       myip = "curl icanhazip.com";
-      ytd = "yt-dlp -o \"~/vids/%(title)s.%(ext)s\" $1";
+      ytd = ''yt-dlp -o "~/vids/%(title)s.%(ext)s" $1'';
     };
     initExtra = ''
       macchina
@@ -1430,7 +1455,13 @@ end
       exec = "alacritty -e mpv --profile=slow %U";
       terminal = true;
       categories = [ "Application" ];
-      mimeType = [ "audio/ogg" "audio/mpeg" "audio/opus" "audio/x-opus+ogg" "audio/x-wav" ];
+      mimeType = [
+        "audio/ogg"
+        "audio/mpeg"
+        "audio/opus"
+        "audio/x-opus+ogg"
+        "audio/x-wav"
+      ];
     };
     imv-rifle = {
       name = "IMV";
@@ -1450,12 +1481,11 @@ end
       };
 
       Service = {
-        ExecStart = "/run/current-system/sw/bin/ydotoold --socket-path /tmp/ydotools";
+        ExecStart =
+          "/run/current-system/sw/bin/ydotoold --socket-path /tmp/ydotools";
       };
 
-      Install = {
+      Install = { WantedBy = [ "default.target" ]; };
-        WantedBy = ["default.target"];
-      };
     };
 
     jellyfin-mpv-shim = {
@@ -1464,13 +1494,9 @@ end
         After = "graphical-session-pre.target";
       };
 
-      Service = {
+      Service = { ExecStart = "/run/current-system/sw/bin/jellyfin-mpv-shim"; };
-        ExecStart = "/run/current-system/sw/bin/jellyfin-mpv-shim";
-      };
 
-      Install = {
+      Install = { WantedBy = [ "graphical-session.target" ]; };
-        WantedBy = ["graphical-session.target"];
-      };
     };
 
     # nextcloud-client = {