flake.lock: Update

Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/a0c384e0a3b8bcaed30a6bcf3783f8a7c8b35be4?narHash=sha256-iYh6h8yueU8IyOfNclbiBG2%2BfBFcjjUfXm90ZBzk0c0%3D' (2024-11-20)
  → 'github:nix-community/disko/341482e2f4d888e3f60cae1c12c3df896e7230d8?narHash=sha256-i%2BUw8VOHzQe9YdNwKRbzvaPWLE07tYVqUDzSFTXhRgk%3D' (2024-11-27)
• Updated input 'firefox-gnome-theme':
    'github:rafaelmardojai/firefox-gnome-theme/823756d8ddd21cfd3a24a87dad402e490e0eb5ee?narHash=sha256-lf9MQs8%2BNUvQd8b5t%2B7c4kLqUQixGO9WwWcLa1XYuiQ%3D' (2024-11-03)
  → 'github:rafaelmardojai/firefox-gnome-theme/ef6ac4285eaac6053338a6240bc615902a839493?narHash=sha256-k7v5PE6OcqMkC/u7aokwcxKDmTKM%2BejiZGCsH9MK0s0%3D' (2024-11-28)
• Updated input 'home-manager':
    'github:nix-community/home-manager/aecd341dfead1c3ef7a3c15468ecd71e8343b7c6?narHash=sha256-FmYTkIyPBUxSWgA7DPIVTsCCMvSSbs56yOtHpLNSnKg%3D' (2024-11-17)
  → 'github:nix-community/home-manager/f3111f62a23451114433888902a55cf0692b408d?narHash=sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c%3D' (2024-11-24)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/672ac2ac86f7dff2f6f3406405bddecf960e0db6?narHash=sha256-UhWmEZhwJZmVZ1jfHZFzCg%2BZLO9Tb/v3Y6LC0UNyeTo%3D' (2024-11-16)
  → 'github:NixOS/nixos-hardware/45348ad6fb8ac0e8415f6e5e96efe47dd7f39405?narHash=sha256-kF6rDeCshoCgmQz%2B7uiuPdREVFuzhIorGOoPXMalL2U%3D' (2024-11-24)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/057f63b6dc1a2c67301286152eb5af20747a9cb4?narHash=sha256-v5P3dk5JdiT%2B4x69ZaB18B8%2BRcu3TIOrcdG4uEX7WZ8%3D' (2024-11-16)
  → 'github:NixOS/nixpkgs/0c582677378f2d9ffcb01490af2f2c678dcb29d3?narHash=sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4%3D' (2024-11-23)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/23e89b7da85c3640bbc2173fe04f4bd114342367?narHash=sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w%3D' (2024-11-19)
  → 'github:NixOS/nixpkgs/4633a7c72337ea8fd23a4f2ba3972865e3ec685d?narHash=sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0%3D' (2024-11-25)
• Updated input 'nixvim':
    'github:nix-community/nixvim/2f71c4250bef7a52fe21bd00d1e58c119f62008c?narHash=sha256-lh2Qi8gd1SwJVGo7gJjoFvS/djS5Nimaw25j792PJjM%3D' (2024-11-20)
  → 'github:nix-community/nixvim/fc9178d124eba824f1862513314d351784e1a84c?narHash=sha256-gvCPgtcXGf/GZaJBHYrXuM5r2pFRG3VDr7uOb7B1748%3D' (2024-11-27)
• Updated input 'nixvim/home-manager':
    'github:nix-community/home-manager/a46e702093a5c46e192243edbd977d5749e7f294?narHash=sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo%3D' (2024-11-19)
  → 'github:nix-community/home-manager/a9953635d7f34e7358d5189751110f87e3ac17da?narHash=sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A%3D' (2024-11-24)
• Updated input 'nixvim/nix-darwin':
    'github:lnl7/nix-darwin/61cee20168a3ebb71a9efd70a55adebaadfbe4d4?narHash=sha256-XwXUK%2BmeYnlhdQz2TVE4Wv%2Btsx1CkdGbDPt1tRzCNH4%3D' (2024-11-19)
  → 'github:lnl7/nix-darwin/6ab87b7c84d4ee873e937108c4ff80c015a40c7a?narHash=sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8%3D' (2024-11-26)
• Updated input 'nixvim/treefmt-nix':
    'github:numtide/treefmt-nix/62003fdad7a5ab7b6af3ea9bd7290e4c220277d0?narHash=sha256-XWHuPWcP59QnHEewdZJXBX1TA2lAP78Vz4daG6tfIr4%3D' (2024-11-20)
  → 'github:numtide/treefmt-nix/84637a7ab04179bdc42aa8fd0af1909fba76ad0c?narHash=sha256-uI7TXEb231o8dkwB5AUCecx3AQtosRmL6hKgnckvjps%3D' (2024-11-26)
