From 9bf00e43aeaf6b7f8c8485e59d7014b4d2095942 Mon Sep 17 00:00:00 2001
From: Noratrieb <48135649+Noratrieb@users.noreply.github.com>
Date: Wed, 21 Aug 2024 13:48:34 +0200
Subject: [PATCH] Update

Since this brings in new NVidia drivers, also update Firefox to beta
130, which fixes the bug with it.
---
 flake.lock               | 30 +++++++++++++++---------------
 home-manager/firefox.nix |  2 ++
 home-manager/vscode.nix  |  1 -
 nixos/configuration.nix  |  3 ++-
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index b9b329e..3f164e4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -25,11 +25,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719418488,
-        "narHash": "sha256-Hu75KIbGLJA8qe42rO5WkRQ+E+BuzjS42bNEZcy9zT8=",
+        "lastModified": 1723399884,
+        "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "607f969f5dca2dc100cbc53e24ab49ac24ef8987",
+        "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
         "type": "github"
       },
       "original": {
@@ -47,11 +47,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1719422193,
-        "narHash": "sha256-2qrVg5GSBmrj4vprXpS+lDGei2o4ezcFWxTK3/yomog=",
+        "lastModified": 1723814196,
+        "narHash": "sha256-TnKO6EY15WFKq8tXVDDul6QecYO5ammtRIpo8mbQiHY=",
         "owner": "martinvonz",
         "repo": "jj",
-        "rev": "35e0e4d133b0724d2be53fac28b2fa0bdc77d759",
+        "rev": "be35ab164cef578031809dbcecb0f311c2a19b28",
         "type": "github"
       },
       "original": {
@@ -83,11 +83,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1719254875,
-        "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=",
+        "lastModified": 1723637854,
+        "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60",
+        "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
         "type": "github"
       },
       "original": {
@@ -99,11 +99,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1719234068,
-        "narHash": "sha256-1AjSIedDC/aERt24KsCUftLpVppW61S7awfjGe7bMio=",
+        "lastModified": 1720535198,
+        "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "90bd1b26e23760742fdcb6152369919098f05417",
+        "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5",
         "type": "github"
       },
       "original": {
@@ -115,11 +115,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1719427611,
-        "narHash": "sha256-MYurgW19a5TFlL1zqPWG73TllIOdUKGstGHPq5c3adw=",
+        "lastModified": 1723815900,
+        "narHash": "sha256-USeM2VAo6DDN8yq6Ve02+ZQB8bqqSBqBfOfkuOmtzUE=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "9dfa9e7493fea727c02b7b1e2a7f96cd13066022",
+        "rev": "4b5ae3627ff2bbe71adc1502f1321fcbb52006da",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/firefox.nix b/home-manager/firefox.nix
index cb9d6dc..9469200 100644
--- a/home-manager/firefox.nix
+++ b/home-manager/firefox.nix
@@ -1,6 +1,8 @@
 { pkgs, ... }: {
   programs.firefox = {
     enable = true;
+    # see configuration.nix
+    package = pkgs.firefox-beta;
     profiles = {
       nils = {
         id = 0;
diff --git a/home-manager/vscode.nix b/home-manager/vscode.nix
index 4fcd142..6f83591 100644
--- a/home-manager/vscode.nix
+++ b/home-manager/vscode.nix
@@ -60,7 +60,6 @@
       ms-vscode.cmake-tools
       ms-vscode.cpptools
       ms-vscode.hexeditor
-      nvarner.typst-lsp
       redhat.vscode-yaml
       rust-lang.rust-analyzer
       tamasfe.even-better-toml
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 288d133..bcd0ced 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -227,7 +227,8 @@ in
     vim
     wget
     curl
-    firefox
+    # Use firefox-beta to get 130 which contains the fix for https://bugzilla.mozilla.org/show_bug.cgi?id=1898476
+    firefox-beta
     os-prober
     git
     (linuxKernel.packagesFor