From 5391f2b201e62b1b4cfe5913b93fde9da42e1cfa Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Sat, 19 Nov 2022 17:47:07 +0100 Subject: [PATCH] Update flake.lock, trying the firefox package again --- flake.lock | 112 ++++++++++++++++------- home-manager/modules/firefox/default.nix | 2 +- 2 files changed, 82 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index cf0580f..6b09e62 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1668431094, - "narHash": "sha256-rW2ebnScAWl/hEBDds6TX8cDpq+4XomGc6tG9SDqxoA=", + "lastModified": 1668861223, + "narHash": "sha256-Y7Jc7n79h7vl7WGDohiSTpc4xdUx/B2n19+zMNjj0js=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9b1df30f4c14bef457f8de6733b281441f5ba22c", + "rev": "909b090c1181644ef3def6a37a18e9e3d08d1b07", "type": "github" }, "original": { @@ -38,27 +38,41 @@ "type": "github" } }, + "flake-utils_2": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "ha-now-playing": { "inputs": { + "flake-utils": "flake-utils_2", "naersk": [ "naersk" ], "nixpkgs": [ "nixpkgs" ], + "pre-commit-hooks": "pre-commit-hooks", "rust-overlay": [ "rust-overlay" - ], - "utils": [ - "flake-utils" ] }, "locked": { - "lastModified": 1667641550, - "narHash": "sha256-jw2JzAFUaWrsckRETykLaO3h2FQN6d0tHMJ3LBKx2eU=", + "lastModified": 1668761963, + "narHash": "sha256-EQmTnDsvtQ2tsNoHZaPJijjOShyg9N3htU+krSkoArI=", "ref": "main", - "rev": "15dea9bbe932148fbea8790079d563184b388c2a", - "revCount": 60, + "rev": "66be98a0181a4cdc6bfbb45440412422c316c0e0", + "revCount": 62, "type": "git", "url": "https://git.datarift.nl/erwin/ha-now-playing.git" }, @@ -76,11 +90,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1668332334, - "narHash": "sha256-YT1qcE/MCqBO1Bi/Yr6GcFpNKsvmzrBKh8juyXDbxQc=", + "lastModified": 1668788863, + "narHash": "sha256-FsdUG+YkRX7JZKZm6T44J2h+0pXB1sWA9AobyiozFK0=", "owner": "nix-community", "repo": "home-manager", - "rev": "bc90de24d898655542589237cc0a6ada7564cb6c", + "rev": "948d1f8a5cef55a281d4f5d17f3b79df6c82fce1", "type": "github" }, "original": { @@ -97,11 +111,11 @@ "wlroots": "wlroots" }, "locked": { - "lastModified": 1668427933, - "narHash": "sha256-yYNJ9Py4op+bCzuy4j1f0KZnEDhWVTukj3RsKcZhpYk=", + "lastModified": 1668863695, + "narHash": "sha256-PFNI4C5W5GjTwwnewSbTTSg7NTrBYcwBFR8RgxJb0t4=", "owner": "Hyprwm", "repo": "Hyprland", - "rev": "fcb5037a1d22d05d9f58b8a43d75b1870d93b896", + "rev": "0ffaa8d6673c02e9360865c8cde69a606c036af7", "type": "github" }, "original": { @@ -153,11 +167,11 @@ ] }, "locked": { - "lastModified": 1666812839, - "narHash": "sha256-0nBDgjPU+iDsvz89W+cDEyhnFGSwCJmwDl/gMGqYiU0=", + "lastModified": 1668790324, + "narHash": "sha256-WPPvwnzY+RLqBC7TESfRbvfnKN4v5Sjz3MY7BD7nm3E=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "41f3518bc194389df22a3d198215eae75e6b5ab9", + "rev": "02e332e8d01c5901dafaef15555384add24630cd", "type": "github" }, "original": { @@ -183,18 +197,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1668326430, - "narHash": "sha256-fJEsHe+lzFf3qcQVTTdK9jqRtUUVXH71tdfgjcKJNpA=", - "owner": "nixos", + "lastModified": 1667292599, + "narHash": "sha256-7ISOUI1aj6UKMPIL+wwthENL22L3+A9V+jS8Is3QsRo=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc07622617a373a742ed96d4dd536849d4bc1ec6", + "rev": "ef2f213d9659a274985778bff4ca322f3ef3ac68", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs-22_05": { @@ -213,6 +225,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1668765800, + "narHash": "sha256-rC40+/W6Hio7b/RsY8SvQPKNx4WqNcTgfYv8cUMAvJk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "52b2ac8ae18bbad4374ff0dd5aeee0fdf1aea739", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "pamedia": { "inputs": { "naersk": [ @@ -240,6 +268,28 @@ "url": "https://git.datarift.nl/erwin/pamedia-rs.git" } }, + "pre-commit-hooks": { + "inputs": { + "flake-utils": [ + "ha-now-playing", + "flake-utils" + ], + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1667992213, + "narHash": "sha256-8Ens8ozllvlaFMCZBxg6S7oUyynYx2v7yleC5M0jJsE=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "ebcbfe09d2bd6d15f68de3a0ebb1e4dcb5cd324b", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "emacs-overlay": "emacs-overlay", @@ -250,7 +300,7 @@ "naersk": "naersk", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "pamedia": "pamedia", "rust-overlay": "rust-overlay", "sops": "sops", @@ -267,11 +317,11 @@ ] }, "locked": { - "lastModified": 1668393806, - "narHash": "sha256-ew2bYm8z7CWKA2qcTuCk4/xEY4uG3WAloTczICe7gbc=", + "lastModified": 1668825399, + "narHash": "sha256-F2ro05D6tGMwSaOYeIediJq6X0ATD7JgWEG2TgOs9Wo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "219feff2b874bf6f3d18214a8ed3f360fe067759", + "rev": "a705fe51ef5cdf932ff1cb342f0fe9e5d66f1b71", "type": "github" }, "original": { diff --git a/home-manager/modules/firefox/default.nix b/home-manager/modules/firefox/default.nix index 4204766..3297673 100644 --- a/home-manager/modules/firefox/default.nix +++ b/home-manager/modules/firefox/default.nix @@ -83,7 +83,7 @@ in config = mkIf cfg.enable { programs.firefox = { enable = true; - package = pkgs.firefox-bin; + package = pkgs.firefox; profiles = { private = {