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 @@...@@ -1,5 +1,28 @@
1{1{
2 "nodes": {2 "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 },
3 "apple-fonts": {26 "apple-fonts": {
4 "inputs": {27 "inputs": {
5 "nixpkgs": [28 "nixpkgs": [
...@@ -49,6 +72,27 @@...@@ -49,6 +72,27 @@
49 "type": "github"72 "type": "github"
50 }73 }
51 },74 },
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 },
52 "flake-compat": {96 "flake-compat": {
53 "flake": false,97 "flake": false,
54 "locked": {98 "locked": {
...@@ -106,6 +150,24 @@...@@ -106,6 +150,24 @@
106 "inputs": {150 "inputs": {
107 "systems": "systems"151 "systems": "systems"
108 },152 },
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 },
109 "locked": {171 "locked": {
110 "lastModified": 1701680307,172 "lastModified": 1701680307,
111 "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",173 "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
...@@ -120,9 +182,9 @@...@@ -120,9 +182,9 @@
120 "type": "github"182 "type": "github"
121 }183 }
122 },184 },
123 "flake-utils_2": {185 "flake-utils_3": {
124 "inputs": {186 "inputs": {
125 "systems": "systems_2"187 "systems": "systems_3"
126 },188 },
127 "locked": {189 "locked": {
128 "lastModified": 1731533236,190 "lastModified": 1731533236,
...@@ -138,7 +200,7 @@...@@ -138,7 +200,7 @@
138 "type": "github"200 "type": "github"
139 }201 }
140 },202 },
141 "flake-utils_3": {203 "flake-utils_4": {
142 "inputs": {204 "inputs": {
143 "systems": [205 "systems": [
144 "nvf",206 "nvf",
...@@ -159,9 +221,9 @@...@@ -159,9 +221,9 @@
159 "type": "github"221 "type": "github"
160 }222 }
161 },223 },
162 "flake-utils_4": {224 "flake-utils_5": {
163 "inputs": {225 "inputs": {
164 "systems": "systems_4"226 "systems": "systems_5"
165 },227 },
166 "locked": {228 "locked": {
167 "lastModified": 1705309234,229 "lastModified": 1705309234,
...@@ -177,9 +239,9 @@...@@ -177,9 +239,9 @@
177 "type": "github"239 "type": "github"
178 }240 }
179 },241 },
180 "flake-utils_5": {242 "flake-utils_6": {
181 "inputs": {243 "inputs": {
182 "systems": "systems_5"244 "systems": "systems_6"
183 },245 },
184 "locked": {246 "locked": {
185 "lastModified": 1710146030,247 "lastModified": 1710146030,
...@@ -195,9 +257,9 @@...@@ -195,9 +257,9 @@
195 "type": "github"257 "type": "github"
196 }258 }
197 },259 },
198 "flake-utils_6": {260 "flake-utils_7": {
199 "inputs": {261 "inputs": {
200 "systems": "systems_6"262 "systems": "systems_7"
201 },263 },
202 "locked": {264 "locked": {
203 "lastModified": 1705309234,265 "lastModified": 1705309234,
...@@ -300,7 +362,7 @@...@@ -300,7 +362,7 @@
300 },362 },
301 "moonlight": {363 "moonlight": {
302 "inputs": {364 "inputs": {
303 "flake-utils": "flake-utils",365 "flake-utils": "flake-utils_2",
304 "nixpkgs": [366 "nixpkgs": [
305 "nixpkgs"367 "nixpkgs"
306 ]368 ]
...@@ -341,7 +403,7 @@...@@ -341,7 +403,7 @@
341 },403 },
342 "nix-options-search": {404 "nix-options-search": {
343 "inputs": {405 "inputs": {
344 "flake-utils": "flake-utils_2",406 "flake-utils": "flake-utils_3",
345 "gitignore": "gitignore",407 "gitignore": "gitignore",
346 "nixpkgs": "nixpkgs"408 "nixpkgs": "nixpkgs"
347 },409 },
...@@ -425,12 +487,12 @@...@@ -425,12 +487,12 @@
425 "nvf": {487 "nvf": {
426 "inputs": {488 "inputs": {
427 "flake-parts": "flake-parts",489 "flake-parts": "flake-parts",
428 "flake-utils": "flake-utils_3",490 "flake-utils": "flake-utils_4",
429 "mnw": "mnw",491 "mnw": "mnw",
430 "nixpkgs": [492 "nixpkgs": [
431 "nixpkgs"493 "nixpkgs"
432 ],494 ],
433 "systems": "systems_3"495 "systems": "systems_4"
434 },496 },
435 "locked": {497 "locked": {
436 "lastModified": 1754043154,498 "lastModified": 1754043154,
...@@ -461,6 +523,7 @@...@@ -461,6 +523,7 @@
461 },523 },
462 "root": {524 "root": {
463 "inputs": {525 "inputs": {
526 "android-nixpkgs": "android-nixpkgs",
464 "apple-fonts": "apple-fonts",527 "apple-fonts": "apple-fonts",
465 "darwin": "darwin",528 "darwin": "darwin",
466 "home-manager": "home-manager",529 "home-manager": "home-manager",
...@@ -669,6 +732,21 @@...@@ -669,6 +732,21 @@
669 "type": "github"732 "type": "github"
670 }733 }
671 },734 },
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 },
672 "zen-browser": {750 "zen-browser": {
673 "inputs": {751 "inputs": {
674 "nixpkgs": [752 "nixpkgs": [
...@@ -692,7 +770,7 @@...@@ -692,7 +770,7 @@
692 "zig": {770 "zig": {
693 "inputs": {771 "inputs": {
694 "flake-compat": "flake-compat",772 "flake-compat": "flake-compat",
695 "flake-utils": "flake-utils_4",773 "flake-utils": "flake-utils_5",
696 "nixpkgs": "nixpkgs_3"774 "nixpkgs": "nixpkgs_3"
697 },775 },
698 "locked": {776 "locked": {
...@@ -712,7 +790,7 @@...@@ -712,7 +790,7 @@
712 "zig-overlay": {790 "zig-overlay": {
713 "inputs": {791 "inputs": {
714 "flake-compat": "flake-compat_2",792 "flake-compat": "flake-compat_2",
715 "flake-utils": "flake-utils_6",793 "flake-utils": "flake-utils_7",
716 "nixpkgs": [794 "nixpkgs": [
717 "zls",795 "zls",
718 "nixpkgs"796 "nixpkgs"
...@@ -734,7 +812,7 @@...@@ -734,7 +812,7 @@
734 },812 },
735 "zls": {813 "zls": {
736 "inputs": {814 "inputs": {
737 "flake-utils": "flake-utils_5",815 "flake-utils": "flake-utils_6",
738 "gitignore": "gitignore_2",816 "gitignore": "gitignore_2",
739 "langref": "langref",817 "langref": "langref",
740 "nixpkgs": "nixpkgs_4",818 "nixpkgs": "nixpkgs_4",
flake.nix+9
...@@ -29,6 +29,12 @@...@@ -29,6 +29,12 @@
29 inputs.nixpkgs.follows = "nixpkgs";29 inputs.nixpkgs.follows = "nixpkgs";
30 };30 };
3131
32 android-nixpkgs = {
33 url = "github:tadfisher/android-nixpkgs/stable";
34 inputs.nixpkgs.follows = "nixpkgs";
35
36 };
37
32 nix-options-search.url = "github:madsbv/nix-options-search";38 nix-options-search.url = "github:madsbv/nix-options-search";
3339
34 nix-index-database.url = "github:nix-community/nix-index-database";40 nix-index-database.url = "github:nix-community/nix-index-database";
...@@ -47,6 +53,7 @@...@@ -47,6 +53,7 @@
47 overlays = [53 overlays = [
48 inputs.zig.overlays.default54 inputs.zig.overlays.default
49 inputs.rust-overlay.overlays.default55 inputs.rust-overlay.overlays.default
56 inputs.android-nixpkgs.overlays.default
5057
51 # https://github.com/LnL7/nix-darwin/issues/104158 # https://github.com/LnL7/nix-darwin/issues/1041
52 (_: prev: {59 (_: prev: {
...@@ -128,6 +135,8 @@...@@ -128,6 +135,8 @@
128 user = "natalie";135 user = "natalie";
129 host = "laptop";136 host = "laptop";
130 system = "aarch64-darwin";137 system = "aarch64-darwin";
138 extraModules = [
139 ];
131 };140 };
132141
133 # chloe's mac studio "sandwich"142 # chloe's mac studio "sandwich"
lib/mkSystem.nix+1
...@@ -75,6 +75,7 @@ let...@@ -75,6 +75,7 @@ let
75 ];75 ];
76 }76 }
77 inputs.nvf.homeManagerModules.default77 inputs.nvf.homeManagerModules.default
78 inputs.android-nixpkgs.hmModule
78 ];79 ];
79in80in
80systemFunc {81systemFunc {
modules/home/default.nix+32
...@@ -22,8 +22,40 @@ in...@@ -22,8 +22,40 @@ in
22 default = { };22 default = { };
23 description = "set the ghostty shader, relative to 'files/ghostty'";23 description = "set the ghostty shader, relative to 'files/ghostty'";
24 };24 };
25 programs.android-sdk.enable = lib.mkOption {
26 type = lib.types.bool;
27 default = false;
28 description = "enable android sdk stuff";
29 };
25 };30 };
26 config = {31 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 };
27 home.shell = {59 home.shell = {
28 enableShellIntegration = true;60 enableShellIntegration = true;
29 };61 };
modules/shared/nix.nix+1
...@@ -2,6 +2,7 @@...@@ -2,6 +2,7 @@
2{2{
3 nixpkgs.config = {3 nixpkgs.config = {
4 allowUnfree = true;4 allowUnfree = true;
5 android_sdk.accept_license = true;
5 };6 };
67
7 nix = {8 nix = {
users/natalie/home.nix+3
...@@ -1,9 +1,11 @@...@@ -1,9 +1,11 @@
1{1{
2 pkgs,2 pkgs,
3 lib,3 lib,
4 options,
4 ...5 ...
5}@args:6}@args:
6{7{
8
7 programs = {9 programs = {
8 # sort-lines:start10 # sort-lines:start
9 atuin.enable = true;11 atuin.enable = true;
...@@ -13,6 +15,7 @@...@@ -13,6 +15,7 @@
13 fish.enable = true;15 fish.enable = true;
14 man.generateCaches = false;16 man.generateCaches = false;
15 lsd.enable = true;17 lsd.enable = true;
18 android-sdk.enable = true;
16 # sort-lines:end19 # sort-lines:end
17 };20 };
1821
users/natalie/laptop/home.nix+3
...@@ -16,6 +16,9 @@...@@ -16,6 +16,9 @@
16 "$HOME/.emacs.d/bin"16 "$HOME/.emacs.d/bin"
17 ];17 ];
1818
19 sessionVariables = {
20 };
21
19 packages = with pkgs; [22 packages = with pkgs; [
20 #PDF viewer for VimTeX23 #PDF viewer for VimTeX
21 skimpdf24 skimpdf
users/natalie/packages.nix-1
...@@ -95,7 +95,6 @@ with pkgs;...@@ -95,7 +95,6 @@ with pkgs;
95 #expo deps95 #expo deps
96 watchman96 watchman
97 zulu1797 zulu17
98 android-tools
9998
100 #browsers99 #browsers
101 tor100 tor