• Updated input 'plasma-manager':
    'github:nix-community/plasma-manager/f33173b9d22e554a6f869626bc01808d35995257?narHash=sha256-pGF8L5g9QpkQtJP9JmNIRNZfcyhJHf7uT%2Bd8tqI1h6Y%3D' (2024-11-09)
  → 'github:nix-community/plasma-manager/06e3209d11797d9c741e25df06ab61048746bf93?narHash=sha256-kFtXjoCIqx9xe0ZryPXpqS6l/HVg71aNcuL8Y5e8%2BpI%3D' (2024-11-26)
• Updated input 'thunderbird-gnome-theme':
    'github:rafaelmardojai/thunderbird-gnome-theme/628fcccb7788e3e0ad34f67114f563c87ac8c1dc?narHash=sha256-BHW9jlx92CsHY84FT0ce5Vxl0KFheLhNn2vndcIf7no%3D' (2024-07-25)
  → 'github:rafaelmardojai/thunderbird-gnome-theme/1994e7ec0649053e2a0811973245758d41e33f5f?narHash=sha256-i0Uo5EN45rlGuR85hvPet43zW/thOQTwHypVg9shTHU%3D' (2024-11-26)

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2025 by Jordan Holt <jordan@vimium.com>
+Copyright (C) 2023 by Jordan Holt <jordan@vimium.com>
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted.

README.md

@@ -6,8 +6,8 @@ System and user configuration for NixOS-based systems.
 |-|-|
 | **Shell:** | zsh |
 | **DE:** | GNOME |
-| **Theme:** | Adwaita |
+| **Theme:** | adwaita |
-| **Terminal:** | Ptyxis |
+| **Terminal:** | Console |
 
 ## Provisioning a new host
 > [nixos-anywhere](https://github.com/nix-community/nixos-anywhere) is the module used

flake.lock

@@ -107,11 +107,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735468753,
+        "lastModified": 1732742778,
-        "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=",
+        "narHash": "sha256-i+Uw8VOHzQe9YdNwKRbzvaPWLE07tYVqUDzSFTXhRgk=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21",
+        "rev": "341482e2f4d888e3f60cae1c12c3df896e7230d8",
         "type": "github"
       },
       "original": {
@@ -123,11 +123,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1735511798,
+        "lastModified": 1732798888,
-        "narHash": "sha256-U9WjPisByrvw8Kt6Ufg9kLrvg7uHPsFSyG93GR3I1iE=",
+        "narHash": "sha256-k7v5PE6OcqMkC/u7aokwcxKDmTKM+ejiZGCsH9MK0s0=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "097c98cb4a7568f6f83a43e37950c08b575dd126",
+        "rev": "ef6ac4285eaac6053338a6240bc615902a839493",
         "type": "github"
       },
       "original": {
@@ -190,11 +190,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733312601,
+        "lastModified": 1730504689,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
         "type": "github"
       },
       "original": {
@@ -238,11 +238,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734797603,
+        "lastModified": 1732021966,
-        "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=",
+        "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498",
+        "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
         "type": "github"
       },
       "original": {
@@ -318,11 +318,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735344290,
+        "lastModified": 1732466619,
-        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
+        "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
+        "rev": "f3111f62a23451114433888902a55cf0692b408d",
         "type": "github"
       },
       "original": {
@@ -340,16 +340,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1735344290,
+        "lastModified": 1732482255,
-        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
+        "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
+        "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -406,11 +405,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735218083,
+        "lastModified": 1732603785,
-        "narHash": "sha256-MoUAbmXz9TEr7zlKDRO56DBJHe30+7B5X7nhXm+Vpc8=",
+        "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "bc03f7818771a75716966ce8c23110b715eff2aa",
+        "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a",
         "type": "github"
       },
       "original": {
@@ -421,11 +420,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1735388221,
+        "lastModified": 1732483221,
-        "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=",
+        "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "7c674c6734f61157e321db595dbfcd8523e04e19",
+        "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
         "type": "github"
       },
       "original": {
@@ -441,14 +440,14 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-24_11": "nixpkgs-24_11"
+        "nixpkgs-24_05": "nixpkgs-24_05"
       },
       "locked": {
-        "lastModified": 1735230346,
+        "lastModified": 1722877200,
-        "narHash": "sha256-zgR8NTiNDPVNrfaiOlB9yHSmCqFDo7Ks2IavaJ2dZo4=",
+        "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "dc0569066e79ae96184541da6fa28f35a33fbf7b",
+        "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
         "type": "gitlab"
       },
       "original": {
@@ -473,28 +472,28 @@
         "type": "github"
       }
     },
