Compare commits
No commits in common. "58ab5ad884af260dd750866380ef98d784892a83" and "4d99a4a232fcb9de37285a2ec64192ca33c1b2ee" have entirely different histories.
58ab5ad884
...
4d99a4a232
48
flake.lock
48
flake.lock
|
@ -83,11 +83,11 @@
|
||||||
"utils": "utils"
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1672244468,
|
"lastModified": 1670253003,
|
||||||
"narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=",
|
"narHash": "sha256-/tJIy4+FbsQyslq1ipyicZ2psOEd8dvl4OJ9lfisjd0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706",
|
"rev": "0e8125916b420e41bf0d23a0aa33fadd0328beb3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -171,11 +171,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1672912243,
|
"lastModified": 1672050129,
|
||||||
"narHash": "sha256-QnQeKUjco2kO9J4rBqIBPp5XcOMblIMnmyhpjeaJBYc=",
|
"narHash": "sha256-GBQMcvJUSwAVOpDjVKzB6D5mmHI7Y4nFw+04bnS9QrM=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "pre-commit-hooks.nix",
|
"repo": "pre-commit-hooks.nix",
|
||||||
"rev": "a4548c09eac4afb592ab2614f4a150120b29584c",
|
"rev": "67d98f02443b9928bc77f1267741dcfdd3d7b65c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -187,11 +187,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1672644464,
|
"lastModified": 1671631481,
|
||||||
"narHash": "sha256-RYlvRMcQNT7FDoDkViijQBHg9g+blsB+U6AvL/gAsPI=",
|
"narHash": "sha256-LP6NvQQNKdqDpXngECo6oCiWfYRb0KPGM5+D5lu7mPw=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "ca29e25c39b8e117d4d76a81f1e229824a9b3a26",
|
"rev": "9577ab1eaf01a738b015a7a7ab2a4616e158b6cd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -203,11 +203,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1672968032,
|
"lastModified": 1671883564,
|
||||||
"narHash": "sha256-26Jns3GmHem44a06UN5Rj/KOD9qNJThyQrom02Ijur8=",
|
"narHash": "sha256-C15oAtyupmLB3coZY7qzEHXjhtUx/+77olVdqVMruAg=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2dea8991d89b9f1e78d874945f78ca15f6954289",
|
"rev": "dac57a4eccf1442e8bf4030df6fcbb55883cb682",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -219,11 +219,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-2205": {
|
"nixpkgs-2205": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1672580127,
|
"lastModified": 1671813978,
|
||||||
"narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=",
|
"narHash": "sha256-oo4we+9IO1D+QS1mOSNh08l9ABDPWLyqvNC0DD0QtZM=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0874168639713f547c05947c76124f78441ea46c",
|
"rev": "79e63f30ed2ff36cd0d9c2f7dadae5925c1a65db",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -277,11 +277,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable_2": {
|
"nixpkgs-stable_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1673100377,
|
"lastModified": 1671923641,
|
||||||
"narHash": "sha256-mT76pTd0YFxT6CwtPhDgHJhuIgLY+ZLSMiQpBufwMG4=",
|
"narHash": "sha256-flPauiL5UrfRJD+1oAcEefpEIUqTqnyKScWe/UUU+lE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9f11a2df77cb945c115ae2a65f53f38121597d73",
|
"rev": "939c05a176b8485971463c18c44f48e56a7801c9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -293,11 +293,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1672953546,
|
"lastModified": 1671983799,
|
||||||
"narHash": "sha256-oz757DnJ1ITvwyTovuwG3l9cX6j9j6/DH9eH+cXFJmc=",
|
"narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a518c77148585023ff56022f09c4b2c418a51ef5",
|
"rev": "fad51abd42ca17a60fc1d4cb9382e2d79ae31836",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -396,11 +396,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable_2"
|
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1673147300,
|
"lastModified": 1671937829,
|
||||||
"narHash": "sha256-gR9OEfTzWfL6vG0qkbn1TlBAOlg4LuW8xK/u0V41Ihc=",
|
"narHash": "sha256-YtaNB+mLw0d67JFYNjRWM+/AL3JCXuD/DGlnTlyX1tY=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "2253120d2a6147e57bafb5c689e086221df8032f",
|
"rev": "855b8d51fc3991bd817978f0f093aa6ae0fae738",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -7,9 +7,6 @@
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
kernelModules = [ "kvm-amd" ];
|
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 = {
|
loader = {
|
||||||
grub.enable = false;
|
grub.enable = false;
|
||||||
systemd-boot.enable = true;
|
systemd-boot.enable = true;
|
||||||
|
|
|
@ -49,7 +49,7 @@ in
|
||||||
|
|
||||||
# adapted from https://github.com/NixOS/nixpkgs/blob/7e10bf4327491a6ebccbe1aaa8e6c6c0aca4663a/nixos/modules/services/misc/matrix-synapse-log_config.yaml
|
# 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
|
# - set root.level to WARNING instead of INFO
|
||||||
log_config = pkgs.writeText "log_config.yaml" (builtins.toJSON {
|
logConfig = builtins.toJSON {
|
||||||
version = 1;
|
version = 1;
|
||||||
|
|
||||||
formatters.journal_fmt.format = "%(name)s: [%(request)s] %(message)s";
|
formatters.journal_fmt.format = "%(name)s: [%(request)s] %(message)s";
|
||||||
|
@ -72,7 +72,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
disable_existing_loggers = false;
|
disable_existing_loggers = false;
|
||||||
});
|
};
|
||||||
|
|
||||||
max_upload_size = "50M";
|
max_upload_size = "50M";
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From fcf66151219e26ac5ab50aecc37af84a52d949a1 Mon Sep 17 00:00:00 2001
|
From ba1b9a0549968992b34093f587fde5570dd4dfe2 Mon Sep 17 00:00:00 2001
|
||||||
From: Simon Bruder <simon@sbruder.de>
|
From: Simon Bruder <simon@sbruder.de>
|
||||||
Date: Fri, 9 Apr 2021 12:01:42 +0200
|
Date: Fri, 9 Apr 2021 12:01:42 +0200
|
||||||
Subject: [PATCH 1/2] Disable deployed build
|
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(-)
|
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||||
|
|
||||||
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
|
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
|
||||||
index 36e248c1f2..f6ba27bed5 100644
|
index 3b81b5c8cd..856b7a0039 100644
|
||||||
--- a/osu.Game/OsuGameBase.cs
|
--- a/osu.Game/OsuGameBase.cs
|
||||||
+++ b/osu.Game/OsuGameBase.cs
|
+++ b/osu.Game/OsuGameBase.cs
|
||||||
@@ -108,7 +108,7 @@ public partial class OsuGameBase : Framework.Game, ICanAcceptFiles, IBeatSyncPro
|
@@ -98,7 +98,7 @@ public partial class OsuGameBase : Framework.Game, ICanAcceptFiles, IBeatSyncPro
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string VersionHash { get; private set; }
|
public string VersionHash { get; private set; }
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ index 36e248c1f2..f6ba27bed5 100644
|
||||||
|
|
||||||
internal const string BUILD_SUFFIX = "lazer";
|
internal const string BUILD_SUFFIX = "lazer";
|
||||||
|
|
||||||
@@ -116,9 +116,6 @@ public virtual string Version
|
@@ -106,9 +106,6 @@ public virtual string Version
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
|
@ -32,5 +32,5 @@ index 36e248c1f2..f6ba27bed5 100644
|
||||||
return $@"{version.Major}.{version.Minor}.{version.Build}-{BUILD_SUFFIX}";
|
return $@"{version.Major}.{version.Minor}.{version.Build}-{BUILD_SUFFIX}";
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.38.1
|
2.36.0
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 5281678cb08ed3e665966f9558167697989dca64 Mon Sep 17 00:00:00 2001
|
From 9e2055a56686cfb0231915289bf977a590d5b10d Mon Sep 17 00:00:00 2001
|
||||||
From: Simon Bruder <simon@sbruder.de>
|
From: Simon Bruder <simon@sbruder.de>
|
||||||
Date: Fri, 9 Apr 2021 12:02:44 +0200
|
Date: Fri, 9 Apr 2021 12:02:44 +0200
|
||||||
Subject: [PATCH 2/2] Remove random song button from footer
|
Subject: [PATCH 2/2] Remove random song button from footer
|
||||||
|
@ -9,10 +9,10 @@ I often click it accidentally.
|
||||||
1 file changed, 5 deletions(-)
|
1 file changed, 5 deletions(-)
|
||||||
|
|
||||||
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
|
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
|
||||||
index f4804c6a6c..dafc0e53f7 100644
|
index 7abcbfca42..7bbfac6a85 100644
|
||||||
--- a/osu.Game/Screens/Select/SongSelect.cs
|
--- a/osu.Game/Screens/Select/SongSelect.cs
|
||||||
+++ b/osu.Game/Screens/Select/SongSelect.cs
|
+++ b/osu.Game/Screens/Select/SongSelect.cs
|
||||||
@@ -321,11 +321,6 @@ protected override bool OnScroll(ScrollEvent e)
|
@@ -305,11 +305,6 @@ protected override void LoadComplete()
|
||||||
protected virtual IEnumerable<(FooterButton, OverlayContainer)> CreateFooterButtons() => new (FooterButton, OverlayContainer)[]
|
protected virtual IEnumerable<(FooterButton, OverlayContainer)> CreateFooterButtons() => new (FooterButton, OverlayContainer)[]
|
||||||
{
|
{
|
||||||
(new FooterButtonMods { Current = Mods }, ModSelect),
|
(new FooterButtonMods { Current = Mods }, ModSelect),
|
||||||
|
@ -21,9 +21,9 @@ index f4804c6a6c..dafc0e53f7 100644
|
||||||
- NextRandom = () => Carousel.SelectNextRandom(),
|
- NextRandom = () => Carousel.SelectNextRandom(),
|
||||||
- PreviousRandom = Carousel.SelectPreviousRandom
|
- PreviousRandom = Carousel.SelectPreviousRandom
|
||||||
- }, null),
|
- }, null),
|
||||||
(beatmapOptionsButton = new FooterButtonOptions(), BeatmapOptions)
|
(new FooterButtonOptions(), BeatmapOptions)
|
||||||
};
|
};
|
||||||
|
|
||||||
--
|
--
|
||||||
2.38.1
|
2.36.0
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue