From 74a5105d21454382dba118cd957b36f851c931b2 Mon Sep 17 00:00:00 2001 From: allthatjazzleo Date: Sun, 21 Apr 2024 23:18:29 +0800 Subject: [PATCH] add mac-app-util --- cells/homemanager/configurations.nix | 9 +- flake.lock | 134 +++++++++++++++++++++++---- flake.nix | 1 + 3 files changed, 125 insertions(+), 19 deletions(-) diff --git a/cells/homemanager/configurations.nix b/cells/homemanager/configurations.nix index 0b60610..d7b324a 100644 --- a/cells/homemanager/configurations.nix +++ b/cells/homemanager/configurations.nix @@ -2,13 +2,18 @@ inputs, cell, }: let - inherit (inputs) agenix sops-nix nixpkgs home-manager; + inherit (inputs) agenix sops-nix mac-app-util nixpkgs home-manager; inherit (inputs.cells.users) users; inherit (cell.home) home; + baseModules = [agenix.homeManagerModules.age sops-nix.homeManagerModules.sops home]; + darwinModules = + if nixpkgs.stdenv.hostPlatform.isDarwin + then [mac-app-util.homeManagerModules.default] + else []; f = _: user: home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs; - modules = [agenix.homeManagerModules.age sops-nix.homeManagerModules.sops home]; + modules = baseModules ++ darwinModules; extraSpecialArgs = {inherit user;}; }; in {default = builtins.mapAttrs f users;} diff --git a/flake.lock b/flake.lock index 6e1c099..aa30d03 100644 --- a/flake.lock +++ b/flake.lock @@ -55,6 +55,21 @@ "type": "github" } }, + "cl-nix-lite": { + "locked": { + "lastModified": 1698901928, + "narHash": "sha256-gMHZybEVA3uMOBu1483gXfvUqpv4Qn7GJs3ZfCQYxpc=", + "owner": "hraban", + "repo": "cl-nix-lite", + "rev": "9ad861b45bda7f59eba5ad1b43565a03c7c58553", + "type": "github" + }, + "original": { + "owner": "hraban", + "repo": "cl-nix-lite", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -128,6 +143,23 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1697816753, + "narHash": "sha256-40to80AEIyKCQI0xMKCeF5ePoIKTYgjVVCZeu4CnTxM=", + "owner": "hraban", + "repo": "flake-compat", + "rev": "6025bade1336a36014639bc3f67eacc853dab78f", + "type": "github" + }, + "original": { + "owner": "hraban", + "ref": "fixed-output", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -147,6 +179,23 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "id": "flake-utils", + "type": "indirect" + } + }, + "flake-utils_3": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -161,7 +210,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -176,7 +225,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -191,7 +240,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -206,7 +255,7 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_7": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -299,9 +348,30 @@ "type": "github" } }, - "nixago": { + "mac-app-util": { "inputs": { + "cl-nix-lite": "cl-nix-lite", + "flake-compat": "flake-compat", "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1707183497, + "narHash": "sha256-K6LVwmM32uUEYXpDFCnwNqOyi863FRXR6KFq87X3iHg=", + "owner": "hraban", + "repo": "mac-app-util", + "rev": "95d9c38d6dec0296d73929f63a7de130f435437b", + "type": "github" + }, + "original": { + "owner": "hraban", + "repo": "mac-app-util", + "type": "github" + } + }, + "nixago": { + "inputs": { + "flake-utils": "flake-utils_3", "nixago-exts": "nixago-exts", "nixpkgs": [ "nixpkgs" @@ -323,7 +393,7 @@ }, "nixago-exts": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixago": "nixago_2", "nixpkgs": [ "nixago", @@ -346,7 +416,7 @@ }, "nixago-exts_2": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "nixago": "nixago_3", "nixpkgs": [ "nixago", @@ -371,7 +441,7 @@ }, "nixago_2": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixago-exts": "nixago-exts_2", "nixpkgs": [ "nixago", @@ -396,7 +466,7 @@ }, "nixago_3": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_7", "nixpkgs": [ "nixago", "nixago-exts", @@ -421,18 +491,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713603958, - "narHash": "sha256-FQwlIjzuTCgUJVTAxcDj+y7h6CMSjpVxlfB19k9xWto=", + "lastModified": 1698553279, + "narHash": "sha256-T/9P8yBSLcqo/v+FTOBK+0rjzjPMctVymZydbvR/Fak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0faf57ff447dcd37bfd1b93eb43b3a433434f4d9", + "rev": "90e85bc7c1a6fc0760a94ace129d3a1c61c3d035", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs-stable": { @@ -451,6 +519,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1713603958, + "narHash": "sha256-FQwlIjzuTCgUJVTAxcDj+y7h6CMSjpVxlfB19k9xWto=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0faf57ff447dcd37bfd1b93eb43b3a433434f4d9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, "nosys": { "locked": { "lastModified": 1668010795, @@ -516,8 +600,9 @@ "agenix": "agenix", "devshell": "devshell", "home-manager": "home-manager", + "mac-app-util": "mac-app-util", "nixago": "nixago", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "sops-nix": "sops-nix", "std": "std" } @@ -627,6 +712,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "yants": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index eecc9dd..3959390 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,7 @@ url = "github:numtide/devshell"; inputs.nixpkgs.follows = "nixpkgs"; }; + mac-app-util.url = "github:hraban/mac-app-util"; nixago = { url = "github:nix-community/nixago"; inputs.nixpkgs.follows = "nixpkgs";