diff --git a/flake.lock b/flake.lock index 3bf97d7..6988352 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,43 @@ { "nodes": { + "firefox-addons": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "dir": "pkgs/firefox-addons", + "lastModified": 1700884968, + "narHash": "sha256-1Wyc6rTnz7ZioFHju02uFj+DhwuZ20qbSi6CKzBxdEQ=", + "owner": "rycee", + "repo": "nur-expressions", + "rev": "0f3500635d9b78d55c0bc4fdb2e4899f35518ca7", + "type": "gitlab" + }, + "original": { + "dir": "pkgs/firefox-addons", + "owner": "rycee", + "repo": "nur-expressions", + "type": "gitlab" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1629284811, + "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -7,32 +45,11 @@ ] }, "locked": { - "lastModified": 1700553346, - "narHash": "sha256-kW7uWsCv/lxuA824Ng6EYD9hlVYRyjuFn0xBbYltAeQ=", + "lastModified": 1700900274, + "narHash": "sha256-KWoKDP5I1viHR4bG3ENnJ7H1DD16tXWH4ROvS0IfXw8=", "owner": "nix-community", "repo": "home-manager", - "rev": "1aabb0a31b25ad83cfaa37c3fe29053417cd9a0f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "illustris", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1700261686, - "narHash": "sha256-kplQg6hKFNuWKrOyGp9D//G/WH1nHGJ43r2m7fagTYY=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "ecd0a800f716b80a6eac58a7ac34d6d33e6fa5ee", + "rev": "a462e7315deaa8194b0821f726709bb7e51a850c", "type": "github" }, "original": { @@ -43,17 +60,22 @@ }, "illustris": { "inputs": { - "home-manager": "home-manager_2", + "firefox-addons": [ + "firefox-addons" + ], + "home-manager": [ + "home-manager" + ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1700412388, - "narHash": "sha256-EPzv5cPEbkyRZi3avHgJ6CAfQBDDheHWeDI4I2tNmr4=", + "lastModified": 1701022131, + "narHash": "sha256-opsuQ8w2NembcahIJpPaKvOZenXF3d85XNuZvr3wmTM=", "owner": "illustris", "repo": "flake", - "rev": "c5a27eaccc7484b9c612f2a33773f97e3b89ad7e", + "rev": "8a20172f1ec8e3d22bd1d8ffec82f31864937e83", "type": "github" }, "original": { @@ -84,11 +106,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700390070, - "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", + "lastModified": 1700794826, + "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", + "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", "type": "github" }, "original": { @@ -100,6 +122,7 @@ }, "root": { "inputs": { + "firefox-addons": "firefox-addons", "home-manager": "home-manager", "illustris": "illustris", "nixfs": "nixfs", diff --git a/flake.nix b/flake.nix index cb17aa2..4d4bc9c 100644 --- a/flake.nix +++ b/flake.nix @@ -9,15 +9,23 @@ }; illustris = { url = "github:illustris/flake"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs = { + nixpkgs.follows = "nixpkgs"; + firefox-addons.follows = "firefox-addons"; + home-manager.follows = "home-manager"; + }; }; nixfs = { url = "github:illustris/nixfs"; inputs.nixpkgs.follows = "nixpkgs"; }; + firefox-addons = { + url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { self, nixpkgs, home-manager, illustris, nixfs, ... }: { + outputs = { self, nixpkgs, home-manager, illustris, nixfs, ... }@inputs: { nixosConfigurations = { desktop = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -38,7 +46,7 @@ useGlobalPkgs = true; users.illustris = import ( illustris + "/homeConfigurations/profiles/dailyDriver/home.nix" - ); + ) inputs; }; } nixfs.nixosModules.nixfs