diff options
| -rw-r--r-- | flake.lock | 43 | ||||
| -rw-r--r-- | flake.nix | 10 | ||||
| -rw-r--r-- | modules/shared/nix.nix | 5 | ||||
| -rw-r--r-- | systems/common.nix | 4 | ||||
| -rw-r--r-- | systems/default.nix | 3 | ||||
| -rw-r--r-- | users/default.nix | 7 | ||||
| -rw-r--r-- | users/seth/home.nix | 2 | ||||
| -rw-r--r-- | users/seth/programs/default.nix | 10 | ||||
| -rw-r--r-- | users/seth/programs/firefox/default.nix | 4 |
9 files changed, 55 insertions, 33 deletions
@@ -178,6 +178,32 @@ "type": "github" } }, + "firefox-addons": { + "inputs": { + "flake-utils": [ + "pre-commit", + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "dir": "pkgs/firefox-addons", + "lastModified": 1701511889, + "narHash": "sha256-r1s4LjtiFFZXEs+fXT2n6ULZVtezzv8uHVg5rSW76vo=", + "owner": "~rycee", + "repo": "nur-expressions", + "rev": "a72f098480eee3dc9609a11a4872d44747ce4cc8", + "type": "sourcehut" + }, + "original": { + "dir": "pkgs/firefox-addons", + "owner": "~rycee", + "repo": "nur-expressions", + "type": "sourcehut" + } + }, "flake-compat": { "flake": false, "locked": { @@ -484,21 +510,6 @@ "type": "indirect" } }, - "nur": { - "locked": { - "lastModified": 1702079139, - "narHash": "sha256-P60Q83fiXY4x+pq0mbNAdT5AdiJEpeFLaUZK+hArYVg=", - "owner": "nix-community", - "repo": "NUR", - "rev": "eeb0b84c55657be1575872467aa5a40835af2dcd", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, "openwrt-imagebuilder": { "inputs": { "nixpkgs": [ @@ -587,6 +598,7 @@ "attic": "attic", "catppuccin": "catppuccin", "darwin": "darwin", + "firefox-addons": "firefox-addons", "getchoo": "getchoo", "getchvim": "getchvim", "hm": "hm", @@ -597,7 +609,6 @@ "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", - "nur": "nur", "openwrt-imagebuilder": "openwrt-imagebuilder", "parts": "parts", "pre-commit": "pre-commit", @@ -57,6 +57,14 @@ }; }; + firefox-addons = { + url = "sourcehut:~rycee/nur-expressions?dir=pkgs/firefox-addons"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "pre-commit/flake-utils"; + }; + }; + getchoo = { url = "github:getchoo/nix-exprs"; inputs.nixpkgs.follows = "nixpkgs"; @@ -108,8 +116,6 @@ }; }; - nur.url = "github:nix-community/NUR"; - openwrt-imagebuilder = { url = "github:astro/nix-openwrt-imagebuilder"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/shared/nix.nix b/modules/shared/nix.nix index d496f72..7ca3f1d 100644 --- a/modules/shared/nix.nix +++ b/modules/shared/nix.nix @@ -3,12 +3,13 @@ lib, pkgs, inputs, + self, ... }: { nix = { registry = { n.flake = lib.mkDefault inputs.nixpkgs; - self.flake = inputs.self; + self.flake = self; }; nixPath = [ @@ -31,7 +32,7 @@ }; nixpkgs = { - overlays = with inputs; [nur.overlay getchoo.overlays.default self.overlays.default]; + overlays = with inputs; [getchoo.overlays.default self.overlays.default]; config.allowUnfree = lib.mkDefault true; }; } diff --git a/systems/common.nix b/systems/common.nix index b4dc782..3960495 100644 --- a/systems/common.nix +++ b/systems/common.nix @@ -2,7 +2,7 @@ inputs, self, }: let - hmSetup = { + hmSetup = {inputs', ...}: { imports = [ ../users/seth/system.nix ]; @@ -10,7 +10,7 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; - extraSpecialArgs = {inherit inputs self;}; + extraSpecialArgs = {inherit inputs inputs' self;}; }; }; in { diff --git a/systems/default.nix b/systems/default.nix index 2f8c277..6f31339 100644 --- a/systems/default.nix +++ b/systems/default.nix @@ -1,8 +1,8 @@ { lib, + withSystem, inputs, self, - withSystem, ... }: let /* @@ -16,6 +16,7 @@ modules = args.modules ++ [./${name}]; specialArgs = { inherit inputs self; + inputs' = withSystem (args.system or "x86_64-linux") ({inputs', ...}: inputs'); secretsDir = ../secrets/${name}; }; } diff --git a/users/default.nix b/users/default.nix index c654583..8aaa0bb 100644 --- a/users/default.nix +++ b/users/default.nix @@ -1,5 +1,6 @@ { lib, + withSystem, inputs, self, ... @@ -22,7 +23,11 @@ ] ++ (args.modules or []); - extraSpecialArgs = {inherit inputs self;}; + extraSpecialArgs = { + inherit inputs self; + inputs' = withSystem (args.system or "x86_64-linux") ({inputs', ...}: inputs'); + }; + pkgs = args.pkgs or inputs.nixpkgs.legacyPackages."x86_64-linux"; }); diff --git a/users/seth/home.nix b/users/seth/home.nix index 1f89641..2312169 100644 --- a/users/seth/home.nix +++ b/users/seth/home.nix @@ -14,5 +14,5 @@ else "/home/${config.home.username}"; }; - nixpkgs.overlays = with inputs; [nur.overlay getchoo.overlays.default self.overlays.default]; + nixpkgs.overlays = with inputs; [getchoo.overlays.default self.overlays.default]; } diff --git a/users/seth/programs/default.nix b/users/seth/programs/default.nix index 6ae66d9..93249d2 100644 --- a/users/seth/programs/default.nix +++ b/users/seth/programs/default.nix @@ -1,6 +1,6 @@ { pkgs, - inputs, + inputs', ... }: { imports = [ @@ -13,18 +13,16 @@ ./vim.nix ]; - home.packages = with pkgs; let - inherit (stdenv.hostPlatform) system; - in [ + home.packages = with pkgs; [ fd nurl rclone restic - inputs.attic.packages.${system}.attic + inputs'.attic.packages.attic (let - getchvim = inputs.getchvim.packages.${system}.default; + getchvim = inputs'.getchvim.packages.default; in # remove desktop file symlinkJoin { diff --git a/users/seth/programs/firefox/default.nix b/users/seth/programs/firefox/default.nix index cb27bf7..e2e3165 100644 --- a/users/seth/programs/firefox/default.nix +++ b/users/seth/programs/firefox/default.nix @@ -1,6 +1,6 @@ { config, - pkgs, + inputs', ... }: { imports = [ @@ -14,7 +14,7 @@ programs.firefox = { inherit (config.desktop) enable; profiles.arkenfox = { - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + extensions = with inputs'.firefox-addons.packages; [ bitwarden floccus private-relay |