functional home assistant

modules/home/desktop/extra/waybar/default.nix

@@ -1,7 +1,7 @@
-{ config, lib, namespace, ... }:
+{ config, lib, ... }:
 with lib;
 let
-  cfg = config.${namespace}.desktop.extra.waybar;
+  cfg = config.mjallen.desktop.extra.waybar;
   nord = import ../../theme/nord.nix;
 
   defaultOpacity = "opacity: 0.85;";
@@ -33,13 +33,13 @@ let
   '';
 in
 {
-  imports = [ ./options.nix ];
+  imports = [ 
+    ./options.nix
+    ./scripts/hass.nix
+    ./scripts/weather.nix
+  ];
 
   config = mkIf cfg.enable {
-    imports = [
-      ./scripts/hass.nix
-      ./scripts/weather.nix
-    ];
     # https://github.com/Alexays/Waybar/wiki/Module:-Hyprland
     # https://www.nerdfonts.com/cheat-sheet
 

modules/home/desktop/extra/waybar/options.nix

@@ -1,7 +1,7 @@
-{ lib, namespace, ... }:
+{ lib, ... }:
 with lib;
 {
-  options.${namespace}.desktop.extra.waybar = {
+  options.mjallen.desktop.extra.waybar = {
     enable = mkEnableOption "enable waybar";
 
     layer = mkOption {

modules/home/desktop/extra/waybar/scripts/hass.nix

@@ -1,43 +1,10 @@
-{ pkgs, ... }:
+{ config, lib, namespace, ... }:
+with lib;
 let
-  homeassistant-api = pkgs.python3.pkgs.buildPythonPackage rec {
-    pname = "homeassistant_api";
-    version = "5.0.0";
-    format = "pyproject";
-    src = pkgs.fetchPypi {
-      inherit pname version;
-      sha256 = "sha256-UNKTtgInrVJtjHb1WVlUbcbhjBOtTX00eHmm54ww0rY=";
-    };
-
-    # do not run tests
-    doCheck = false;
-    nativeBuildInputs = with pkgs.python3.pkgs; [ poetry-core requests-cache ];
-    dependencies = with pkgs.python3.pkgs; [
-      requests-cache
-      pydantic
-      websockets
-    ];
-    propagatedBuildInputs = with pkgs.python3.pkgs; [
-      aiohttp
-      aiohttp-client-cache
-      pydantic
-      requests
-      requests-cache
-      simplejson
-      websockets
-    ];
-    pythonRelaxDeps = [
-      "requests-cache"
-      "pydantic"
-      "websockets"
-    ];
-    pythonImportsCheck = [
-      "homeassistant_api"
-    ];
-  };
+  cfg = config.mjallen.desktop.extra.waybar;
 
   pythonEnv = pkgs.python3.withPackages (ps: [
-    homeassistant-api
+    pkgs.${namespace}.homeassistant-api
   ]);
 
   waybar-hass = pkgs.writeScriptBin "waybar-hass" ''
@@ -102,5 +69,9 @@ let
   '';
 in
 {
-  home.packages = [ waybar-hass ];
+  imports = [ ../options.nix ];
+
+  config = lib.mkIf cfg.enable {
+    home.packages = [ waybar-hass ];
+  };
 }

modules/home/desktop/extra/waybar/scripts/weather.nix

@@ -1,5 +1,8 @@
-{ pkgs, ... }:
+{ config, lib, namespace, ... }:
+with lib;
 let
+  cfg = config.mjallen.desktop.extra.waybar;
+
   waybar-weather = pkgs.writeScriptBin "waybar-weather" ''
     #!/usr/bin/env nix-shell
     #! nix-shell -i python3 --pure
@@ -429,5 +432,9 @@ let
   '';
 in
 {
-  home.packages = [ waybar-weather ];
+  imports = [ ../options.nix ];
+
+  config = lib.mkIf cfg.enable {
+    home.packages = [ waybar-weather ];
+  };
 }