mayushii: Work around broken DP Alt Mode hotplug

This only downgrades the kernel, so that is not a long term option, but at least makes it possible to not reboot twice a day or so.
pkgs/osu-lazer: Rebase patches
2023-01-10 17:49:16 +01:00 · 2023-01-10 17:49:16 +01:00 · 2023-01-10 17:49:16 +01:00 · 2023-01-10 17:49:16 +01:00
5 changed files with 39 additions and 36 deletions
--- a/flake.lock
+++ b/flake.lock
@ -83,11 +83,11 @@
        "utils": "utils"
      },
      "locked": {
-        "lastModified": 1670253003,
-        "narHash": "sha256-/tJIy4+FbsQyslq1ipyicZ2psOEd8dvl4OJ9lfisjd0=",
+        "lastModified": 1672244468,
+        "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "0e8125916b420e41bf0d23a0aa33fadd0328beb3",
+        "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706",
        "type": "github"
      },
      "original": {
@ -171,11 +171,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1672050129,
-        "narHash": "sha256-GBQMcvJUSwAVOpDjVKzB6D5mmHI7Y4nFw+04bnS9QrM=",
+        "lastModified": 1672912243,
+        "narHash": "sha256-QnQeKUjco2kO9J4rBqIBPp5XcOMblIMnmyhpjeaJBYc=",
        "owner": "cachix",
        "repo": "pre-commit-hooks.nix",
-        "rev": "67d98f02443b9928bc77f1267741dcfdd3d7b65c",
+        "rev": "a4548c09eac4afb592ab2614f4a150120b29584c",
        "type": "github"
      },
      "original": {
@ -187,11 +187,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1671631481,
-        "narHash": "sha256-LP6NvQQNKdqDpXngECo6oCiWfYRb0KPGM5+D5lu7mPw=",
+        "lastModified": 1672644464,
+        "narHash": "sha256-RYlvRMcQNT7FDoDkViijQBHg9g+blsB+U6AvL/gAsPI=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "9577ab1eaf01a738b015a7a7ab2a4616e158b6cd",
+        "rev": "ca29e25c39b8e117d4d76a81f1e229824a9b3a26",
        "type": "github"
      },
      "original": {
@ -203,11 +203,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1671883564,
-        "narHash": "sha256-C15oAtyupmLB3coZY7qzEHXjhtUx/+77olVdqVMruAg=",
+        "lastModified": 1672968032,
+        "narHash": "sha256-26Jns3GmHem44a06UN5Rj/KOD9qNJThyQrom02Ijur8=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "dac57a4eccf1442e8bf4030df6fcbb55883cb682",
+        "rev": "2dea8991d89b9f1e78d874945f78ca15f6954289",
        "type": "github"
      },
      "original": {
@ -219,11 +219,11 @@
    },
    "nixpkgs-2205": {
      "locked": {
-        "lastModified": 1671813978,
-        "narHash": "sha256-oo4we+9IO1D+QS1mOSNh08l9ABDPWLyqvNC0DD0QtZM=",
+        "lastModified": 1672580127,
+        "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "79e63f30ed2ff36cd0d9c2f7dadae5925c1a65db",
+        "rev": "0874168639713f547c05947c76124f78441ea46c",
        "type": "github"
      },
      "original": {
@ -277,11 +277,11 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1671923641,
-        "narHash": "sha256-flPauiL5UrfRJD+1oAcEefpEIUqTqnyKScWe/UUU+lE=",
+        "lastModified": 1673100377,
+        "narHash": "sha256-mT76pTd0YFxT6CwtPhDgHJhuIgLY+ZLSMiQpBufwMG4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "939c05a176b8485971463c18c44f48e56a7801c9",
+        "rev": "9f11a2df77cb945c115ae2a65f53f38121597d73",
        "type": "github"
      },
      "original": {
@ -293,11 +293,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1671983799,
-        "narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=",
+        "lastModified": 1672953546,
+        "narHash": "sha256-oz757DnJ1ITvwyTovuwG3l9cX6j9j6/DH9eH+cXFJmc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "fad51abd42ca17a60fc1d4cb9382e2d79ae31836",
+        "rev": "a518c77148585023ff56022f09c4b2c418a51ef5",
        "type": "github"
      },
      "original": {
@ -396,11 +396,11 @@
        "nixpkgs-stable": "nixpkgs-stable_2"
      },
      "locked": {
-        "lastModified": 1671937829,
-        "narHash": "sha256-YtaNB+mLw0d67JFYNjRWM+/AL3JCXuD/DGlnTlyX1tY=",
+        "lastModified": 1673147300,
+        "narHash": "sha256-gR9OEfTzWfL6vG0qkbn1TlBAOlg4LuW8xK/u0V41Ihc=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "855b8d51fc3991bd817978f0f093aa6ae0fae738",
+        "rev": "2253120d2a6147e57bafb5c689e086221df8032f",
        "type": "github"
      },
      "original": {
--- a/machines/mayushii/hardware-configuration.nix
+++ b/machines/mayushii/hardware-configuration.nix
@ -7,6 +7,9 @@

  boot = {
    kernelModules = [ "kvm-amd" ];
+    # Workaround for DP Alt Mode hotplug not working in kernel (https://git.sbruder.de/simon/nixos-config/issues/69).
+    # requires mkForce because of nixos-hardware setting it to linuxPackages_latst
+    kernelPackages = lib.mkForce pkgs.linuxPackages_6_0;
    loader = {
      grub.enable = false;
      systemd-boot.enable = true;
--- a/machines/renge/services/matrix/synapse.nix
+++ b/machines/renge/services/matrix/synapse.nix
@ -49,7 +49,7 @@ in

      # adapted from https://github.com/NixOS/nixpkgs/blob/7e10bf4327491a6ebccbe1aaa8e6c6c0aca4663a/nixos/modules/services/misc/matrix-synapse-log_config.yaml
      #  - set root.level to WARNING instead of INFO
-      logConfig = builtins.toJSON {
+      log_config = pkgs.writeText "log_config.yaml" (builtins.toJSON {
        version = 1;

        formatters.journal_fmt.format = "%(name)s: [%(request)s] %(message)s";
@ -72,7 +72,7 @@ in
        };

        disable_existing_loggers = false;
-      };
+      });

      max_upload_size = "50M";

--- a/pkgs/osu-lazer/0001-Disable-deployed-build.patch
+++ b/pkgs/osu-lazer/0001-Disable-deployed-build.patch
@ -1,4 +1,4 @@
-From ba1b9a0549968992b34093f587fde5570dd4dfe2 Mon Sep 17 00:00:00 2001
+From fcf66151219e26ac5ab50aecc37af84a52d949a1 Mon Sep 17 00:00:00 2001
 From: Simon Bruder <simon@sbruder.de>
 Date: Fri, 9 Apr 2021 12:01:42 +0200
 Subject: [PATCH 1/2] Disable deployed build
@ -9,10 +9,10 @@ It shows warnings at startup which prolong the time it takes to start.
 1 file changed, 1 insertion(+), 4 deletions(-)

 diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
-index 3b81b5c8cd..856b7a0039 100644
+index 36e248c1f2..f6ba27bed5 100644
 --- a/osu.Game/OsuGameBase.cs
 +++ b/osu.Game/OsuGameBase.cs
-@@ -98,7 +98,7 @@ public partial class OsuGameBase : Framework.Game, ICanAcceptFiles, IBeatSyncPro
+@@ -108,7 +108,7 @@ public partial class OsuGameBase : Framework.Game, ICanAcceptFiles, IBeatSyncPro
         /// </summary>
         public string VersionHash { get; private set; }
 
@ -21,7 +21,7 @@ index 3b81b5c8cd..856b7a0039 100644
 
         internal const string BUILD_SUFFIX = "lazer";
 
-@@ -106,9 +106,6 @@ public virtual string Version
+@@ -116,9 +116,6 @@ public virtual string Version
         {
             get
             {
@ -32,5 +32,5 @@ index 3b81b5c8cd..856b7a0039 100644
                 return $@"{version.Major}.{version.Minor}.{version.Build}-{BUILD_SUFFIX}";
             }
 -- 
-2.36.0
+2.38.1

--- a/pkgs/osu-lazer/0002-Remove-random-song-button-from-footer.patch
+++ b/pkgs/osu-lazer/0002-Remove-random-song-button-from-footer.patch
@ -1,4 +1,4 @@
-From 9e2055a56686cfb0231915289bf977a590d5b10d Mon Sep 17 00:00:00 2001
+From 5281678cb08ed3e665966f9558167697989dca64 Mon Sep 17 00:00:00 2001
 From: Simon Bruder <simon@sbruder.de>
 Date: Fri, 9 Apr 2021 12:02:44 +0200
 Subject: [PATCH 2/2] Remove random song button from footer
@ -9,10 +9,10 @@ I often click it accidentally.
 1 file changed, 5 deletions(-)

 diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
-index 7abcbfca42..7bbfac6a85 100644
+index f4804c6a6c..dafc0e53f7 100644
 --- a/osu.Game/Screens/Select/SongSelect.cs
 +++ b/osu.Game/Screens/Select/SongSelect.cs
-@@ -305,11 +305,6 @@ protected override void LoadComplete()
+@@ -321,11 +321,6 @@ protected override bool OnScroll(ScrollEvent e)
         protected virtual IEnumerable<(FooterButton, OverlayContainer)> CreateFooterButtons() => new (FooterButton, OverlayContainer)[]
         {
             (new FooterButtonMods { Current = Mods }, ModSelect),
@ -21,9 +21,9 @@ index 7abcbfca42..7bbfac6a85 100644
 -                NextRandom = () => Carousel.SelectNextRandom(),
 -                PreviousRandom = Carousel.SelectPreviousRandom
 -            }, null),
-             (new FooterButtonOptions(), BeatmapOptions)
+             (beatmapOptionsButton = new FooterButtonOptions(), BeatmapOptions)
         };
 
 -- 
-2.36.0
+2.38.1
Author	SHA1	Message	Date
Simon Bruder	58ab5ad884	mayushii: Work around broken DP Alt Mode hotplug This only downgrades the kernel, so that is not a long term option, but at least makes it possible to not reboot twice a day or so.	2023-01-10 17:49:16 +01:00
Simon Bruder	c2c8e70f1e	pkgs/osu-lazer: Rebase patches	2023-01-10 17:49:16 +01:00
Simon Bruder	3a5236fb76	flake.lock: Update Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/0e8125916b420e41bf0d23a0aa33fadd0328beb3' (2022-12-05) → 'github:nix-community/home-manager/89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706' (2022-12-28) • Updated input 'nix-pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/67d98f02443b9928bc77f1267741dcfdd3d7b65c' (2022-12-26) → 'github:cachix/pre-commit-hooks.nix/a4548c09eac4afb592ab2614f4a150120b29584c' (2023-01-05) • Updated input 'nixos-hardware': 'github:nixos/nixos-hardware/9577ab1eaf01a738b015a7a7ab2a4616e158b6cd' (2022-12-21) → 'github:nixos/nixos-hardware/ca29e25c39b8e117d4d76a81f1e229824a9b3a26' (2023-01-02) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/dac57a4eccf1442e8bf4030df6fcbb55883cb682' (2022-12-24) → 'github:nixos/nixpkgs/2dea8991d89b9f1e78d874945f78ca15f6954289' (2023-01-06) • Updated input 'nixpkgs-2205': 'github:nixos/nixpkgs/79e63f30ed2ff36cd0d9c2f7dadae5925c1a65db' (2022-12-23) → 'github:nixos/nixpkgs/0874168639713f547c05947c76124f78441ea46c' (2023-01-01) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/fad51abd42ca17a60fc1d4cb9382e2d79ae31836' (2022-12-25) → 'github:nixos/nixpkgs/a518c77148585023ff56022f09c4b2c418a51ef5' (2023-01-05) • Updated input 'sops-nix': 'github:Mic92/sops-nix/855b8d51fc3991bd817978f0f093aa6ae0fae738' (2022-12-25) → 'github:Mic92/sops-nix/2253120d2a6147e57bafb5c689e086221df8032f' (2023-01-08) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/939c05a176b8485971463c18c44f48e56a7801c9' (2022-12-24) → 'github:NixOS/nixpkgs/9f11a2df77cb945c115ae2a65f53f38121597d73' (2023-01-07)	2023-01-10 17:49:16 +01:00
Simon Bruder	d1a29ef2dd	renge/synapse: Fix synapse log config The parameter name changed, which lead to synapse ignoring the wrong config option.	2023-01-10 17:49:16 +01:00