weather stuff

hosts/desktop/configuration.nix

@@ -5,6 +5,7 @@
 {
   lib,
   pkgs,
+  inputs,
   ...
 }:
 let
@@ -48,6 +49,8 @@ let
     udisks2
     unzip
     winetricks
+
+    inputs.desktop-lsfg.packages."x86_64-linux".default
   ];
 in
 {
@@ -116,6 +119,7 @@ in
   # Virtualisation configuration
   virtualisation = {
     libvirtd.enable = lib.mkDefault true;
+    podman.enable = true;
     waydroid.enable = lib.mkDefault true;
   };
 

hosts/desktop/home.nix

@@ -43,6 +43,7 @@ in
     bottles
     unstable.compose2nix
     discord
+    distrobox
     heroic
     stable.vmware-horizon-client
     jq

hosts/desktop/hyprland-settings.nix

@@ -19,6 +19,9 @@ let
   };
 in
 {
+  primaryDisplay = displayLeft;
+  networkInterface = "wlp9s0";
+
   wallpaper = [
     "${displayLeft.input}, /run/wallpaper.jpg"
     "${displayRight.input}, /run/wallpaper.jpg"
@@ -61,6 +64,7 @@ in
       "wireplumber#sink"
       "wireplumber#source"
       "bluetooth"
+      "network"
       "idle_inhibitor"
       "clock"
       "custom/weather"

hosts/desktop/services.nix

@@ -79,7 +79,7 @@ in
     ratbagd.enable = lib.mkDefault true;
 
     keyd = {
-      enable = true;
+      enable = false;
       keyboards = {
         default = {
           ids = [ "*" ];

hosts/homeassistant/homeassistant.nix

@@ -2,7 +2,7 @@
 let
   mosquittoPort = 1883;
   zigbee2mqttPort = 8080;
-  # "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
+
   ha-bambulab = pkgs.stdenv.mkDerivation {
     pname = "ha-bambulab";
     version = "v2.1.5";  # Update with correct version

hosts/mac-nixos/hyprland-settings.nix

@@ -1,13 +1,23 @@
 let
   theme = import ../../modules/desktop-environments/hyprland/theme.nix;
+
+  # Displays
+  display = {
+    input = "eDP-1";
+    resolution = "3456x2234";
+    refreshRate = "60.00000";
+  };
 in
 {
+  primaryDisplay = display;
+  networkInterface = "wlan0";
+
   wallpaper = [
-    "eDP-1, /run/wallpaper.jpg"
+    "${display.input}, /run/wallpaper.jpg"
   ];
 
   monitor = [
-    "eDP-1,3456x2234@60.00000,0x0,1.25,bitdepth,10,cm,hdr,sdrbrightness,1.2,sdrsaturation,0.98"
+    "${display.input},${display.resolution}@${display.refreshRate},0x0,1.25,bitdepth,10,cm,hdr,sdrbrightness,1.2,sdrsaturation,0.98"
   ];
   
   # monitorv2 = {
@@ -19,9 +29,9 @@ in
   # };
   
   workspace = [
-    "name:firefox, monitor:eDP-1, default:false, special, class:(.*firefox.*)"
-    "name:discord, monitor:eDP-1, default:true, special, title:(.*vesktop.*), title:(.*Apple Music.*)"
-    "name:steam, monitor:eDP-1, default:false, special, class:(.*[Ss]team.*)"
+    "name:firefox, monitor:${display.input}, default:false, special, class:(.*firefox.*)"
+    "name:discord, monitor:${display.input}, default:true, special, title:(.*vesktop.*), title:(.*Apple Music.*)"
+    "name:steam, monitor:${display.input}, default:false, special, class:(.*[Ss]team.*)"
   ];
 
   windowRule = [

hosts/pi5/configuration.nix

@@ -16,7 +16,7 @@ in
     ./services.nix
     ./sops.nix
     ../../modules/desktop-environments/hyprland
-#    ./hass.nix
+   ./hass.nix
   ];
 
   # Enable nix flakes and nix-command tools