diff --git a/flake.lock b/flake.lock index c53ed21..c4a9737 100644 --- a/flake.lock +++ b/flake.lock @@ -54,6 +54,26 @@ "type": "github" } }, + "caarlos0": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1687665384, + "narHash": "sha256-XARNmyXnmcWeBwfN5YXhiOWHsE3pPojasE1C2OieO7o=", + "owner": "caarlos0", + "repo": "nur", + "rev": "854c0826e775f5f44cc317c724ac6343c7c5d616", + "type": "github" + }, + "original": { + "owner": "caarlos0", + "repo": "nur", + "type": "github" + } + }, "catppuccin": { "inputs": { "flake-compat": [ @@ -219,6 +239,7 @@ "inputs": { "agenix": "agenix", "attic": "attic", + "caarlos0": "caarlos0", "catppuccin": "catppuccin", "fenix": "fenix", "flake-compat": "flake-compat", diff --git a/flake.nix b/flake.nix index d753a09..be46a94 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,11 @@ inputs.flake-compat.follows = "flake-compat"; }; + caarlos0 = { + url = "github:caarlos0/nur"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + flake-compat = { url = "github:edolstra/flake-compat"; flake = false; @@ -46,19 +51,18 @@ outputs = inputs @ { self, + nixpkgs, nix-darwin, home-manager, agenix, fenix, attic, catppuccin, + caarlos0, ... }: let configuration = {pkgs, ...}: - import ./system.nix { - inherit (inputs) agenix fenix attic catppuccin; - inherit pkgs; - }; + import ./system.nix (nixpkgs.lib.recursiveUpdate inputs {inherit pkgs;}); in { darwinConfigurations.Ryans-MacBook-Pro = nix-darwin.lib.darwinSystem { modules = [ diff --git a/system.nix b/system.nix index f519c57..22fe8b0 100644 --- a/system.nix +++ b/system.nix @@ -4,6 +4,7 @@ agenix, fenix, catppuccin, + caarlos0, ... }: { environment.systemPackages = with pkgs; [ @@ -56,7 +57,6 @@ spicetify-cli mkcert nerdfix - opencv pscale pyenv railway @@ -68,6 +68,7 @@ vivid xh zoxide + caarlos0.packages.${system}.fork-cleaner ]; services.nix-daemon.enable = true; @@ -139,6 +140,7 @@ home-manager.extraSpecialArgs = { agenixModule = agenix.homeManagerModules.age; ctpModule = catppuccin.homeManagerModules.catppuccin; + caarlosModule = caarlos0.homeManagerModules.default; }; users.users.ryanccn.home = "/Users/ryanccn";