Add floorplan config

flake.lock

@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1736955230,
+        "lastModified": 1723293904,
-        "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
+        "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
+        "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735644329,
+        "lastModified": 1728330715,
-        "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
+        "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
+        "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
         "type": "github"
       },
       "original": {
@@ -107,11 +107,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737038063,
+        "lastModified": 1735468753,
-        "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=",
+        "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2",
+        "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21",
         "type": "github"
       },
       "original": {
@@ -123,11 +123,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1736899990,
+        "lastModified": 1735511798,
-        "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=",
+        "narHash": "sha256-U9WjPisByrvw8Kt6Ufg9kLrvg7uHPsFSyG93GR3I1iE=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d",
+        "rev": "097c98cb4a7568f6f83a43e37950c08b575dd126",
         "type": "github"
       },
       "original": {
@@ -190,11 +190,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736143030,
+        "lastModified": 1733312601,
-        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
         "type": "github"
       },
       "original": {
@@ -231,14 +231,18 @@
         "nixpkgs": [
           "nixvim",
           "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "nixvim",
+          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1735882644,
+        "lastModified": 1734797603,
-        "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
+        "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
+        "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498",
         "type": "github"
       },
       "original": {
@@ -314,11 +318,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736373539,
+        "lastModified": 1735344290,
-        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
+        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
+        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
         "type": "github"
       },
       "original": {
@@ -336,11 +340,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736373539,
+        "lastModified": 1735344290,
-        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
+        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
+        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
         "type": "github"
       },
       "original": {
@@ -402,11 +406,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736370755,
+        "lastModified": 1735218083,
-        "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=",
+        "narHash": "sha256-MoUAbmXz9TEr7zlKDRO56DBJHe30+7B5X7nhXm+Vpc8=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e",
+        "rev": "bc03f7818771a75716966ce8c23110b715eff2aa",
         "type": "github"
       },
       "original": {
@@ -417,11 +421,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1736978406,
+        "lastModified": 1735388221,
-        "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=",
+        "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "b678606690027913f3434dea3864e712b862dde5",
+        "rev": "7c674c6734f61157e321db595dbfcd8523e04e19",
         "type": "github"
       },
       "original": {
@@ -486,11 +490,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1737062831,
+        "lastModified": 1735471104,
-        "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
+        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
+        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
         "type": "github"
       },
       "original": {
@@ -517,11 +521,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1736916166,
+        "lastModified": 1735669367,
-        "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=",
+        "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a",
+        "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9",
         "type": "github"
       },
       "original": {
@@ -545,11 +549,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1737141914,
+        "lastModified": 1735389157,
-        "narHash": "sha256-Lq7PWAD+edeIpZKM7aresrwON+Tdo3OMu1S2YX8AjjM=",
+        "narHash": "sha256-3co5A7PUEN+Bm7b3/6BxFsmvplg3XYUNR2MzWnheZoE=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "c2ee71c814c9427d4991b9d58d412add9c5a1c56",
+        "rev": "c8fa65c6ac35dba157de0873d645ab398c370123",
         "type": "github"
       },
       "original": {
@@ -569,11 +573,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735854821,
+        "lastModified": 1733773348,
-        "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=",
+        "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "836908e3bddd837ae0f13e215dd48767aee355f0",
+        "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9",
         "type": "github"
       },
       "original": {
@@ -592,11 +596,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736549395,
+        "lastModified": 1735049224,
-        "narHash": "sha256-XzwkB62Tt5UYoL1jXiHzgk/qz2fUpGHExcSIbyGTtI0=",
+        "narHash": "sha256-fWUd9kyXdepphJ7cCzOsuSo7l0kbFCkUqfgKqZyFZzE=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "a53af7f1514ef4cce8620a9d6a50f238cdedec8b",
+        "rev": "d16bbded0ae452bc088489e7dca3ef58d8d1830b",
         "type": "github"
       },
       "original": {
@@ -709,11 +713,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736154270,
+        "lastModified": 1735135567,
-        "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
+        "narHash": "sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q+T0BVeZE=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
+        "rev": "9e09d30a644c57257715902efbb3adc56c79cf28",
         "type": "github"
       },
       "original": {

hosts/atlas/default.nix

@@ -22,22 +22,29 @@
   users.extraGroups.vboxusers.members = [ "jordan" ];
 
   modules = {
-    programs = {
+    desktop = {
-      dev = {
+      apps = {
-        node.enable = true;
+        qbittorrent.enable = true;
+        thunderbird.enable = true;
       };
+      browsers = {
         firefox.enable = true;
-      git.enable = true;
+      };
-      gpg.enable = true;
+      media.graphics = {
-      graphics = {
         raster.enable = true;
         vector.enable = true;
       };
-      libreoffice.enable = true;
+      office.libreoffice.enable = true;
+    };
+    dev = {
+      node.enable = true;
+    };
+    editors = {
       neovim.enable = true;
+    };
+    security = {
+      gpg.enable = true;
       pass.enable = true;
-      qbittorrent.enable = true;
-      thunderbird.enable = true;
     };
     services = {
       borgmatic = {
@@ -49,6 +56,7 @@
       };
     };
     shell = {
+      git.enable = true;
       zsh.enable = true;
     };
   };

hosts/common.nix

@@ -4,8 +4,7 @@
   imports = [
     self.inputs.agenix.nixosModules.age
     self.inputs.home-manager.nixosModule
-    ../modules/home-manager
+    ../modules
-    ../modules/nixos
   ];
 
   nixpkgs.overlays = [

hosts/desktop.nix

@@ -52,8 +52,8 @@
   ];
 
   modules = {
-    system.desktop.gnome.enable = true;
+    desktop.gnome.enable = true;
-    services.tailscale.enable = true;
+    networking.tailscale.enable = true;
   };
 
   environment.systemPackages = with pkgs; [

hosts/eos/default.nix

@@ -25,18 +25,24 @@
   };
 
   modules = {
-    programs = {
+    desktop = {
+      apps.qbittorrent.enable = true;
+      browsers = {
+        firefox.enable = true;
+      };
+    };
     dev = {
       node.enable = true;
     };
-      firefox.enable = true;
+    editors = {
-      git.enable = true;
-      gpg.enable = true;
       neovim.enable = true;
+    };
+    security = {
+      gpg.enable = true;
       pass.enable = true;
-      qbittorrent.enable = true;
     };
     shell = {
+      git.enable = true;
       zsh.enable = true;
     };
   };

hosts/helios/default.nix

@@ -22,16 +22,21 @@
   };
 
   modules = {
-    programs = {
+    desktop = {
+      apps.qbittorrent.enable = true;
+      browsers = {
+        firefox.enable = true;
+      };
+    };
     dev = {
       node.enable = true;
     };
-      firefox.enable = true;
+    editors = {
-      git.enable = true;
-      gpg.enable = true;
       neovim.enable = true;
+    };
+    security = {
+      gpg.enable = true;
       pass.enable = true;
-      qbittorrent.enable = true;
     };
     services = {
       borgmatic = {
@@ -43,6 +48,7 @@
       };
     };
     shell = {
+      git.enable = true;
       zsh.enable = true;
     };
   };

hosts/hypnos/default.nix

@@ -30,7 +30,7 @@
       videoDrivers = [ "nvidia" ];
     };
     displayManager = {
-      defaultSession = if config.modules.system.desktop.kde.enable then "plasmax11" else "gnome-xorg";
+      defaultSession = if config.modules.desktop.kde.enable then "plasmax11" else "gnome-xorg";
       sddm.wayland.enable = lib.mkForce false;
     };
   };
@@ -39,20 +39,26 @@
   environment.sessionVariables.GSK_RENDERER = "gl";
 
   modules = {
-    programs = {
+    desktop = {
-      dev = {
+      browsers = {
-        node.enable = true;
-      };
         firefox.enable = true;
-      git.enable = true;
+      };
-      gpg.enable = true;
+      media.recording = {
-      neovim.enable = true;
-      pass.enable = true;
-      recording = {
         audio.enable = true;
       };
     };
+    dev = {
+      node.enable = true;
+    };
+    editors = {
+      neovim.enable = true;
+    };
+    security = {
+      gpg.enable = true;
+      pass.enable = true;
+    };
     shell = {
+      git.enable = true;
       zsh.enable = true;
     };
   };

hosts/library/default.nix

@@ -172,7 +172,7 @@
 
   modules = {
     podman.enable = true;
-    programs = {
+    security = {
       gpg.enable = true;
     };
     shell = {

hosts/odyssey/default.nix

@@ -50,10 +50,12 @@
   };
 
   modules = {
-    programs = {
+    desktop = {
-      dev = {
+      apps.qbittorrent.enable = true;
-        node.enable = true;
+      browsers = {
+        firefox.enable = true;
       };
+      gaming = {
         emulators = {
           gamecube.enable = true;
           ps2.enable = true;
@@ -62,25 +64,30 @@
           wii.enable = true;
           xbox.enable = true;
         };
-      firefox.enable = true;
+        lutris.enable = true;
-      git.enable = true;
+      };
-      gpg.enable = true;
+      media.graphics = {
-      graphics = {
         modeling.enable = true;
         raster.enable = true;
         vector.enable = true;
       };
-      libreoffice.enable = true;
+      media.recording = {
-      lutris.enable = true;
-      pass.enable = true;
-      neovim.enable = true;
-      qbittorrent.enable = true;
-      recording = {
         audio.enable = true;
         video.enable = true;
       };
+      office.libreoffice.enable = true;
+    };
+    dev = {
+      node.enable = true;
+    };
+    editors = {
+      neovim.enable = true;
     };
     hardware.presonus-studio.enable = true;
+    security = {
+      gpg.enable = true;
+      pass.enable = true;
+    };
     services = {
       borgmatic = {
         enable = true;
@@ -98,6 +105,7 @@
       gitea-runner.enable = true;
     };
     shell = {
+      git.enable = true;
       zsh.enable = true;
     };
   };

hosts/pi/default.nix

@@ -108,113 +108,8 @@
     pulse.enable = true;
   };
 
-  age.secrets."files/services/home-assistant/secrets.yaml" = {
-    file = "${self.inputs.secrets}/files/services/home-assistant/secrets.yaml.age";
-    path = "${config.services.home-assistant.configDir}/secrets.yaml";
-    owner = "hass";
-    group = "hass";
-  };
-
-  services.home-assistant = {
-    enable = true;
-    extraComponents = [
-      "api"
-      "alert"
-      "auth"
-      "backup"
-      "command_line"
-      "default_config"
-      "homekit_controller"
-      "homekit"
-      "http"
-      "icloud"
-      "jellyfin"
-      "metoffice"
-      "mqtt"
-      "onkyo"
-      "ping"
-      "proximity"
-      "radio_browser"
-      "scrape"
-      "sensor"
-      "system_health"
-    ];
-    config = {
-      default_config = {};
-      backup = {};
-      homeassistant = {
-        name = "Home";
-        latitude = "!secret latitude";
-        longitude = "!secret longitude";
-        country = "GB";
-        temperature_unit = "C";
-        time_zone = config.time.timeZone;
-        unit_system = "metric";
-      };
-      mqtt = { };
-      scene = "!include scenes.yaml";
-      automation = "!include automations.yaml";
-      system_health = { };
-      recorder = {
-        purge_keep_days = 365;
-      };
-    };
-  };
-
-  services.mosquitto = {
-    enable = true;
-    listeners = [{
-      acl = [ "pattern readwrite #" ];
-      omitPasswordAuth = true;
-      port = 1883;
-      settings = {
-        allow_anonymous = true;
-      };
-    }];
-  };
-
-  age.secrets."files/services/zigbee2mqtt/secret.yaml" = {
-    file = "${self.inputs.secrets}/files/services/zigbee2mqtt/secret.yaml.age";
-    path = "${config.services.zigbee2mqtt.dataDir}/secret.yaml";
-    owner = "zigbee2mqtt";
-    group = "zigbee2mqtt";
-  };
-
-  services.zigbee2mqtt = {
-    package = pkgs.unstable.zigbee2mqtt;
-    enable = true;
-    dataDir = "/var/lib/zigbee2mqtt";
-    settings = {
-      homeassistant = lib.optionalAttrs config.services.home-assistant.enable {
-        discovery_topic = "homeassistant";
-        status_topic = "hass/status";
-        legacy_entity_attributes = true;
-        legacy_triggers = true;
-      };
-      availability = true;
-      frontend = true;
-      device_options = {
-        retain = true;
-      };
-      serial = {
-        port = "/dev/serial/by-id/usb-Silicon_Labs_Sonoff_Zigbee_3.0_USB_Dongle_Plus_0001-if00-port0";
-      };
-      advanced = {
-        channel = 20;
-        network_key = "!secret.yaml network_key";
-        pan_id = 13001;
-        ext_pan_id = [ 79 1 73 47 250 136 124 222 ];
-        transmit_power = 20;
-      };
-      mqtt = {
-        version = 5;
-        server = "mqtt://localhost:1883";
-      };
-    };
-  };
-
   modules = {
-    system = {
+    networking = {
       wireless = {
         enable = true;
         interfaces = [ "wlan0" ];
@@ -223,12 +118,9 @@
     services = {
       borgmatic = {
         enable = true;
-        directories = [
-          "/var/lib/mosquitto"
-          "/var/lib/zigbee2mqtt"
-        ];
         repoPath = "ssh://qcw86s11@qcw86s11.repo.borgbase.com/./repo";
       };
+      home-assistant.enable = true;
     };
   };
 

hosts/server.nix

@@ -54,7 +54,7 @@
     ];
   };
 
-  modules.services.tailscale = {
+  modules.networking.tailscale = {
     enable = true;
     restrictSSH = false;
   };

hosts/vps1/default.nix

@@ -79,6 +79,7 @@
   };
 
   modules = rec {
+    databases.postgresql.enable = true;
     services = {
       borgmatic = {
         enable = true;
@@ -102,11 +103,10 @@
           signal = true;
           whatsapp = true;
         };
-        usePostgresql = services.postgresql.enable;
+        usePostgresql = databases.postgresql.enable;
       };
       nginx.enable = true;
       photoprism.enable = true;
-      postgresql.enable = true;
     };
   };
 

modules/databases/postgresql.nix

@@ -5,9 +5,9 @@
 }:
 
 let
-  cfg = config.modules.services.postgresql;
+  cfg = config.modules.databases.postgresql;
 in {
-  options.modules.services.postgresql = {
+  options.modules.databases.postgresql = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/default.nix

@@ -0,0 +1,54 @@
+{
+  imports = [
+    ./options.nix
+    ./podman.nix
+    ./databases/postgresql.nix
+    ./desktop/gnome.nix
+    ./desktop/forensics.nix
+    ./desktop/hyprland.nix
+    ./desktop/kde.nix
+    ./desktop/mimeapps.nix
+    ./desktop/apps/qbittorrent.nix
+    ./desktop/apps/slack.nix
+    ./desktop/apps/thunderbird.nix
+    ./desktop/apps/zoom.nix
+    ./desktop/browsers/brave.nix
+    ./desktop/browsers/firefox.nix
+    ./desktop/gaming/emulators.nix
+    ./desktop/gaming/lutris.nix
+    ./desktop/gaming/steam.nix
+    ./desktop/media/graphics.nix
+    ./desktop/media/recording.nix
+    ./desktop/office/libreoffice.nix
+    ./dev/cc.nix
+    ./dev/java.nix
+    ./dev/lua.nix
+    ./dev/node.nix
+    ./dev/python.nix
+    ./dev/rust.nix
+    ./dev/scala.nix
+    ./dev/shell.nix
+    ./dev/zig.nix
+    ./editors/neovim
+    ./editors/vscode.nix
+    ./hardware/presonus-studio.nix
+    ./networking/netbird.nix
+    ./networking/tailscale.nix
+    ./networking/wireless.nix
+    ./security/gpg.nix
+    ./security/pass.nix
+    ./services/borgmatic
+    ./services/chrony
+    ./services/coturn
+    ./services/gitea
+    ./services/gitea-runner
+    ./services/headscale
+    ./services/home-assistant
+    ./services/mail
+    ./services/matrix
+    ./services/nginx
+    ./services/photoprism
+    ./shell/git
+    ./shell/zsh
+  ];
+}

modules/desktop/apps/qbittorrent.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.programs.qbittorrent;
+let cfg = config.modules.desktop.apps.qbittorrent;
 in {
-  options.modules.programs.qbittorrent = {
+  options.modules.desktop.apps.qbittorrent = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/desktop/apps/slack.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.programs.slack;
+let cfg = config.modules.desktop.apps.slack;
 in {
-  options.modules.programs.slack = {
+  options.modules.desktop.apps.slack = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/desktop/apps/thunderbird.nix

@@ -1,8 +1,8 @@
 { config, lib, self, ... }:
 
-let cfg = config.modules.programs.thunderbird;
+let cfg = config.modules.desktop.apps.thunderbird;
 in {
-  options.modules.programs.thunderbird = {
+  options.modules.desktop.apps.thunderbird = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/desktop/apps/zoom.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.programs.zoom;
+let cfg = config.modules.desktop.apps.zoom;
 in {
-  options.modules.programs.zoom = {
+  options.modules.desktop.apps.zoom = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/desktop/browsers/brave.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.programs.brave;
+let cfg = config.modules.desktop.browsers.brave;
 in {
-  options.modules.programs.brave = {
+  options.modules.desktop.browsers.brave = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/desktop/browsers/firefox.nix

@@ -1,8 +1,8 @@
 { config, lib, self, ... }:
 
-let cfg = config.modules.programs.firefox;
+let cfg = config.modules.desktop.browsers.firefox;
 in {
-  options.modules.programs.firefox = {
+  options.modules.desktop.browsers.firefox = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/desktop/forensics.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.programs.forensics;
+let cfg = config.modules.desktop.forensics;
 in {
-  options.modules.programs.forensics = {
+  options.modules.desktop.forensics = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/desktop/gaming/emulators.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.programs.emulators;
+let cfg = config.modules.desktop.gaming.emulators;
 in {
-  options.modules.programs.emulators = {
+  options.modules.desktop.gaming.emulators = {
     ds.enable       = lib.mkOption {
       default = false;
       example = true;

modules/desktop/gaming/lutris.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.programs.lutris;
+let cfg = config.modules.desktop.gaming.lutris;
 in {
-  options.modules.programs.lutris = {
+  options.modules.desktop.gaming.lutris = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/desktop/gaming/steam.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.programs.steam;
+let cfg = config.modules.desktop.gaming.steam;
 in {
-  options.modules.programs.steam = {
+  options.modules.desktop.gaming.steam = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/desktop/gnome.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, self, ... }:
 
-let cfg = config.modules.system.desktop.gnome;
+let cfg = config.modules.desktop.gnome;
 in {
-  options.modules.system.desktop.gnome = {
+  options.modules.desktop.gnome = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/desktop/hyprland.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.system.desktop.hyprland;
+let cfg = config.modules.desktop.hyprland;
 in {
-  options.modules.system.desktop.hyprland = {
+  options.modules.desktop.hyprland = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/desktop/kde.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.system.desktop.kde;
+let cfg = config.modules.desktop.kde;
 in {
-  options.modules.system.desktop.kde = {
+  options.modules.desktop.kde = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/desktop/media/graphics.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.programs.graphics;
+let cfg = config.modules.desktop.media.graphics;
 in {
-  options.modules.programs.graphics = {
+  options.modules.desktop.media.graphics = {
     modeling.enable = lib.mkOption {
       default = false;
       example = true;

modules/desktop/media/recording.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.programs.recording;
+let cfg = config.modules.desktop.media.recording;
 in {
-  options.modules.programs.recording = {
+  options.modules.desktop.media.recording = {
     audio.enable = lib.mkOption {
       default = false;
       example = true;

modules/desktop/mimeapps.nix

@@ -1,11 +1,11 @@
 { config, lib, pkgs, ... }:
 
 let
-  cfg = config.modules.system.desktop.mimeapps;
+  cfg = config.modules.desktop.mimeapps;
   avApp = "io.github.celluloid_player.Celluloid.desktop";
   imageApp = "org.gnome.eog.desktop";
 in {
-  options.modules.system.desktop.mimeapps = {
+  options.modules.desktop.mimeapps = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/desktop/office/libreoffice.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 let
-  cfg = config.modules.programs.libreoffice;
+  cfg = config.modules.desktop.office.libreoffice;
   # libreoffice-gtk4 = pkgs.libreoffice.override {
   #   extraMakeWrapperArgs = [
   #     "--set SAL_USE_VCLPLUGIN gtk4"
@@ -20,7 +20,7 @@ let
   #   });
   # };
 in {
-  options.modules.programs.libreoffice = {
+  options.modules.desktop.office.libreoffice = {
     enable = lib.mkOption {
       default = false;
       example = true;
@@ -29,7 +29,7 @@ in {
 
   config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
-      (if config.modules.system.desktop.kde.enable == true then libreoffice-qt else libreoffice)
+      (if config.modules.desktop.kde.enable == true then libreoffice-qt else libreoffice)
       hunspell
       hunspellDicts.en-gb-large
       hunspellDicts.en-us-large

modules/dev/cc.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.programs.dev.cc;
+let cfg = config.modules.dev.cc;
 in {
-  options.modules.programs.dev.cc = {
+  options.modules.dev.cc = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/dev/java.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.programs.dev.java;
+let cfg = config.modules.dev.java;
 in {
-  options.modules.programs.dev.java = {
+  options.modules.dev.java = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/dev/lua.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.programs.dev.lua;
+let cfg = config.modules.dev.lua;
 in {
-  options.modules.programs.dev.lua = {
+  options.modules.dev.lua = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/dev/node.nix

@@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+
+let cfg = config.modules.dev.node;
+in {
+  options.modules.dev.node = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    user.packages = with pkgs; [
+      nodejs_latest
+    ];
+  };
+}

modules/dev/python.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.programs.dev.python;
+let cfg = config.modules.dev.python;
 in {
-  options.modules.programs.dev.python = {
+  options.modules.dev.python = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/dev/rust.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.programs.dev.rust;
+let cfg = config.modules.dev.rust;
 in {
-  options.modules.programs.dev.rust = {
+  options.modules.dev.rust = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/dev/scala.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.programs.dev.scala;
+let cfg = config.modules.dev.scala;
 in {
-  options.modules.programs.dev.scala = {
+  options.modules.dev.scala = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/dev/shell.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.programs.dev.shell;
+let cfg = config.modules.dev.shell;
 in {
-  options.modules.programs.dev.shell = {
+  options.modules.dev.shell = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/dev/zig.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.programs.dev.zig;
+let cfg = config.modules.dev.zig;
 in {
-  options.modules.programs.dev.zig = {
+  options.modules.dev.zig = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/editors/neovim/default.nix

@@ -1,9 +1,9 @@
 { config, lib, pkgs, ... }:
 
 let
-  cfg = config.modules.programs.neovim;
+  cfg = config.modules.editors.neovim;
 in {
-  options.modules.programs.neovim = {
+  options.modules.editors.neovim = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/editors/vscode.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.programs.vscode;
+let cfg = config.modules.editors.vscode;
 in {
-  options.modules.programs.vscode = {
+  options.modules.editors.vscode = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/default.nix

@@ -1,33 +0,0 @@
-{
-  imports = [
-    ./options.nix
-    ./programs/brave.nix
-    ./programs/dev/cc.nix
-    ./programs/dev/java.nix
-    ./programs/dev/lua.nix
-    ./programs/dev/node.nix
-    ./programs/dev/python.nix
-    ./programs/dev/rust.nix
-    ./programs/dev/scala.nix
-    ./programs/dev/shell.nix
-    ./programs/dev/zig.nix
-    ./programs/emulators.nix
-    ./programs/firefox.nix
-    ./programs/forensics.nix
-    ./programs/git
-    ./programs/gpg.nix
-    ./programs/graphics.nix
-    ./programs/libreoffice.nix
-    ./programs/lutris.nix
-    ./programs/neovim.nix
-    ./programs/pass.nix
-    ./programs/qbittorrent.nix
-    ./programs/recording.nix
-    ./programs/slack.nix
-    ./programs/steam.nix
-    ./programs/thunderbird.nix
-    ./programs/vscode.nix
-    ./programs/zoom.nix
-    ./shell/zsh
-  ];
-}

modules/home-manager/programs/dev/node.nix

@@ -1,17 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let cfg = config.modules.programs.dev.node;
-in {
-  options.modules.programs.dev.node = {
-    enable = lib.mkOption {
-      default = false;
-      example = true;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    user.packages = with pkgs; [
-      nodejs_22
-    ];
-  };
-}

modules/networking/netbird.nix

@@ -1,10 +1,10 @@
 { config, lib, self, ... }:
 
 let
-  cfg = config.modules.services.netbird;
+  cfg = config.modules.networking.netbird;
   hostname = config.networking.hostName;
 in {
-  options.modules.services.netbird = {
+  options.modules.networking.netbird = {
     enable = lib.mkEnableOption "netbird";
     coordinatorDomain = lib.mkOption {
       type = lib.types.str;

modules/networking/tailscale.nix

@@ -1,11 +1,11 @@
 { config, lib, pkgs, self, ... }:
 
 let
-  cfg = config.modules.services.tailscale;
+  cfg = config.modules.networking.tailscale;
   headscale = "https://headscale.vimium.net";
   hostname = config.networking.hostName;
 in {
-  options.modules.services.tailscale = {
+  options.modules.networking.tailscale = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/networking/wireless.nix

@@ -2,9 +2,9 @@
 
 with lib;
 
-let cfg = config.modules.system.wireless;
+let cfg = config.modules.networking.wireless;
 in {
-  options.modules.system.wireless = {
+  options.modules.networking.wireless = {
     enable = mkOption {
       default = false;
       example = true;

modules/nixos/default.nix

@@ -1,24 +0,0 @@
-{
-  imports = [
-    ./hardware/presonus-studio
-    ./podman.nix
-    ./services/borgmatic.nix
-    ./services/chrony.nix
-    ./services/coturn.nix
-    ./services/gitea.nix
-    ./services/gitea-runner.nix
-    ./services/headscale.nix
-    ./services/mail.nix
-    ./services/matrix.nix
-    ./services/netbird.nix
-    ./services/nginx.nix
-    ./services/photoprism.nix
-    ./services/postgresql.nix
-    ./services/tailscale.nix
-    ./system/desktop/gnome.nix
-    ./system/desktop/hyprland.nix
-    ./system/desktop/kde.nix
-    ./system/desktop/mimeapps.nix
-    ./system/wireless.nix
-  ];
-}

modules/options.nix

@@ -36,7 +36,7 @@ with lib;
       in {
         inherit name;
         isNormalUser = true;
-        extraGroups = [ "networkmanager" "wheel" "lxd" ];
+        extraGroups = [ "audio" "networkmanager" "wheel" "lxd" ];
         description = "Jordan Holt";
         useDefaultShell = true;
         openssh.authorizedKeys.keys = [

modules/security/gpg.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.programs.gpg;
+let cfg = config.modules.security.gpg;
 in {
-  options.modules.programs.gpg = {
+  options.modules.security.gpg = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/security/pass.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.programs.pass;
+let cfg = config.modules.security.pass;
 in {
-  options.modules.programs.pass = {
+  options.modules.security.pass = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/services/home-assistant/default.nix

@@ -0,0 +1,298 @@
+{ config, lib, pkgs, self, ... }:
+
+let
+  cfg = config.modules.services.home-assistant;
+in {
+  imports = [
+    ./floorplan/default.nix
+    ./mqtt.nix
+  ];
+
+  options.modules.services.home-assistant.enable = lib.mkEnableOption "home-assistant";
+
+  config = lib.mkIf cfg.enable {
+
+    age.secrets."files/services/home-assistant/secrets.yaml" = {
+      file = "${self.inputs.secrets}/files/services/home-assistant/secrets.yaml.age";
+      path = "${config.services.home-assistant.configDir}/secrets.yaml";
+      owner = "hass";
+      group = "hass";
+    };
+
+    services.home-assistant = {
+      enable = true;
+
+      config = {
+        automation = "!include automations.yaml";
+        backup = { };
+        binary_sensor = [ ];
+        default_config = { };
+        http = {
+          server_host = "::1";
+          trusted_proxies = [ "::1" ];
+          use_x_forwarded_for = true;
+        };
+        ffmpeg = { };
+        homeassistant = {
+          name = "Home";
+          latitude = "!secret latitude";
+          longitude = "!secret longitude";
+          country = "GB";
+          temperature_unit = "C";
+          time_zone = config.time.timeZone;
+          unit_system = "metric";
+          auth_providers = [
+            {
+              type = "trusted_networks";
+              trusted_networks = [
+                "100.64.0.0/10"
+                "127.0.0.1"
+              ];
+              allow_bypass_login = true;
+            }
+            {
+              type = "homeassistant";
+            }
+          ];
+        };
+        logger = {
+          default = "info";
+          logs = { };
+        };
+        lovelace = {
+          resources = [
+            {
+              url = "/local/nixos-lovelace-modulels/mushroom.js";
+              type = "module";
+            }
+          ];
+        };
+        media_player = [ ];
+        mobile_app = { };
+        onkyo = { };
+        open_meteo = { };
+        recorder = {
+          purge_keep_days = 365;
+        };
+        scene = "!include scenes.yaml";
+        script = "!include scripts.yaml";
+        sensor = [ ];
+        system_health = { };
+        zeroconf = { };
+      };
+
+      configDir = "/etc/home-assistant";
+
+      extraComponents = [
+        "air_quality"
+        "airly"
+        "alert"
+        "api"
+        "application_credentials"
+        "asuswrt"
+        "auth"
+        "automation"
+        "bayesian"
+        "binary_sensor"
+        # "blackbird"
+        "blueprint"
+        "bluetooth_adapters"
+        "bluetooth_le_tracker"
+        "button"
+        "calendar"
+        "camera"
+        "cast"
+        "cert_expiry"
+        "climate"
+        "co2signal"
+        "color_extractor"
+        "command_line"
+        "compensation"
+        "configurator"
+        "counter"
+        "cover"
+        "cpuspeed"
+        "default_config"
+        "demo"
+        "derivative"
+        "device_automation"
+        "device_sun_light_trigger"
+        "device_tracker"
+        "dlna_dmr"
+        "dlna_dms"
+        "dnsip"
+        "esphome"
+        "fail2ban"
+        "fan"
+        "feedreader"
+        "ffmpeg"
+        "file"
+        "file_upload"
+        "filesize"
+        "folder"
+        "folder_watcher"
+        "forecast_solar"
+        "frontend"
+        "gdacs"
+        "generic"
+        "generic_hygrostat"
+        "generic_thermostat"
+        "geo_json_events"
+        "geo_location"
+        "geo_rss_events"
+        "github"
+        "group"
+        "hardware"
+        "hdmi_cec"
+        "history_stats"
+        "homeassistant"
+        "homekit"
+        "homekit_controller"
+        "html5"
+        "http"
+        "humidifier"
+        "icloud"
+        "image_processing"
+        "input_boolean"
+        "input_button"
+        "input_datetime"
+        "input_number"
+        "input_select"
+        "input_text"
+        "integration"
+        "ios"
+        "jellyfin"
+        "light"
+        "local_calendar"
+        "local_file"
+        "local_ip"
+        "local_todo"
+        "lock"
+        "logentries"
+        "logger"
+        "lovelace"
+        "manual"
+        "manual_mqtt"
+        "matter"
+        "media_player"
+        "min_max"
+        "mjpeg"
+        "modern_forms"
+        "mold_indicator"
+        "moon"
+        "mysensors"
+        "network"
+        "nmap_tracker"
+        "notify"
+        "number"
+        "onboarding"
+        "onkyo"
+        "panel_custom"
+        "persistent_notification"
+        "person"
+        "ping"
+        "plant"
+        "prometheus"
+        "proximity"
+        "push"
+        "proximity"
+        "python_script"
+        "radio_browser"
+        "random"
+        "recorder"
+        "remote"
+        "repairs"
+        "rest"
+        "rest_command"
+        "rss_feed_template"
+        "scene"
+        "schedule"
+        "scrape"
+        "script"
+        "search"
+        "season"
+        "select"
+        "sense"
+        "sensor"
+        "sensorpush"
+        "shell_command"
+        "shopping_list"
+        "siren"
+        "smtp"
+        "snmp"
+        "sql"
+        "statistics"
+        "sun"
+        "switch"
+        "switch_as_x"
+        "system_health"
+        "system_log"
+        "systemmonitor"
+        "tag"
+        "tailscale"
+        "tcp"
+        "template"
+        "text"
+        "thread"
+        "threshold"
+        "time_date"
+        "timer"
+        "tod"
+        "todo"
+        "tomorrowio"
+        "trend"
+        "universal"
+        "upb"
+        "update"
+        "upnp"
+        "uptime"
+        "utility_meter"
+        "vacuum"
+        "vlc"
+        "vlc_telnet"
+        "wake_on_lan"
+        "water_heater"
+        "weather"
+        "websocket_api"
+        "wled"
+        "workday"
+        "worldclock"
+        "zone"
+      ];
+
+      extraPackages = python3Packages: with python3Packages; [
+        onkyo-eiscp
+        zeroconf
+      ];
+
+      customLovelaceModules = with pkgs.home-assistant-custom-lovelace-modules; [
+        bubble-card
+        button-card
+        mushroom
+        sankey-chart
+        universal-remote-card
+        # zigbee2mqtt-networkmap
+      ];
+    };
+
+    systemd.services.home-assistant.preStart = lib.mkForce "";
+
+    modules.services.borgmatic.directories = [
+      config.services.home-assistant.configDir
+    ];
+
+    services.nginx = {
+      enable = true;
+      virtualHosts."home.mesh.vimium.net" = {
+        forceSSL = false;
+        extraConfig = ''
+          proxy_buffering off;
+        '';
+        locations."/" = {
+          proxyPass = "http://[::1]:8123";
+          proxyWebsockets = true;
+        };
+      };
+    };
+  };
+}

modules/services/home-assistant/floorplan/default.nix

@@ -0,0 +1,92 @@
+{ config, lib, pkgs, ... }: 
+
+let
+  cfg = config.modules.services.home-assistant;
+in {
+  config = lib.mkIf cfg.enable {
+    services.home-assistant = {
+      config.lovelace.resources = [{
+        url = "/local/nixos-lovelace-modules/floorplan.js";
+        type = "module";
+      }];
+      customLovelaceModules = [
+        pkgs.ha-floorplan
+      ];
+    };
+
+    environment.etc."home-assistant/www/floorplan/style.css".source = ./style.css;
+    environment.etc."home-assistant/www/floorplan/config.yaml".text = builtins.toJSON {
+      image = {
+        location = "/local/floorplan/beetham.svg";
+        cache = false;
+      };
+      stylesheet = {
+        location = "/local/floorplan/style.css";
+        cache = false;
+      };
+
+      defaults = {
+        hover_action = "hover-info";
+        hold_action = "toggle";
+        tap_action = "more-info";
+      };
+
+      rules = [
+        {
+          name = "Rooms";
+          entities = [
+            {
+              entity = "light.bedroom_lamps";
+              element = "area.bedroom";
+            }
+            {
+              entity = "light.hallway_spots";
+              element = "area.hallway";
+            }
+            {
+              entity = "light.living_room_lamps";
+              element = "area.livingroom";
+            }
+            {
+              entity = "light.office_lamps";
+              element = "area.office";
+            }
+          ];
+          tap_action = "light.toggle";
+          state_action = {
+            service = "floorplan.class_set";
+            service_data = ''
+              if (entity.state === "on") {
+                return "light-on";
+              }
+              return "light-off";
+            '';
+          };
+        }
+        {
+          name = "Temperature";
+          entities = [
+            "sensor.motion_sensor_temperature"
+          ];
+          state_action = [
+            {
+              service = "floorplan.text_set";
+              service_data = ''
+                if (!isNaN(entity.state)) {
+                  return Math.round(entity.state * 10) / 10 + "°";
+                }
+                return "Unknown";
+              '';
+            }
+            {
+              service = "floorplan.class_set";
+              service_data = {
+                class = "static-temp";
+              };
+            }
+          ];
+        }
+      ];
+    };
+  };
+}

modules/services/home-assistant/floorplan/style.css

@@ -0,0 +1,27 @@
+#floorplan {
+  padding: 10px;
+}
+
+svg, svg * {
+  vector-effect: non-scaling-stroke !important;
+  pointer-events: all !important;
+}
+
+path[id*="area."].light-on {
+  opacity: 0 !important;
+}
+
+path[id*="area."] {
+  opacity: 0.5 !important;
+  transition: opacity .25s;
+  -moz-transition: opacity .25s;
+  -webkit-transition: opacity .25s;
+}
+
+svg tspan {
+  fill: var(--primary-text-color);
+}
+
+.static-temp, .static-temp tspan {
+  fill: #ffffff;
+}

modules/services/home-assistant/mqtt.nix

@@ -0,0 +1,75 @@
+{ config, lib, pkgs, self, ... }:
+
+let
+  cfg = config.modules.services.home-assistant;
+in {
+  config = lib.mkIf cfg.enable {
+    services.mosquitto = {
+      enable = true;
+      listeners = [{
+        acl = [ "pattern readwrite #" ];
+        omitPasswordAuth = true;
+        port = 1883;
+        settings = {
+          allow_anonymous = true;
+        };
+      }];
+    };
+
+    age.secrets."files/services/zigbee2mqtt/secret.yaml" = {
+      file = "${self.inputs.secrets}/files/services/zigbee2mqtt/secret.yaml.age";
+      path = "${config.services.zigbee2mqtt.dataDir}/secret.yaml";
+      owner = "zigbee2mqtt";
+      group = "zigbee2mqtt";
+    };
+
+    services.zigbee2mqtt = {
+      package = pkgs.unstable.zigbee2mqtt;
+      enable = true;
+      dataDir = "/var/lib/zigbee2mqtt";
+      settings = {
+        homeassistant = lib.optionalAttrs config.services.home-assistant.enable {
+          discovery_topic = "homeassistant";
+          status_topic = "hass/status";
+          legacy_entity_attributes = true;
+          legacy_triggers = true;
+        };
+        availability = true;
+        frontend = true;
+        device_options = {
+          retain = true;
+        };
+        serial = {
+          port = "/dev/serial/by-id/usb-Silicon_Labs_Sonoff_Zigbee_3.0_USB_Dongle_Plus_0001-if00-port0";
+        };
+        advanced = {
+          channel = 20;
+          network_key = "!secret.yaml network_key";
+          pan_id = 13001;
+          ext_pan_id = [ 79 1 73 47 250 136 124 222 ];
+          transmit_power = 20;
+        };
+        mqtt = {
+          version = 5;
+          server = "mqtt://localhost:1883";
+        };
+      };
+    };
+
+    modules.services.borgmatic.directories = [
+      config.services.mosquitto.dataDir
+      config.services.zigbee2mqtt.dataDir
+    ];
+
+    services.home-assistant = {
+      config.mqtt = {};
+      extraComponents = [
+        "mqtt"
+        "mqtt_eventstream"
+        "mqtt_json"
+        "mqtt_room"
+        "mqtt_statestream"
+      ];
+    };
+  };
+}

modules/shell/git/default.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.programs.git;
+let cfg = config.modules.shell.git;
 in {
-  options.modules.programs.git = {
+  options.modules.shell.git = {
     enable = lib.mkOption {
       default = false;
       example = true;

pkgs/ha-floorplan/package.nix

@@ -0,0 +1,38 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "floorplan";
+  version = "1.0.44";
+
+  src = fetchFromGitHub {
+    owner = "ExperienceLovelace";
+    repo = "ha-floorplan";
+    rev = "refs/tags/${version}";
+    hash = "sha256-ajEA47H9nFXVcuvhwkDsxc5YYQWMsUXqHQ3t6tuAaxc=";
+  };
+
+  npmDepsHash = "sha256-/6H3XMraD7/usZBwmQaCDpV2n1Eed+U+G0f2YnjyWgk=";
+
+  installPhase = ''
+    runHook preInstall
+    mkdir $out
+    cp -R dist/* $out/
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Floorplan for Home Assistant";
+    longDescription = ''
+      Bring new life to Home Assistant. By mapping entities to a SVG-object,
+      you're able to control devices, show states, calling services - and much
+      more. Add custom styling on top, to visualize whatever you can think of.
+      Your imagination just became the new limit.
+    '';
+    homepage = "https://github.com/ExperienceLovelace/ha-floorplan";
+    license = lib.licenses.asl20;
+  };
+}