hi

6 files changed, 20 insertions, 16 deletions

diff --git a/home/ebisu/fortune/desktop/wayland/waybar/waybar/default-modules.nix b/home/ebisu/fortune/desktop/wayland/waybar/configuration/default-modules.nix
index 07d741d..a9d6cad 100644
--- a/home/ebisu/fortune/desktop/wayland/waybar/waybar/default-modules.nix
+++ b/home/ebisu/fortune/desktop/wayland/waybar/configuration/default-modules.nix
@@ -1,11 +1,17 @@
 { pkgs, ... }:
 let
-  python-shell = pkgs.mkShell {
-    packages = [
-      (pkgs.python3.withPackages (python-pkgs: [ python-pkgs.pygobject3 ]))
-      pkgs.playerctl
-      pkgs.gobject-introspection
+  mediaplayer = pkgs.stdenv.mkDerivation {
+    name = "mediaplayer";
+
+    propagatedBuildInputs = with pkgs; [
+      (python3.withPackages (ps: [ ps.pygobject3 ]))
+      playerctl
+      gobject-introspection
+      curl
     ];
+
+    dontUnpack = true;
+    installPhase = "install -Dm755 ${./scripts/mediaplayer.py} $out/bin/mediaplayer";
   };
 in
 {
@@ -143,7 +149,7 @@ in
     };
 
     escape = true;
-    exec = "${python-shell}/bin/python3 ~/.config/waybar/scripts/mediaplayer.py 2> /dev/null";
+    exec = "GI_TYPELIB_PATH=${pkgs.playerctl}/lib/girepository-1.0:${pkgs.glib}/lib/girepository-1.0:$GI_TYPELIB_PATH ${mediaplayer}/bin/mediaplayer 2> /dev/null";
     on-click = "${pkgs.playerctl}/bin/playerctl play-pause";
     on-scroll-up = "${pkgs.playerctl}/bin/playerctl next";
     on-scroll-down = "${pkgs.playerctl}/bin/playerctl previous";
diff --git a/home/ebisu/fortune/desktop/wayland/waybar/waybar/scripts/mediaplayer.py b/home/ebisu/fortune/desktop/wayland/waybar/configuration/scripts/mediaplayer.py
index c44ee0b..c44ee0b 100755
--- a/home/ebisu/fortune/desktop/wayland/waybar/waybar/scripts/mediaplayer.py
+++ b/home/ebisu/fortune/desktop/wayland/waybar/configuration/scripts/mediaplayer.py
diff --git a/home/ebisu/fortune/desktop/wayland/waybar/waybar/scripts/mediaplayer.py.bak b/home/ebisu/fortune/desktop/wayland/waybar/configuration/scripts/mediaplayer.py.bak
index 1630d97..1630d97 100755
--- a/home/ebisu/fortune/desktop/wayland/waybar/waybar/scripts/mediaplayer.py.bak
+++ b/home/ebisu/fortune/desktop/wayland/waybar/configuration/scripts/mediaplayer.py.bak
diff --git a/home/ebisu/fortune/desktop/wayland/waybar/waybar/style.css b/home/ebisu/fortune/desktop/wayland/waybar/configuration/style.css
index 121c792..121c792 100644
--- a/home/ebisu/fortune/desktop/wayland/waybar/waybar/style.css
+++ b/home/ebisu/fortune/desktop/wayland/waybar/configuration/style.css
diff --git a/home/ebisu/fortune/desktop/wayland/waybar/waybar/style.css.bak b/home/ebisu/fortune/desktop/wayland/waybar/configuration/style.css.bak
index 3858c71..3858c71 100644
--- a/home/ebisu/fortune/desktop/wayland/waybar/waybar/style.css.bak
+++ b/home/ebisu/fortune/desktop/wayland/waybar/configuration/style.css.bak
diff --git a/home/ebisu/fortune/desktop/wayland/waybar/default.nix b/home/ebisu/fortune/desktop/wayland/waybar/default.nix
index 4efd8b5..cdf3268 100644
--- a/home/ebisu/fortune/desktop/wayland/waybar/default.nix
+++ b/home/ebisu/fortune/desktop/wayland/waybar/default.nix
@@ -2,11 +2,11 @@
 {
   programs.waybar = {
     enable = true;
-    style = ./waybar/style.css;
+    style = ./configuration/style.css;
 
     settings =
       let
-        defaultModules = import ./waybar/default-modules.nix { inherit pkgs; };
+        defaultModules = import ./configuration/default-modules.nix { inherit pkgs; };
         hyprland-workspaces-base = {
           disable-scroll = true;
           disable-markup = false;
@@ -83,14 +83,12 @@
       scripts = [ "mediaplayer.py" ];
     in
     (builtins.listToAttrs (
-      map
-        (script: {
-          name = "waybar/scripts/${script}";
+      map (script: {
+        name = "waybar/scripts/${script}";
 
-          value = {
-            source = ./waybar/scripts/${script};
-          };
-        })
-        scripts
+        value = {
+          source = ./configuration/scripts/${script};
+        };
+      }) scripts
     ));
 }