From cd3628e1685c4e64b2cccbbc1f7c4e4b36882feb Mon Sep 17 00:00:00 2001 From: Noratrieb <48135649+Noratrieb@users.noreply.github.com> Date: Wed, 21 Aug 2024 13:49:02 +0200 Subject: [PATCH] Revert "Update" This reverts commit 9bf00e43aeaf6b7f8c8485e59d7014b4d2095942. Somehow firefox keeps crashing.... --- flake.lock | 30 +++++++++++++++--------------- home-manager/firefox.nix | 2 -- home-manager/vscode.nix | 1 + nixos/configuration.nix | 3 +-- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 3f164e4..b9b329e 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1719418488, + "narHash": "sha256-Hu75KIbGLJA8qe42rO5WkRQ+E+BuzjS42bNEZcy9zT8=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "607f969f5dca2dc100cbc53e24ab49ac24ef8987", "type": "github" }, "original": { @@ -47,11 +47,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1723814196, - "narHash": "sha256-TnKO6EY15WFKq8tXVDDul6QecYO5ammtRIpo8mbQiHY=", + "lastModified": 1719422193, + "narHash": "sha256-2qrVg5GSBmrj4vprXpS+lDGei2o4ezcFWxTK3/yomog=", "owner": "martinvonz", "repo": "jj", - "rev": "be35ab164cef578031809dbcecb0f311c2a19b28", + "rev": "35e0e4d133b0724d2be53fac28b2fa0bdc77d759", "type": "github" }, "original": { @@ -83,11 +83,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1719254875, + "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "type": "github" }, "original": { @@ -99,11 +99,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1720535198, - "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", + "lastModified": 1719234068, + "narHash": "sha256-1AjSIedDC/aERt24KsCUftLpVppW61S7awfjGe7bMio=", "owner": "nixos", "repo": "nixpkgs", - "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", + "rev": "90bd1b26e23760742fdcb6152369919098f05417", "type": "github" }, "original": { @@ -115,11 +115,11 @@ }, "nur": { "locked": { - "lastModified": 1723815900, - "narHash": "sha256-USeM2VAo6DDN8yq6Ve02+ZQB8bqqSBqBfOfkuOmtzUE=", + "lastModified": 1719427611, + "narHash": "sha256-MYurgW19a5TFlL1zqPWG73TllIOdUKGstGHPq5c3adw=", "owner": "nix-community", "repo": "NUR", - "rev": "4b5ae3627ff2bbe71adc1502f1321fcbb52006da", + "rev": "9dfa9e7493fea727c02b7b1e2a7f96cd13066022", "type": "github" }, "original": { diff --git a/home-manager/firefox.nix b/home-manager/firefox.nix index 9469200..cb9d6dc 100644 --- a/home-manager/firefox.nix +++ b/home-manager/firefox.nix @@ -1,8 +1,6 @@ { 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 6f83591..4fcd142 100644 --- a/home-manager/vscode.nix +++ b/home-manager/vscode.nix @@ -60,6 +60,7 @@ 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 bcd0ced..288d133 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -227,8 +227,7 @@ in vim wget curl - # Use firefox-beta to get 130 which contains the fix for https://bugzilla.mozilla.org/show_bug.cgi?id=1898476 - firefox-beta + firefox os-prober git (linuxKernel.packagesFor