From 7cb3dfd9cf296a21c26fa04e01b2a5bbc0252089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?= Date: Wed, 25 Dec 2024 15:30:07 +0100 Subject: [PATCH] Upgrade --- flake.lock | 186 +++++++++++++++++++++------------ flake.nix | 4 + hm/desktop/browser/default.nix | 6 +- 3 files changed, 122 insertions(+), 74 deletions(-) diff --git a/flake.lock b/flake.lock index 2a36b09..eaa1299 100644 --- a/flake.lock +++ b/flake.lock @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1733168902, - "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", + "lastModified": 1735048446, + "narHash": "sha256-Tc35Y8H+krA6rZeOIczsaGAtobSSBPqR32AfNTeHDRc=", "owner": "nix-community", "repo": "disko", - "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", + "rev": "3a4de9fa3a78ba7b7170dda6bd8b4cdab87c0b21", "type": "github" }, "original": { @@ -144,11 +144,32 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -247,11 +268,11 @@ ] }, "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", + "lastModified": 1734425854, + "narHash": "sha256-nzE5UbJ41aPEKf8R2ZFYtLkqPmF7EIUbNEdHMBLg0Ig=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", + "rev": "0ddd26d0925f618c3a5d85a4fa5eb1e23a09491d", "type": "github" }, "original": { @@ -306,11 +327,11 @@ ] }, "locked": { - "lastModified": 1733050161, - "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", + "lastModified": 1734366194, + "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", "owner": "nix-community", "repo": "home-manager", - "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", + "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", "type": "github" }, "original": { @@ -327,11 +348,11 @@ ] }, "locked": { - "lastModified": 1732466619, - "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=", + "lastModified": 1734366194, + "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", "owner": "nix-community", "repo": "home-manager", - "rev": "f3111f62a23451114433888902a55cf0692b408d", + "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", "type": "github" }, "original": { @@ -349,11 +370,11 @@ ] }, "locked": { - "lastModified": 1733951536, - "narHash": "sha256-Zb5ZCa7Xj+0gy5XVXINTSr71fCfAv+IKtmIXNrykT54=", + "lastModified": 1733572789, + "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=", "owner": "nix-community", "repo": "home-manager", - "rev": "1318c3f3b068cdcea922fa7c1a0a1f0c96c22f5f", + "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d", "type": "github" }, "original": { @@ -391,13 +412,29 @@ "type": "github" } }, + "jjuinixpkgs": { + "locked": { + "lastModified": 1734688116, + "narHash": "sha256-Ex3o8880p+yZ9915s46/4XtnN4jS6tqp2TlfGR1+l1w=", + "owner": "Adda0", + "repo": "nixpkgs", + "rev": "c951613d3cb3d61b14c890238017d0685ff359f9", + "type": "github" + }, + "original": { + "owner": "Adda0", + "ref": "jjui", + "repo": "nixpkgs", + "type": "github" + } + }, "labellenixpkgs": { "locked": { - "lastModified": 1732691756, - "narHash": "sha256-/XYtpmaMUhgxebN6dJKOcy70Gf50nf+RHfQhZgbjNYc=", + "lastModified": 1733305049, + "narHash": "sha256-j3L36nA0PTjVA6gtMVILBhrBSMxuhevlDW9Nfws1oII=", "owner": "FabianRig", "repo": "nixpkgs", - "rev": "3da636775e87fe45fe5bbe79dafb2d8ea36648ec", + "rev": "88ac05665bc6a85aabe78070b99fd23ad1675409", "type": "github" }, "original": { @@ -415,11 +452,11 @@ ] }, "locked": { - "lastModified": 1732603785, - "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -483,11 +520,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733139194, - "narHash": "sha256-PVQW9ovo0CJbhuhCsrhFJGGdD1euwUornspKpBIgdok=", + "lastModified": 1734954597, + "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c6c90887f84c02ce9ebf33b95ca79ef45007bf88", + "rev": "def1d472c832d77885f174089b0d34854b007198", "type": "github" }, "original": { @@ -497,11 +534,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732981179, - "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", + "lastModified": 1734991663, + "narHash": "sha256-8T660guvdaOD+2/Cj970bWlQwAyZLKrrbkhYOFcY1YE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", + "rev": "6c90912761c43e22b6fb000025ab96dd31c971ff", "type": "github" }, "original": { @@ -542,6 +579,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", @@ -557,11 +610,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1733005332, - "narHash": "sha256-sd+YV24AjFfqlx9G8fAf6A3wXORRIDBMk7QtGKF+jLY=", + "lastModified": 1734784342, + "narHash": "sha256-uap4LcvjpTz5WTgDfQYtL3QCpGmtee7DuD5mB8AIiLw=", "owner": "nix-community", "repo": "nixvim", - "rev": "c500a3ffe18d8e7c7146dce26d7828b3dacd2320", + "rev": "334947672f1eb05488e69657b9c412230bd658b4", "type": "github" }, "original": { @@ -610,12 +663,17 @@ } }, "nur": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_2", + "treefmt-nix": "treefmt-nix_2" + }, "locked": { - "lastModified": 1733174134, - "narHash": "sha256-sc8NtwVHu4zsHgSlmH3pWPH7yIpd7HHLpteetQRcP3w=", + "lastModified": 1735130532, + "narHash": "sha256-efntkb+ydFSI2kvLn6SURQEp4KnThRGZ2eeJHiKL93o=", "owner": "nix-community", "repo": "NUR", - "rev": "927ae4b218c59b6f351d2bb90d4606b271bf19d3", + "rev": "b9f4b07220fa430240dba1825cdac9d673dedf55", "type": "github" }, "original": { @@ -634,11 +692,11 @@ ] }, "locked": { - "lastModified": 1731936508, - "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=", + "lastModified": 1733773348, + "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", "owner": "NuschtOS", "repo": "search", - "rev": "fe07070f811b717a4626d01fab714a87d422a9e1", + "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", "type": "github" }, "original": { @@ -647,35 +705,19 @@ "type": "github" } }, - "onixpkgs": { - "locked": { - "lastModified": 1730137625, - "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a", - "type": "indirect" - } - }, "root": { "inputs": { "disko": "disko", "flake-utils": "flake-utils", "home-manager": "home-manager", + "jjuinixpkgs": "jjuinixpkgs", "labellenixpkgs": "labellenixpkgs", "nix-on-droid": "nix-on-droid", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixvim": "nixvim", "nur": "nur", - "onixpkgs": "onixpkgs", - "stylix": "stylix", - "unixpkgs": "unixpkgs" + "stylix": "stylix" } }, "scss-reset": { @@ -830,11 +872,11 @@ ] }, "locked": { - "lastModified": 1732894027, - "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=", + "lastModified": 1734704479, + "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef", + "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", "type": "github" }, "original": { @@ -843,19 +885,25 @@ "type": "github" } }, - "unixpkgs": { + "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "nur", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1733173776, - "narHash": "sha256-Ike5NZMsPWm2rfDBTxPqqHWjmDQ3tx3NzE+O0L1ITb8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0c492272828b2377428128d8e2c582cabfe42be1", + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "master", - "type": "indirect" + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 5ea2be3..8322450 100644 --- a/flake.nix +++ b/flake.nix @@ -43,6 +43,7 @@ disko, nix-on-droid, flake-utils, + nur, ... }@attrs: # Machine independant outputs @@ -50,9 +51,11 @@ nixpkgsConfig = { config = { allowUnfree = true; + # TODO Handpick exceptions }; overlays = [ (import ./common/update-local-flakes/overlay.nix) + nur.overlays.default ]; }; homeManagerConfig = { @@ -70,6 +73,7 @@ specialArgs = attrs; modules = modules ++ [ self.nixosModules.dotfiles + # nur.modules.nixos.default { nixpkgs = nixpkgsConfig; home-manager = homeManagerConfig; diff --git a/hm/desktop/browser/default.nix b/hm/desktop/browser/default.nix index 5067b60..c281c5d 100644 --- a/hm/desktop/browser/default.nix +++ b/hm/desktop/browser/default.nix @@ -2,7 +2,6 @@ pkgs, lib, config, - nur, ... }: { @@ -20,7 +19,7 @@ }; profiles.hm = { - extensions = with config.nur.repos.rycee.firefox-addons; [ + extensions = with pkgs.nur.repos.rycee.firefox-addons; [ (buildFirefoxXpiAddon { pname = "onetab"; @@ -191,7 +190,4 @@ "${config.xsession.windowManager.i3.config.modifier}+m" = "exec ${config.programs.qutebrowser.package}/bin/qutebrowser --override-restore"; }; }; - imports = [ - nur.hmModules.nur - ]; }