diff --git a/flake.lock b/flake.lock index ee3aa92..e8bc842 100644 --- a/flake.lock +++ b/flake.lock @@ -76,7 +76,28 @@ "inputs": { "nix-darwin": "nix-darwin", "nix-homebrew": "nix-homebrew", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "rusty-pw": "rusty-pw" + } + }, + "rusty-pw": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1792878430, + "narHash": "sha256-SZm2FqJr6tWrDdoEBa1+WUmSQZn514uXulM9opozoQ8=", + "ref": "refs/heads/main", + "rev": "d8faadac139e0856c6730cf9f5fcc74383362bef", + "revCount": 13, + "type": "git", + "url": "https://git.briannelson.dev/brian/rusty-pw" + }, + "original": { + "type": "git", + "url": "https://git.briannelson.dev/brian/rusty-pw" } } }, diff --git a/flake.nix b/flake.nix index 50679be..bf19758 100644 --- a/flake.nix +++ b/flake.nix @@ -6,13 +6,18 @@ nix-darwin.url = "github:nix-darwin/nix-darwin/nix-darwin-26.05"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; nix-homebrew.url = "github:zhaofengli/nix-homebrew"; + + rusty-pw = { + url = "git+https://git.briannelson.dev/brian/rusty-pw"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs@{ self, nix-darwin, nixpkgs, nix-homebrew, ... }: let mkDarwin = { profile, user, system ? "aarch-64-dawin" }: nix-darwin.lib.darwinSystem { - specialArgs = { inherit user system; }; + specialArgs = { inherit inputs user system; }; modules = [ ./modules ./profiles/${profile} diff --git a/modules/apps.nix b/modules/apps.nix index 07703d0..960e93a 100644 --- a/modules/apps.nix +++ b/modules/apps.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ inputs, pkgs, ... }: { # This file installs these apps on all configurations @@ -12,11 +12,16 @@ archiveApps = []; + nixpkgs.overlays = [ + inputs.rusty-pw.overlays.default + ]; + environment.systemPackages = with pkgs; [ exif exiftool git helix + rusty-pw ]; homebrew.brews = [