-    "nixpkgs-24_11": {
+    "nixpkgs-24_05": {
       "locked": {
-        "lastModified": 1734083684,
+        "lastModified": 1717144377,
-        "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
+        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
+        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-24.11",
+        "ref": "nixos-24.05",
         "type": "indirect"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1735471104,
+        "lastModified": 1732521221,
-        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
+        "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
+        "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
         "type": "github"
       },
       "original": {
@@ -521,11 +520,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1735669367,
+        "lastModified": 1732350895,
-        "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=",
+        "narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9",
+        "rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3",
         "type": "github"
       },
       "original": {
@@ -549,16 +548,15 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1735389157,
+        "lastModified": 1732726573,
-        "narHash": "sha256-3co5A7PUEN+Bm7b3/6BxFsmvplg3XYUNR2MzWnheZoE=",
+        "narHash": "sha256-gvCPgtcXGf/GZaJBHYrXuM5r2pFRG3VDr7uOb7B1748=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "c8fa65c6ac35dba157de0873d645ab398c370123",
+        "rev": "fc9178d124eba824f1862513314d351784e1a84c",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "nixos-24.11",
         "repo": "nixvim",
         "type": "github"
       }
@@ -573,11 +571,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733773348,
+        "lastModified": 1731936508,
-        "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=",
+        "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9",
+        "rev": "fe07070f811b717a4626d01fab714a87d422a9e1",
         "type": "github"
       },
       "original": {
@@ -596,11 +594,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735049224,
+        "lastModified": 1732639391,
-        "narHash": "sha256-fWUd9kyXdepphJ7cCzOsuSo7l0kbFCkUqfgKqZyFZzE=",
+        "narHash": "sha256-kFtXjoCIqx9xe0ZryPXpqS6l/HVg71aNcuL8Y5e8+pI=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "d16bbded0ae452bc088489e7dca3ef58d8d1830b",
+        "rev": "06e3209d11797d9c741e25df06ab61048746bf93",
         "type": "github"
       },
       "original": {
@@ -713,11 +711,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735135567,
+        "lastModified": 1732643199,
-        "narHash": "sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q+T0BVeZE=",
+        "narHash": "sha256-uI7TXEb231o8dkwB5AUCecx3AQtosRmL6hKgnckvjps=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "9e09d30a644c57257715902efbb3adc56c79cf28",
+        "rev": "84637a7ab04179bdc42aa8fd0af1909fba76ad0c",
         "type": "github"
       },
       "original": {

flake.nix

@@ -33,7 +33,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixvim = {
-      url = "github:nix-community/nixvim/nixos-24.11";
+      url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     plasma-manager = {

hosts/odyssey/default.nix

@@ -1,5 +1,7 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 
+let streamrip = pkgs.callPackage ../../pkgs/streamrip/package.nix { };
+in
 {
   imports = [
     ./hardware-configuration.nix
@@ -49,6 +51,10 @@
     };
   };
 
+  environment.systemPackages = [
+    streamrip
+  ];
+
   modules = {
     desktop = {
       apps.qbittorrent.enable = true;

hosts/pi/default.nix

@@ -108,6 +108,111 @@
     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 = {
     networking = {
       wireless = {
@@ -118,9 +223,12 @@
     services = {
       borgmatic = {
         enable = true;
+        directories = [
+          "/var/lib/mosquitto"
+          "/var/lib/zigbee2mqtt"
+        ];
         repoPath = "ssh://qcw86s11@qcw86s11.repo.borgbase.com/./repo";
       };
-      home-assistant.enable = true;
     };
   };
 

hosts/pi/hardware-configuration.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, modulesPath, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
   imports = [
@@ -6,40 +6,6 @@
   ];
 
   boot = {
-    kernelPackages = let
-      version = "6.1.73";
-      tag = "stable_20240124";
-      srcHash = "sha256-P4ExzxWqZj+9FZr9U2tmh7rfs/3+iHEv0m74PCoXVuM=";
-      in pkgs.linuxPackagesFor (pkgs.linux_rpi4.override {
-        argsOverride = {
-          src = pkgs.fetchFromGitHub {
-            owner = "raspberrypi";
-            repo = "linux";
-            rev = tag;
-            hash = srcHash;
-          };
-          version = version;
-          modDirVersion = version;
-          structuredExtraConfig = {};
-          kernelPatches = [
-            {
-              name = "drm-rp1-depends-on-instead-of-select-MFD_RP1.patch";
-              patch = pkgs.fetchpatch {
-                url = "https://github.com/peat-psuwit/rpi-linux/commit/6de0bb51929cd3ad4fa27b2a421a2af12e6468f5.patch";
-                hash = "sha256-9pHcbgWTiztu48SBaLPVroUnxnXMKeCGt5vEo9V8WGw=";
-              };
-            }
-            {
-              name = "iommu-bcm2712-don-t-allow-building-as-module.patch";
-              patch = pkgs.fetchpatch {
-                url = "https://github.com/peat-psuwit/rpi-linux/commit/693a5e69bddbcbe1d1b796ebc7581c3597685b1b.patch";
-                hash = "sha256-8BYYQDM5By8cTk48ASYKJhGVQnZBIK4PXtV70UtfS+A=";
-              };
-            }
-          ];
-        };
-      });
-
     # Stop ZFS kernel being built
     supportedFilesystems = lib.mkForce [ "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs" ];
     tmp.cleanOnBoot = true;
@@ -48,24 +14,9 @@
   # Fix missing modules
   # https://github.com/NixOS/nixpkgs/issues/154163
   nixpkgs.overlays = [
-    (final: prev: {
+    (final: super: {
       makeModulesClosure = x:
-        prev.makeModulesClosure (x // { allowMissing = true; });
+        super.makeModulesClosure (x // { allowMissing = true; });
-    })
-    (final: prev: {
-      raspberrypifw = let
-        version = "1.20240529";
-        srcHash = "sha256-KsCo7ZG6vKstxRyFljZtbQvnDSqiAPdUza32xTY/tlA=";
-        in pkgs.raspberrypifw.override {
-          argsOverride = {
-            src = prev.fetchFromGitHub {
-              owner = "raspberrypi";
-              repo = "firmware";
-              rev = "${version}";
-              hash = srcHash;
-            };
-          };
-        };
     })
   ];
 

modules/default.nix

@@ -43,7 +43,6 @@
     ./services/gitea
     ./services/gitea-runner
     ./services/headscale
-    ./services/home-assistant
     ./services/mail
     ./services/matrix
     ./services/nginx

modules/desktop/gnome.nix

@@ -24,11 +24,6 @@ in {
       "io/github/celluloid-player/celluloid" = {
         draggable-video-area-enable = true;
       };
-      "org/gnome/Console" = {
-        font-scale = 1.4;
-        use-system-font = false;
-        custom-font = "ComicShannsMono Nerd Font 10";
-      };
       "org/gnome/desktop/interface" = {
         color-scheme = "prefer-dark";
         cursor-theme = "Adwaita";
@@ -66,11 +61,6 @@ in {
         edge-tiling = true;
         experimental-features = [ "scale-monitor-framebuffer" ];
       };
-      "org/gnome/Ptyxis" = {
-        use-system-font = false;
-        font-name = "ComicShannsMono Nerd Font 11";
-        audible-bell = false;
-      };
       "org/gnome/settings-daemon/plugins/media-keys" = {
         volume-up = [
           "<Shift>F12"
@@ -118,7 +108,6 @@ in {
         favorite-apps = [
           "firefox.desktop"
           "org.gnome.Nautilus.desktop"
-          "org.gnome.Ptyxis.desktop"
         ];
       };
       "org/gnome/shell/extensions/blur-my-shell/panel" = {
@@ -192,6 +181,11 @@ in {
         outer-gaps = 8;
         enable-blur-snap-assistant = true;
       };
+      "org/gnome/Console" = {
+        font-scale = 1.4;
+        use-system-font = false;
+        custom-font = "ComicShannsMono Nerd Font 10";
+      };
       "org/gtk/settings/file-chooser" = {
         show-hidden = true;
         sort-directories-first = true;
@@ -234,7 +228,6 @@ in {
       # mission-center
       mousam
       newsflash
-      ptyxis
       # schemes
       shortwave
       sysprof
@@ -270,7 +263,7 @@ in {
       gnomeExtensions.just-perfection
       gnomeExtensions.media-controls
       gnomeExtensions.mouse-follows-focus
-      # gnomeExtensions.pano (disabled due to: https://github.com/NixOS/nixpkgs/issues/369438)
+      gnomeExtensions.pano
       gnomeExtensions.paperwm
       gnomeExtensions.pip-on-top
       gnomeExtensions.search-light

modules/options.nix

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

modules/services/home-assistant/default.nix

@@ -1,298 +0,0 @@
-{ 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

@@ -1,92 +0,0 @@
-{ 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

@@ -1,27 +0,0 @@
-#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

@@ -1,75 +0,0 @@
-{ 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"
-      ];
-    };
-  };
-}

overlays/gnome.nix

@@ -9,7 +9,7 @@ final: prev:
   mutter = prev.mutter.overrideAttrs (attrs: {
     src = prev.fetchurl {
       url = "https://gitlab.gnome.org/Community/Ubuntu/mutter/-/archive/triple-buffering-v4-47/mutter-triple-buffering-v4-47.tar.gz";
-      sha256 = "oeykTJRcG/SY83U8RYnyFFZ8zKqoyXvtbaS2f/s503U=";
+      sha256 = "U5YPJ3kfTMZWhpwsKpGcw02g+i7k+cPQdDjOYkvpwTM=";
     };
 
     postPatch = ''

pkgs/ha-floorplan/package.nix

@@ -1,38 +0,0 @@
-{
-  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;
-  };
-}

pkgs/streamrip/ensure-the-default-config-file-is-writable.patch

@@ -0,0 +1,26 @@
+From 18efb9b5c8e562b169425f6ba79977e52e8b91b9 Mon Sep 17 00:00:00 2001
+From: Pavel Sobolev <paveloomm@gmail.com>
+Date: Sat, 13 Jan 2024 12:49:45 +0000
+Subject: [PATCH] Ensure the default config file is writable.
+
+---
+ streamrip/config.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/streamrip/config.py b/streamrip/config.py
+index 7ee2f57..88a5fef 100644
+--- a/streamrip/config.py
++++ b/streamrip/config.py
+@@ -378,6 +378,9 @@ def set_user_defaults(path: str, /):
+     """Update the TOML file at the path with user-specific default values."""
+     shutil.copy(BLANK_CONFIG_PATH, path)
+
++    # Ensure the default config file is writable
++    os.chmod(path, 0o644)
++
+     with open(path) as f:
+         toml = parse(f.read())
+     toml["downloads"]["folder"] = DEFAULT_DOWNLOADS_FOLDER  # type: ignore
+--
+2.42.0
+

pkgs/streamrip/package.nix

@@ -0,0 +1,78 @@
+{ lib
+, python3Packages
+, fetchFromGitHub
+
+, ffmpeg
+}:
+
+python3Packages.buildPythonApplication {
+  pname = "streamrip";
+  version = "2.0.7";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "nathom";
+    repo = "streamrip";
+    rev = "46b570dbb6f81d604cbaa3bfa379463e0a20a841";
+    hash = "sha256-LD99OjguaBnrQxCwmCeHvmBMq5aOfobwnMd5/aCRZW8=";
+  };
+
+  patches = [
+    ./ensure-the-default-config-file-is-writable.patch
+  ];
+
+  nativeBuildInputs = with python3Packages; [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = with python3Packages; [
+    aiodns
+    aiofiles
+    aiohttp
+    aiolimiter
+    appdirs
+    cleo
+    click-help-colors
+    deezer-py
+    m3u8
+    mutagen
+    pathvalidate
+    pillow
+    pycryptodomex
+    pytest-asyncio
+    pytest-mock
+    rich
+    simple-term-menu
+    tomlkit
+    tqdm
+  ];
+
+  nativeCheckInputs = with python3Packages; [
+    pytestCheckHook
+  ];
+
+  prePatch = ''
+    sed -i 's#aiofiles = ".*"#aiofiles = "*"#' pyproject.toml
+    sed -i 's#deezer-py = ".*"#deezer-py = "*"#' pyproject.toml
+    sed -i 's#m3u8 = ".*"#m3u8 = "*"#' pyproject.toml
+    sed -i 's#pathvalidate = ".*"#pathvalidate = "*"#' pyproject.toml
+    sed -i 's#Pillow = ".*"#Pillow = "*"#' pyproject.toml
+    sed -i 's#pytest-asyncio = ".*"#pytest-asyncio = "*"#' pyproject.toml
+    sed -i 's#tomlkit = ".*"#tomlkit = "*"#' pyproject.toml
+
+    sed -i 's#"ffmpeg"#"${lib.getBin ffmpeg}/bin/ffmpeg"#g' streamrip/client/downloadable.py
+  '';
+
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
+  meta = with lib; {
+    description = "Scriptable music downloader for Qobuz, Tidal, SoundCloud, and Deezer";
+    homepage = "https://github.com/nathom/streamrip";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ paveloom ];
+    mainProgram = "rip";
+  };
+}
+