From 7d689e346d1d479d2ccdb6014ac61d177f4a2d30 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Fri, 19 Apr 2024 16:54:05 +0200 Subject: [PATCH] chore: update flake inputs, re-add flake registries --- flake.lock | 38 +++++++++++++++++++------------------- flake.nix | 2 +- modules/nix/default.nix | 8 ++++++++ 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 36e934e4..5e4fa9bb 100644 --- a/flake.lock +++ b/flake.lock @@ -145,16 +145,16 @@ }, "fork": { "locked": { - "lastModified": 1713097260, - "narHash": "sha256-SeVFaTcyoFAH55RjlH0W72OkGZNUVIpSQ9lQdQG9Xjk=", + "lastModified": 1713522785, + "narHash": "sha256-vLlIYWQVDhzEXvmYvtOfLZZkpEgUNZRPfxbDmpNQATA=", "owner": "teutat3s", "repo": "nixpkgs", - "rev": "de9ce02bdc6d778fc7f6ac4d65e71c98dc9623d2", + "rev": "3a083ae7e2b12229f9dd0a3c7b56fcc7d0a4cf5b", "type": "github" }, "original": { "owner": "teutat3s", - "ref": "fix-element-desktop-screen-sharing-23.11", + "ref": "fix-element-desktop-screen-sharing", "repo": "nixpkgs", "type": "github" } @@ -166,11 +166,11 @@ ] }, "locked": { - "lastModified": 1713391096, - "narHash": "sha256-5xkzsy+ILgQlmvDDipL5xqAehnjWBenAQXV4/NLg2dE=", + "lastModified": 1713479476, + "narHash": "sha256-kTww3Hd+R95AB6J+Y1zvXrhUScgMzf0vV5hN6+wFPXE=", "owner": "nix-community", "repo": "home-manager", - "rev": "f46814ec7cbef9c2aef18ca1cbe89f2bb1e8c394", + "rev": "ffc3600f4009ca39b6cb63b24127ca4f93792854", "type": "github" }, "original": { @@ -182,11 +182,11 @@ }, "master": { "locked": { - "lastModified": 1713276496, - "narHash": "sha256-qhImB8hRIRh2eMLqBSlUPKb870s4N8WJNqGfJfhSfMg=", + "lastModified": 1713514399, + "narHash": "sha256-6iGMSYyTKdEtggfOlvx0ckcf6QXjz1BbYxKDDwomFMQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e2ce6703871b62a77f5939d5967833b43c928ed0", + "rev": "cbd5dc676356a887d8be3abd1e4f405d1c00a73d", "type": "github" }, "original": { @@ -203,11 +203,11 @@ ] }, "locked": { - "lastModified": 1711763326, - "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", + "lastModified": 1713492497, + "narHash": "sha256-FifiHvYmHL7BEOaQorHjHRaW3SJj2qYCdxUmCETAQl4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", + "rev": "eb25dc61a62efcdf47efce6cb17cd5cb3c8f2719", "type": "github" }, "original": { @@ -250,11 +250,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1712909959, - "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=", + "lastModified": 1713441075, + "narHash": "sha256-3GGeFsEO8ivD+TcDEqe4s/d0VLvMYGNDGtx0ZnBxkUs=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f", + "rev": "6f976e53752e5b9ab08f9a3b1b0b9c67815c9754", "type": "github" }, "original": { @@ -265,11 +265,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713248628, - "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", + "lastModified": 1713297878, + "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", + "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 38c9c5b7..2af86692 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; master.url = "github:nixos/nixpkgs/master"; - fork.url = "github:teutat3s/nixpkgs/fix-element-desktop-screen-sharing-23.11"; + fork.url = "github:teutat3s/nixpkgs/fix-element-desktop-screen-sharing"; flake-compat.url = "github:edolstra/flake-compat"; flake-compat.flake = false; diff --git a/modules/nix/default.nix b/modules/nix/default.nix index ce7d9ec3..ad710e33 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -33,6 +33,14 @@ gc.automatic = true; optimise.automatic = true; + registry = { + nixpkgs.flake = flake.inputs.nixpkgs; + #unstable.flake = flake.inputs.unstable; + master.flake = flake.inputs.master; + system.flake = flake.self; + }; + + settings = { # Improve nix store disk usage auto-optimise-store = true;