gkleen@sif: ...

3 files changed, 76 insertions, 60 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 118d11d5..a4d9dab6 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -47,7 +47,7 @@ let
         --prefix PATH : ${pkgs.pulseaudio}/bin
     '';
   };
-  wrapElectron = { package, bin ? package.meta.mainProgram or package.pname or pkgs.lib.strings.nameFromURL package.name "-", outBin ? bin }: pkgs.runCommand "${package.name}-wrapped" { buildInputs = with pkgs; [ makeWrapper ]; } ''
+  wrapElectron = { package, bin ? package.meta.mainProgram or package.pname or (pkgs.lib.strings.nameFromURL package.name "-"), outBin ? bin }: pkgs.runCommand "${package.name}-wrapped" { buildInputs = with pkgs; [ makeWrapper ]; } ''
     mkdir -p "$out/bin"
     makeWrapper ${package}/bin/${bin} $out/bin/${outBin} \
       --add-flags '--force-device-scale-factor=1.6'
@@ -282,7 +282,7 @@ in {
       packages = with pkgs; [
         fira fira-code powerline-fonts nerdfonts pavucontrol keepassxc
         sxiv xclip mumble pulseaudio-ctl pamixer libnotify synergy
-        xorg.xbacklight screen-message pidgin-with-plugins
+        xorg.xbacklight screen-message
         google-play-music-desktop-player qt5ct playerctl evince
         thunderbird wrappedZulip zoom-us steam steam-run wireshark
         virt-manager rclone cached-nix-shell xournal xmonad worktime
diff --git a/flake.lock b/flake.lock
index 78909d51..a6270724 100644
--- a/flake.lock
+++ b/flake.lock
@@ -46,11 +46,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1645924784,
-        "narHash": "sha256-mpwIohyuc3RAHmVXEm/vUHGMu2V9SLr4P3kh0xckwpI=",
+        "lastModified": 1645970334,
+        "narHash": "sha256-6nn4YF9bPtkxkB7bM6yJO3m//p3sGilxNQFjm1epLEM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2499b916921adde8a694117bc007efdde8bbd918",
+        "rev": "ea85f4b1fdf3f25cf97dc49f4a9ec4eafda2ea25",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1645958901,
-        "narHash": "sha256-vcPuKbeJemK+a7Oce4fSMsGt9n99Ogwv/At0Oy/aW6E=",
+        "lastModified": 1646135945,
+        "narHash": "sha256-AjOuxMoIEHI6fSck5Ew6UKW2urIgrIEIcAHOvXjkBA4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6896623f630ce8703e2201625eabd9f01dfcc5e0",
+        "rev": "e3c78ec446db310c01504dca6cb7ee4cba0f8a7d",
         "type": "github"
       },
       "original": {
diff --git a/user-profiles/mpv/default.nix b/user-profiles/mpv/default.nix
index 3386ca5f..f6f9b8b2 100644
--- a/user-profiles/mpv/default.nix
+++ b/user-profiles/mpv/default.nix
@@ -20,69 +20,85 @@
         "ytdl_hook-ytdl_path=${pkgs.yt-dlp}/bin/yt-dlp"
       ];
     };
