temp

homes/aarch64-linux/matt@macbook-pro-nixos/default.nix

@@ -75,7 +75,6 @@ in
         layer = "bottom";
 
         modules-right = [
-          "tray"
           "temperature"
           "temperature#gpu"
           "keyboard-state#capslock"
@@ -112,6 +111,8 @@ in
             background: ${theme.polarNight.nord3};
           }
         '';
+
+        windowOffset = 75;
       };
       wlogout.enable = true;
       wofi.enable = true;

modules/home/desktop/hyprland/options.nix

@@ -140,7 +140,7 @@ with lib;
       };
       suspendTimer = mkOption {
         type = with types; int;
-        default = 1500;
+        default = 1800;
       };
     };
   };

modules/home/desktop/hyprland/packages.nix

@@ -67,6 +67,8 @@ in
       xorg.xhost
       xsettingsd
       xwayland
+
+      pkgs.mjallen.pipewire-python
     ];
   };
 }

modules/home/desktop/hyprland/services/hyprlock/default.nix

@@ -12,7 +12,7 @@ in
 
   config = lib.mkIf cfg.enable {
     programs.hyprlock = {
-      enable = true;
+      enable = false;
       settings = {
         background = [
           {

modules/home/programs/waybar/default.nix

@@ -61,7 +61,30 @@ in
 
           modules-center = [ "hyprland/window" ];
 
-          modules-right = cfg.modules-right;
+          modules-right = [
+            "tray"
+            "custom/left-end"
+            "temperature"
+            "temperature#gpu"
+            "keyboard-state#capslock"
+            "keyboard-state#numlock"
+            "wireplumber#sink"
+            "bluetooth"
+            "network"
+            "idle_inhibitor"
+            "custom/right-end"
+            "custom/left-end"
+            "clock"
+            "battery"
+            "custom/weather"
+            "custom/right-end"
+          ];
+
+          # modules-right = [ 
+          #   "tray"
+          #   "custom/left-end" ] ++ 
+          #   cfg.modules-right ++
+          #   [ "custom/right-end" ];
 
           # Module Definitions
           # Left
@@ -290,6 +313,16 @@ in
             return-type = "json";
             markup = "pango";
           };
+
+          "custom/left-end" = {
+            format = " ";
+            tooltip = false;
+          };
+
+          "custom/right-end" = {
+            format = " ";
+            tooltip = false;
+          };
         } // cfg.extraModules;
       };
 
@@ -373,7 +406,7 @@ in
             ${defaultBorderRadius}
             ${defaultCenterOptions}
             margin-left: 4rem;
-            margin-right: 4rem;
+            margin-right: ${toString cfg.windowOffset}rem;
           }
 
           /* make window module transparent when no windows present */
@@ -529,6 +562,18 @@ in
           }
 
           /* ------------- */
+
+          #custom-left-end {
+            background-color: ${nord.polarNight.nord0};
+            ${defaultOpacity}
+            ${borderLeft}
+          }
+
+          #custom-right-end {
+            background-color: ${nord.polarNight.nord0};
+            ${defaultOpacity}
+            ${borderRight}
+          }
         ''
         + cfg.extraModulesStyle or '''';
     };

modules/home/programs/waybar/options.nix

@@ -29,6 +29,11 @@ with lib;
       default = "";
     };
 
+    windowOffset = mkOption {
+      type = types.int;
+      default = 4;
+    };
+
     # Waybar modules config
     # modules = mkOption {
     #   type = types.submodule {

packages/ha-icloud3/default.nix

@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "gcobb321";
   domain = "icloud3";
-  version = "3.2.2.3";
+  version = "v3.2.3";
 
   src = fetchFromGitHub {
     owner = owner;
     repo = "icloud3";
     rev = "v.${version}";
-    hash = "sha256-OjXioS73jE/U2YeKYf84QnStdQj3Seid4hJ2TH6z13M=";
+    hash = "sha256-1yygw2k5r2cqh0df6njwjb5lp2nd9cgh684pkjqlzzsbx7jzc8a7";
   };
 
   propagatedBuildInputs = with python3Packages; [

packages/pipewire-python/default.nix

@@ -0,0 +1,17 @@
+{ python3Packages, fetchFromGitHub, ... }:
+python3Packages.buildPythonPackage rec {
+  pname = "pipewire-python";
+  version = "0.2.3";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "pablodz";
+    repo = "pipewire_python";
+    rev = "master";
+    sha256 = "sha256-EmwEZeKFFEqLkVnBKmB1HDVPk0xAqG6Ztv7+gpl0B1Y=";
+  };
+
+  buildInputs = with python3Packages; [ flit-core ];
+  nativeBuildInputs = with python3Packages; [ build wheel ];
+  doCheck = false; # no tests in the PyPI tarball
+}

systems/aarch64-linux/macbook-pro-nixos/hyprland-settings.nix

@@ -54,7 +54,6 @@ in
     layer = "top";
 
     modules-right = [
-      "tray"
       "temperature"
       "temperature#gpu"
       "keyboard-state#capslock"

systems/x86_64-linux/desktop/specialisations/hyprland/home/default.nix

@@ -80,7 +80,6 @@ in
         layer = "bottom";
 
         modules-right = [
-          "tray"
           "custom/lights"
           "temperature"
           "temperature#gpu"