home-manager/linux/programs/hyprland.nix

@@ -190,8 +190,6 @@ in with lib; {
         bind = , xf86audiolowervolume, exec, swayosd --output-volume=lower
         bind = SHIFT, xf86audiolowervolume, exec, swayosd --output-volume=-2
         bind = , xf86audiomute, exec, swayosd --output-volume mute-toggle
-        bind = , xf86audioplay, exec, playerctl play-pause
-        bind = , xf86audionext, exec, playerctl next
 
         # Screenshots
         bind = , print, exec, grimblast --scale 1 copysave area ~/Pictures/Screenshots/$(date -Iseconds).png
@@ -319,9 +317,7 @@ in with lib; {
     programs.waybar = {
       enable = true;
       package =
-        (inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".waybar.override {
-          withMediaPlayer = true;
-        }).overrideAttrs
+        inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".waybar.overrideAttrs
         (old: { mesonFlags = old.mesonFlags ++ [ "-Dexperimental=true" ]; });
       systemd = { enable = false; };
       settings = {
@@ -338,7 +334,7 @@ in with lib; {
           modules-center = [
             "custom/launcher"
             "wlr/workspaces"
-            "custom/media"
+            "mpd"
             # "hyprland/window"
             "idle_inhibitor"
             "pulseaudio"
@@ -402,17 +398,19 @@ in with lib; {
             spacing = 10;
           };
           "clock" = { format = "{:%I:%M%p %Y-%m-%d}"; };
-          "custom/media" = {
-            format = "{icon} {}";
-            return-type = "json";
-            max-length = 50;
-            format-icons = {
-              spotify = " ";
-              default = " ";
+          "mpd" = {
+            format =
+              "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})";
+            format-disconnected = "Disconnected ❌";
+            format-stopped =
+              "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ⏸";
+            consume-icons = { on = "🍴"; };
+            random-icons = { on = "🔀"; };
+            repeat-icons = { on = "🔁"; };
+            state-icons = {
+              paused = "⏸";
+              playing = "▶";
             };
-            escape = true;
-            exec = "waybar-mediaplayer.py 2> /dev/null";
-            on-click = "playerctl play-pause";
           };
           "custom/notification" = {
             tooltip = false;
@@ -630,15 +628,6 @@ in with lib; {
             color: red;
         }
 
-        #custom-media {
-            background-color: #8EC5FC;
-            background-image: linear-gradient(62deg, #8EC5FC 0%, #E0C3FC 100%);
-            color: black;
-            border-radius: 20px;
-            margin-right: 5px;
-        }
-
-
         #custom-media {
             background-color: #8EC5FC;
             background-image: linear-gradient(62deg, #8EC5FC 0%, #E0C3FC 100%);

home-manager/linux/programs/media.nix

@@ -4,6 +4,13 @@ let
     config = { allowUnfree = true; };
     system = pkgs.system;
   };
+  irisDesktopItem = pkgs.makeDesktopItem {
+    name = "iris";
+    desktopName = "Iris";
+    exec =
+      ''${pkgs.chromium}/bin/chromium "--app=http://localhost:6680/iris/"'';
+    terminal = false;
+  };
 in {
   config = lib.mkMerge [
     (lib.mkIf config.nathan.programs.media.enable {
@@ -14,11 +21,10 @@ in {
         unstable.jellyfin-media-player
         unstable.obs-studio
         nicotine-plus
+        irisDesktopItem
         picard
         mpc-cli
         calibre
-        playerctl
-        ymuse
       ];
       # Register haruna as the default video player
       xdg.mimeApps.defaultApplications = {
@@ -37,7 +43,6 @@ in {
           mopidy-iris
           mopidy-scrobbler
           mopidy-local
-          mopidy-mpris
         ];
         # extraConfigFiles = config.nathan.programs.media.mopidyExtraConfig;
         settings = {
@@ -47,7 +52,6 @@ in {
             media_dir = "~/Music";
           };
           mpd = { enabled = true; };
-          mpris = { enabled = true; };
         };
         extraConfigFiles = [ nixosConfig.sops.secrets."last.fm".path ];
       };

machines/levitation/home.nix

@@ -41,7 +41,7 @@
     # disable 10 bit output for now as this breaks screenshots
     monitor=DP-1,preferred,auto,1.4
     input {
-      sensitivity = -0.8
+      sensitivity = -0.3
       # accel_profile = flat
     }
     exec-once=hyprpaper

modules/linux/desktop.nix

@@ -55,8 +55,6 @@ in with lib; {
         pulseaudio
         pavucontrol
         noisetorch
-        alsa-utils
-        alsa-lib
       ];
       # Add noisetorch for microphone noise canceling
       programs.noisetorch = { enable = true; };

shortcuts/vmware/1440p

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-hyprctl dispatch exec -- "[float;size 1829 1029] gamescope -W 2560 -w 2560 \
-    -H 1440 -h 1440 --scaler integer --force-windows-fullscreen --rt -- vmware"
+hyprctl dispatch exec -- "[float;size 1829 1029] gamescope -W 2560 -w 2560 -H 1440 -h 1440 --scaler integer --force-windows-fullscreen -- vmware"
 
 wait

shortcuts/vmware/fullscreen

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-hyprctl dispatch exec -- "[float;size 1829 1029] gamescope --scaler integer \
-    --force-windows-fullscreen -f --rt -- vmware"
-
-wait