-    scripts = let
-        reload = pkgs.stdenv.mkDerivation rec {
-          version = "2b8a719f";
-          pname = "reload";
-          name = "${pname}-${version}";
+    scripts = [
+      (pkgs.stdenv.mkDerivation rec {
+        version = "2b8a719f";
+        pname = "reload";
+        name = "${pname}-${version}";
 
-          src = pkgs.fetchFromGitHub {
-            owner = "4e6";
-            repo = "mpv-reload";
-            rev = "2b8a719fe166d6d42b5f1dd64761f97997b54a86";
-            sha256 = "19ycvnwzf8vgv0g63d4k1ll6hlfrd92is9gl8hzfic7w32ycphbg";
-          };
+        src = pkgs.fetchFromGitHub {
+          owner = "4e6";
+          repo = "mpv-reload";
+          rev = "2b8a719fe166d6d42b5f1dd64761f97997b54a86";
+          sha256 = "19ycvnwzf8vgv0g63d4k1ll6hlfrd92is9gl8hzfic7w32ycphbg";
+        };
+
+        installPhase = ''
+          install -d $out/share/mpv/scripts
+          install -m 0644 reload.lua $out/share/mpv/scripts/${passthru.scriptName}
+        '';
 
-          installPhase = ''
-            install -d $out/share/mpv/scripts
-            install -m 0644 reload.lua $out/share/mpv/scripts/${passthru.scriptName}
-          '';
+        passthru.scriptName = "reload.lua";
+      })
+      (pkgs.stdenv.mkDerivation rec {
+        version = "8dd33e2d";
+        pname = "createchapter";
+        name = "${pname}-${version}";
 
-          passthru.scriptName = "reload.lua";
+        src = pkgs.fetchFromGitHub {
+          owner = "shinchiro";
+          repo = "mpv-createchapter";
+          rev = "8dd33e2debbcb963a195ec1371e02c85b49e7faa";
+          hash = "sha256-rPtG7mgf7tOY8Ih4Bz1tpd4MwXOxJmngjY+s70zWX+g=";
         };
-        autosave = pkgs.stdenv.mkDerivation rec {
-          version = "744c3ee6";
-          pname = "autosave";
-          name = "${pname}-${version}.lua";
 
-          src = pkgs.fetchzip {
-            url = "https://gist.github.com/CyberShadow/2f71a97fb85ed42146f6d9f522bc34ef/archive/744c3ee61d2f0a8e9bb4e308dec6897215ae4704.zip";
-            hash = "sha256-yxA8wgzdS7SyKLoNTWN87ShsBfPKUflbOu4Y0jS2G3I=";
-            # url = "https://gist.github.com/Hakkin/5489e511bd6c8068a0fc09304c9c5a82/archive/7a19f7cdb6dd0b1c6878b41e13b244e2503c15fc.zip";
-            # sha256 = "0bv9wjrqm2ragd7rp8vw768bja2ghascwlljd6rzzf2ybi10fxs2";
-          };
+        installPhase = ''
+          install -d $out/share/mpv/scripts
+          install -m 0644 createchapter.lua $out/share/mpv/scripts/${passthru.scriptName}
+        '';
 
-          installPhase = ''
-            install -d $out/share/mpv/scripts
-            install -m 0644 autosave.lua $out/share/mpv/scripts/${passthru.scriptName}
-          '';
+        passthru.scriptName = "createchapter.lua";
+      })
+      (pkgs.stdenv.mkDerivation rec {
+        version = "744c3ee6";
+        pname = "autosave";
+        name = "${pname}-${version}.lua";
 
-          passthru.scriptName = "autosave.lua";
+        src = pkgs.fetchzip {
+          url = "https://gist.github.com/CyberShadow/2f71a97fb85ed42146f6d9f522bc34ef/archive/744c3ee61d2f0a8e9bb4e308dec6897215ae4704.zip";
+          hash = "sha256-yxA8wgzdS7SyKLoNTWN87ShsBfPKUflbOu4Y0jS2G3I=";
+          # url = "https://gist.github.com/Hakkin/5489e511bd6c8068a0fc09304c9c5a82/archive/7a19f7cdb6dd0b1c6878b41e13b244e2503c15fc.zip";
+          # sha256 = "0bv9wjrqm2ragd7rp8vw768bja2ghascwlljd6rzzf2ybi10fxs2";
         };
-        mpris = pkgs.stdenv.mkDerivation rec {
-          version = "0.4";
-          pname = "mpv-mpris";
-          name = "${pname}-${version}.so";
-
-          src = pkgs.fetchFromGitHub {
-            owner = "hoyon";
-            repo = "mpv-mpris";
-            rev = version;
-            sha256 = "1fr3jvja8s2gdpx8qyk9r17977flms3qpm8zci62nd9r5wjdvr5i";
-          };
 
-          installPhase = ''
-            install -d $out/share/mpv/scripts
-            install -m 0644 mpris.so $out/share/mpv/scripts/${passthru.scriptName}
-          '';
+        installPhase = ''
+          install -d $out/share/mpv/scripts
+          install -m 0644 autosave.lua $out/share/mpv/scripts/${passthru.scriptName}
+        '';
 
-          nativeBuildInputs = with pkgs; [ pkgconfig glib mpv ];
+        passthru.scriptName = "autosave.lua";
+      })
+      (pkgs.stdenv.mkDerivation rec {
+        version = "0.4";
+        pname = "mpv-mpris";
+        name = "${pname}-${version}.so";
 
-          passthru.scriptName = "mpris.so";
+        src = pkgs.fetchFromGitHub {
+          owner = "hoyon";
+          repo = "mpv-mpris";
+          rev = version;
+          sha256 = "1fr3jvja8s2gdpx8qyk9r17977flms3qpm8zci62nd9r5wjdvr5i";
         };
-      in [ reload
-           autosave
-           mpris
-         ];
+
+        installPhase = ''
+          install -d $out/share/mpv/scripts
+          install -m 0644 mpris.so $out/share/mpv/scripts/${passthru.scriptName}
+        '';
+
+        nativeBuildInputs = with pkgs; [ pkgconfig glib mpv ];
+
+        passthru.scriptName = "mpris.so";
+      })
+    ];
   };
 }