Upgrade to NixOS 23.11 (#118)

gaelreyrol · Dec 15, 2023 · b5c229b · b5c229b
1 parent 2b6a64e
commit b5c229b
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 181 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,7 +2,7 @@
   description = "system configuration flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
     unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     master.url = "github:NixOS/nixpkgs/master";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
@@ -26,16 +26,10 @@
     };
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.05";
+      url = "github:nix-community/home-manager/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    sbomnix = {
-      url = "github:tiiuae/sbomnix";
-      inputs.nixpkgs.follows = "unstable";
-      inputs.treefmt-nix.follows = "treefmt-nix";
-    };
-
     udev-nix = {
       url = "github:gaelreyrol/udev-nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -48,7 +42,7 @@
     };
   };
 
-  outputs = inputs@{ self, nixpkgs, unstable, treefmt-nix, pre-commit-hooks, sbomnix, udev-nix, ... }:
+  outputs = inputs@{ self, nixpkgs, unstable, treefmt-nix, pre-commit-hooks, udev-nix, ... }:
     let
       myLib = import ./lib { inherit inputs; };
       config = {
@@ -62,9 +56,6 @@
           };
         })
         (final: prev: import ./overlays/packages { inherit final prev; })
-        (final: prev: {
-          sbomnix = sbomnix.packages."${prev.system}";
-        })
       ];
       forSystems = function:
         nixpkgs.lib.genAttrs [
@@ -110,8 +101,6 @@
             pkgs.unstable.actionlint
             pkgs.nix-tree
             pkgs.nix-du
-            pkgs.sbomnix.sbomnix
-            pkgs.sbomnix.vulnxscan
           ];
           inherit (self.checks."${system}".pre-commit-check) shellHook;
         };

diff --git a/hosts/pi0/configuration.nix b/hosts/pi0/configuration.nix
@@ -142,6 +142,31 @@
             measurement_poll_chunk = 1;
             tic_command_whitelist = "all";
           };
+          # Documentation: https://www.zigbee2mqtt.io/devices/LYWSD03MMC.html
+          "0xa4c138cdaeead363" = {
+            friendly_name = "Xiaomi LWSD03MMC (ATC_CDAEEA) - Living Room";
+            description = "This device is a temperature and humidity sensor.";
+            temperature_precision = 3;
+            temperature_calibration = 0;
+            humidity_precision = 3;
+            humidity_calibration = 0;
+          };
+          "0xa4c138c824c73de8" = {
+            friendly_name = "Xiaomi LWSD03MMC (ATC_CDAEEA) - Kitchen";
+            description = "This device is a temperature and humidity sensor.";
+            temperature_precision = 3;
+            temperature_calibration = 0;
+            humidity_precision = 3;
+            humidity_calibration = 0;
+          };
+          "0xa4c138f9ba317028" = {
+            friendly_name = "Xiaomi LWSD03MMC (ATC_CDAEEA) - Bedroom";
+            description = "This device is a temperature and humidity sensor.";
+            temperature_precision = 3;
+            temperature_calibration = 0;
+            humidity_precision = 3;
+            humidity_calibration = 0;
+          };
         };
       };
     };