authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-08-11 22:29:50-07:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-08-11 22:29:50-07:00
log2e9eda64d4ee4fc9b76ab962de6ef7bb87a7d77d
treeed143103dd9a365111280194792379933b2050e8
parent883992071707f96fd21a3e1f85be33b266685ba5
signature Commit is signed but in an unrecognized format.

add expo dev deps


8 files changed, 143 insertions(+), 17 deletions(-)

flake.lock+94-16
......@@ -1,5 +1,28 @@
11{
22 "nodes": {
3 "android-nixpkgs": {
4 "inputs": {
5 "devshell": "devshell",
6 "flake-utils": "flake-utils",
7 "nixpkgs": [
8 "nixpkgs"
9 ]
10 },
11 "locked": {
12 "lastModified": 1754511800,
13 "narHash": "sha256-/gYkj4dbzcAV1EWJYy+2ryHGtC57jhIrRwSGQKCT8Gk=",
14 "owner": "tadfisher",
15 "repo": "android-nixpkgs",
16 "rev": "5bb0f6e7b112c7be7895c6058925c29db360b205",
17 "type": "github"
18 },
19 "original": {
20 "owner": "tadfisher",
21 "ref": "stable",
22 "repo": "android-nixpkgs",
23 "type": "github"
24 }
25 },
326 "apple-fonts": {
427 "inputs": {
528 "nixpkgs": [
......@@ -49,6 +72,27 @@
4972 "type": "github"
5073 }
5174 },
75 "devshell": {
76 "inputs": {
77 "nixpkgs": [
78 "android-nixpkgs",
79 "nixpkgs"
80 ]
81 },
82 "locked": {
83 "lastModified": 1741473158,
84 "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
85 "owner": "numtide",
86 "repo": "devshell",
87 "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
88 "type": "github"
89 },
90 "original": {
91 "owner": "numtide",
92 "repo": "devshell",
93 "type": "github"
94 }
95 },
5296 "flake-compat": {
5397 "flake": false,
5498 "locked": {
......@@ -106,6 +150,24 @@
106150 "inputs": {
107151 "systems": "systems"
108152 },
153 "locked": {
154 "lastModified": 1731533236,
155 "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
156 "owner": "numtide",
157 "repo": "flake-utils",
158 "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
159 "type": "github"
160 },
161 "original": {
162 "owner": "numtide",
163 "repo": "flake-utils",
164 "type": "github"
165 }
166 },
167 "flake-utils_2": {
168 "inputs": {
169 "systems": "systems_2"
170 },
109171 "locked": {
110172 "lastModified": 1701680307,
111173 "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
......@@ -120,9 +182,9 @@
120182 "type": "github"
121183 }
122184 },
123 "flake-utils_2": {
185 "flake-utils_3": {
124186 "inputs": {
125 "systems": "systems_2"
187 "systems": "systems_3"
126188 },
127189 "locked": {
128190 "lastModified": 1731533236,
......@@ -138,7 +200,7 @@
138200 "type": "github"
139201 }
140202 },
141 "flake-utils_3": {
203 "flake-utils_4": {
142204 "inputs": {
143205 "systems": [
144206 "nvf",
......@@ -159,9 +221,9 @@
159221 "type": "github"
160222 }
161223 },
162 "flake-utils_4": {
224 "flake-utils_5": {
163225 "inputs": {
164 "systems": "systems_4"
226 "systems": "systems_5"
165227 },
166228 "locked": {
167229 "lastModified": 1705309234,
......@@ -177,9 +239,9 @@
177239 "type": "github"
178240 }
179241 },
180 "flake-utils_5": {
242 "flake-utils_6": {
181243 "inputs": {
182 "systems": "systems_5"
244 "systems": "systems_6"
183245 },
184246 "locked": {
185247 "lastModified": 1710146030,
......@@ -195,9 +257,9 @@
195257 "type": "github"
196258 }
197259 },
198 "flake-utils_6": {
260 "flake-utils_7": {
199261 "inputs": {
200 "systems": "systems_6"
262 "systems": "systems_7"
201263 },
202264 "locked": {
203265 "lastModified": 1705309234,
......@@ -300,7 +362,7 @@
300362 },
301363 "moonlight": {
302364 "inputs": {
303 "flake-utils": "flake-utils",
365 "flake-utils": "flake-utils_2",
304366 "nixpkgs": [
305367 "nixpkgs"
306368 ]
......@@ -341,7 +403,7 @@
341403 },
342404 "nix-options-search": {
343405 "inputs": {
344 "flake-utils": "flake-utils_2",
406 "flake-utils": "flake-utils_3",
345407 "gitignore": "gitignore",
346408 "nixpkgs": "nixpkgs"
347409 },
......@@ -425,12 +487,12 @@
425487 "nvf": {
426488 "inputs": {
427489 "flake-parts": "flake-parts",
428 "flake-utils": "flake-utils_3",
490 "flake-utils": "flake-utils_4",
429491 "mnw": "mnw",
430492 "nixpkgs": [
431493 "nixpkgs"
432494 ],
433 "systems": "systems_3"
495 "systems": "systems_4"
434496 },
435497 "locked": {
436498 "lastModified": 1754043154,
......@@ -461,6 +523,7 @@
461523 },
462524 "root": {
463525 "inputs": {
526 "android-nixpkgs": "android-nixpkgs",
464527 "apple-fonts": "apple-fonts",
465528 "darwin": "darwin",
466529 "home-manager": "home-manager",
......@@ -669,6 +732,21 @@
669732 "type": "github"
670733 }
671734 },
735 "systems_7": {
736 "locked": {
737 "lastModified": 1681028828,
738 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
739 "owner": "nix-systems",
740 "repo": "default",
741 "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
742 "type": "github"
743 },
744 "original": {
745 "owner": "nix-systems",
746 "repo": "default",
747 "type": "github"
748 }
749 },
672750 "zen-browser": {
673751 "inputs": {
674752 "nixpkgs": [
......@@ -692,7 +770,7 @@
692770 "zig": {
693771 "inputs": {
694772 "flake-compat": "flake-compat",
695 "flake-utils": "flake-utils_4",
773 "flake-utils": "flake-utils_5",
696774 "nixpkgs": "nixpkgs_3"
697775 },
698776 "locked": {
......@@ -712,7 +790,7 @@
712790 "zig-overlay": {
713791 "inputs": {
714792 "flake-compat": "flake-compat_2",
715 "flake-utils": "flake-utils_6",
793 "flake-utils": "flake-utils_7",
716794 "nixpkgs": [
717795 "zls",
718796 "nixpkgs"
......@@ -734,7 +812,7 @@
734812 },
735813 "zls": {
736814 "inputs": {
737 "flake-utils": "flake-utils_5",
815 "flake-utils": "flake-utils_6",
738816 "gitignore": "gitignore_2",
739817 "langref": "langref",
740818 "nixpkgs": "nixpkgs_4",
flake.nix+9
......@@ -29,6 +29,12 @@
2929 inputs.nixpkgs.follows = "nixpkgs";
3030 };
3131
32 android-nixpkgs = {
33 url = "github:tadfisher/android-nixpkgs/stable";
34 inputs.nixpkgs.follows = "nixpkgs";
35
36 };
37
3238 nix-options-search.url = "github:madsbv/nix-options-search";
3339
3440 nix-index-database.url = "github:nix-community/nix-index-database";
......@@ -47,6 +53,7 @@
4753 overlays = [
4854 inputs.zig.overlays.default
4955 inputs.rust-overlay.overlays.default
56 inputs.android-nixpkgs.overlays.default
5057
5158 # https://github.com/LnL7/nix-darwin/issues/1041
5259 (_: prev: {
......@@ -128,6 +135,8 @@
128135 user = "natalie";
129136 host = "laptop";
130137 system = "aarch64-darwin";
138 extraModules = [
139 ];
131140 };
132141
133142 # chloe's mac studio "sandwich"
lib/mkSystem.nix+1
......@@ -75,6 +75,7 @@ let
7575 ];
7676 }
7777 inputs.nvf.homeManagerModules.default
78 inputs.android-nixpkgs.hmModule
7879 ];
7980in
8081systemFunc {
modules/home/default.nix+32
......@@ -22,8 +22,40 @@ in
2222 default = { };
2323 description = "set the ghostty shader, relative to 'files/ghostty'";
2424 };
25 programs.android-sdk.enable = lib.mkOption {
26 type = lib.types.bool;
27 default = false;
28 description = "enable android sdk stuff";
29 };
2530 };
2631 config = {
32 android-sdk = {
33 enable = config.programs.android-sdk.enable;
34 packages =
35 sdk:
36 with sdk;
37 [
38 build-tools-35-0-0
39 cmdline-tools-latest
40 emulator
41 platform-tools
42 platforms-android-35
43 sources-android-35
44 ndk-27-1-12297006
45 cmake-3-22-1
46 ]
47 ++ lib.optionals host.darwin [
48 system-images-android-35-google-apis-arm64-v8a
49 system-images-android-35-google-apis-playstore-arm64-v8a
50 ]
51 ++ lib.optionals host.linux [
52 system-images-android-35-google-apis-arm64-v8a
53 system-images-android-3-google-apis-playstore-arm64-v8a
54 ];
55 };
56 xdg = {
57 enable = true;
58 };
2759 home.shell = {
2860 enableShellIntegration = true;
2961 };
modules/shared/nix.nix+1
......@@ -2,6 +2,7 @@
22{
33 nixpkgs.config = {
44 allowUnfree = true;
5 android_sdk.accept_license = true;
56 };
67
78 nix = {
users/natalie/home.nix+3
......@@ -1,9 +1,11 @@
11{
22 pkgs,
33 lib,
4 options,
45 ...
56}@args:
67{
8
79 programs = {
810 # sort-lines:start
911 atuin.enable = true;
......@@ -13,6 +15,7 @@
1315 fish.enable = true;
1416 man.generateCaches = false;
1517 lsd.enable = true;
18 android-sdk.enable = true;
1619 # sort-lines:end
1720 };
1821
users/natalie/laptop/home.nix+3
......@@ -16,6 +16,9 @@
1616 "$HOME/.emacs.d/bin"
1717 ];
1818
19 sessionVariables = {
20 };
21
1922 packages = with pkgs; [
2023 #PDF viewer for VimTeX
2124 skimpdf
users/natalie/packages.nix-1
......@@ -95,7 +95,6 @@ with pkgs;
9595 #expo deps
9696 watchman
9797 zulu17
98 android-tools
9998
10099 #browsers
101100 tor