From 2278e3dfc0a4b3afcb5bfc16d7788eeb0ee6831e Mon Sep 17 00:00:00 2001 From: Seven of Nine Date: Mon, 6 May 2024 13:01:48 +0000 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nur': 'github:nix-community/NUR/ef30d0069c3c60af06abad41ddc03c1f220bae1a' (2024-05-06) → 'github:nix-community/NUR/532ff1c86747cae69dc6a8868e8a82d13cf662ab' (2024-05-06) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 59f2448..3d32763 100644 --- a/flake.lock +++ b/flake.lock @@ -1289,11 +1289,11 @@ }, "nur": { "locked": { - "lastModified": 1714998905, - "narHash": "sha256-E681Yw09lX4FOxaTauVL4oIiiJ34r6YyZwrmlHGUNq4=", + "lastModified": 1715000276, + "narHash": "sha256-KOOmBuUjRfFklNkezaks0uYJ8dtI4T+9U213scQCKLA=", "owner": "nix-community", "repo": "NUR", - "rev": "ef30d0069c3c60af06abad41ddc03c1f220bae1a", + "rev": "532ff1c86747cae69dc6a8868e8a82d13cf662ab", "type": "github" }, "original": { From d8a874ffa78a25d128d27d64241404503cebdb1c Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Mon, 6 May 2024 15:28:03 +0200 Subject: [PATCH 2/3] Workaround for `ddcci-driver` on Linux 6.8 --- hosts/picard/default.nix | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index 82918d7..624d03f 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -94,7 +94,27 @@ "ddci" "ddcci-backlight" ]; - boot.extraModulePackages = [config.boot.kernelPackages.ddcci-driver]; + + # fix to support linux 6.8 + # FIXME check https://github.com/NixOS/nixpkgs/pull/297430 + boot.extraModulePackages = let + ddci-driver = config.boot.kernelPackages.ddcci-driver.overrideAttrs (_: { + patches = [ + (pkgs.fetchpatch { + url = "https://gitlab.com/Sweenu/ddcci-driver-linux/-/commit/7f851f5fb8fbcd7b3a93aaedff90b27124e17a7e.patch"; + sha256 = "sha256-Y1ktYaJTd9DtT/mwDqtjt/YasW9cVm0wI43wsQhl7Bg="; + }) + ]; + }); + in [ddci-driver]; + + systemd.services.ddcci = { + serviceConfig.Type = "oneshot"; + script = '' + sleep 20 + echo 'ddcci 0x37' > /sys/bus/i2c/devices/i2c-2/new_device + ''; + }; boot.loader.efi.canTouchEfiVariables = true; boot.loader.systemd-boot = { From 089d336015461d394bb34e758f19781f8bd5bfa6 Mon Sep 17 00:00:00 2001 From: Seven of Nine Date: Tue, 7 May 2024 13:01:57 +0000 Subject: [PATCH 3/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/e1b3ae2b4ebc3c7b83154b9361e3d154e64e362d' (2024-05-06) → 'github:nix-community/disko/4677f6c53482a8b01ee93957e3bdd569d51261d6' (2024-05-07) • Updated input 'homeManager': 'github:nix-community/home-manager/6ebe7be2e67be7b9b54d61ce5704f6fb466c536f' (2024-05-06) → 'github:nix-community/home-manager/6e277d9566de9976f47228dd8c580b97488734d4' (2024-05-07) • Updated input 'nixosHardware': 'github:NixOS/nixos-hardware/e148ccbecbd2fe4dc4768fba67f6db828466ad06' (2024-05-06) → 'github:NixOS/nixos-hardware/d1659c9eb8af718118fb4bbe2c86797c8b8623eb' (2024-05-06) • Updated input 'nixpkgsStable': 'github:NixOS/nixpkgs/651b4702e27a388f0f18e1b970534162dec09aff' (2024-05-04) → 'github:NixOS/nixpkgs/27c13997bf450a01219899f5a83bd6ffbfc70d3c' (2024-05-06) • Updated input 'nur': 'github:nix-community/NUR/ef30d0069c3c60af06abad41ddc03c1f220bae1a' (2024-05-06) → 'github:nix-community/NUR/4cfdb90950c4d47f1c1d38ba1d1a0a945024bd00' (2024-05-07) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 59f2448..2e9450b 100644 --- a/flake.lock +++ b/flake.lock @@ -81,11 +81,11 @@ ] }, "locked": { - "lastModified": 1714959124, - "narHash": "sha256-oYmauPDpSgWjY9hvzwd815igGfP8Ds5Bk6bTo5JrBRk=", + "lastModified": 1715070411, + "narHash": "sha256-5CNvkH0Nf7yMwgKhjUNg/lUK40C7DXB4zKOuA2jVO90=", "owner": "nix-community", "repo": "disko", - "rev": "e1b3ae2b4ebc3c7b83154b9361e3d154e64e362d", + "rev": "4677f6c53482a8b01ee93957e3bdd569d51261d6", "type": "github" }, "original": { @@ -668,11 +668,11 @@ ] }, "locked": { - "lastModified": 1714981474, - "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", + "lastModified": 1715077503, + "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", "owner": "nix-community", "repo": "home-manager", - "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", + "rev": "6e277d9566de9976f47228dd8c580b97488734d4", "type": "github" }, "original": { @@ -853,11 +853,11 @@ }, "nixosHardware": { "locked": { - "lastModified": 1714984131, - "narHash": "sha256-kjIvFbbKb6RGIJyOgcF+BBWHNzhNSNqRTxX/SkrkRno=", + "lastModified": 1715010655, + "narHash": "sha256-FmdhvR/hgBkPDvIv/HOEIQsSMaVXh8wvTrnep8dF3Jc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e148ccbecbd2fe4dc4768fba67f6db828466ad06", + "rev": "d1659c9eb8af718118fb4bbe2c86797c8b8623eb", "type": "github" }, "original": { @@ -1044,11 +1044,11 @@ }, "nixpkgsStable": { "locked": { - "lastModified": 1714782413, - "narHash": "sha256-tbg0MEuKaPcUrnmGCu4xiY5F+7LW2+ECPKVAJd2HLwM=", + "lastModified": 1714971268, + "narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "651b4702e27a388f0f18e1b970534162dec09aff", + "rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c", "type": "github" }, "original": { @@ -1289,11 +1289,11 @@ }, "nur": { "locked": { - "lastModified": 1714998905, - "narHash": "sha256-E681Yw09lX4FOxaTauVL4oIiiJ34r6YyZwrmlHGUNq4=", + "lastModified": 1715085636, + "narHash": "sha256-pIZ5IwKX/UFdrO6qIKc7siCgjFhBM+q2uPZIDEFu9Ys=", "owner": "nix-community", "repo": "NUR", - "rev": "ef30d0069c3c60af06abad41ddc03c1f220bae1a", + "rev": "4cfdb90950c4d47f1c1d38ba1d1a0a945024bd00", "type": "github" }, "original": {