authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2024-10-11 14:37:12-07:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2024-10-11 14:37:12-07:00
log75e3fc2ec9caec6cfe189441fa77741dd9a910ab
treebf022ac1a15ff250d7be5c05a9e462f03cf47d91
parent1afac0b0713252c814b91cc8797c21ebb8242282

fixing brew nonsense

3 files changed, 101 insertions(+), 254 deletions(-)

flake.lock+37-190
......@@ -33,23 +33,6 @@
3333 "type": "github"
3434 }
3535 },
36 "brew-src": {
37 "flake": false,
38 "locked": {
39 "lastModified": 1727016223,
40 "narHash": "sha256-iZqd91Cp4O02BU6/eBZ0UZgJN8AlwH+0geQUpqF176E=",
41 "owner": "Homebrew",
42 "repo": "brew",
43 "rev": "916044581862c32fc2365e8e9ff0b1507a98925e",
44 "type": "github"
45 },
46 "original": {
47 "owner": "Homebrew",
48 "ref": "4.3.24",
49 "repo": "brew",
50 "type": "github"
51 }
52 },
5336 "cachix": {
5437 "inputs": {
5538 "devenv": [
......@@ -580,24 +563,6 @@
580563 "inputs": {
581564 "systems": "systems_11"
582565 },
583 "locked": {
584 "lastModified": 1710146030,
585 "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
586 "owner": "numtide",
587 "repo": "flake-utils",
588 "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
589 "type": "github"
590 },
591 "original": {
592 "owner": "numtide",
593 "repo": "flake-utils",
594 "type": "github"
595 }
596 },
597 "flake-utils_11": {
598 "inputs": {
599 "systems": "systems_12"
600 },
601566 "locked": {
602567 "lastModified": 1705309234,
603568 "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
......@@ -707,11 +672,11 @@
707672 "systems": "systems_8"
708673 },
709674 "locked": {
710 "lastModified": 1710146030,
711 "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
675 "lastModified": 1726560853,
676 "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
712677 "owner": "numtide",
713678 "repo": "flake-utils",
714 "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
679 "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
715680 "type": "github"
716681 },
717682 "original": {
......@@ -725,11 +690,11 @@
725690 "systems": "systems_9"
726691 },
727692 "locked": {
728 "lastModified": 1726560853,
729 "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
693 "lastModified": 1705309234,
694 "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
730695 "owner": "numtide",
731696 "repo": "flake-utils",
732 "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
697 "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
733698 "type": "github"
734699 },
735700 "original": {
......@@ -743,11 +708,11 @@
743708 "systems": "systems_10"
744709 },
745710 "locked": {
746 "lastModified": 1705309234,
747 "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
711 "lastModified": 1710146030,
712 "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
748713 "owner": "numtide",
749714 "repo": "flake-utils",
750 "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
715 "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
751716 "type": "github"
752717 },
753718 "original": {
......@@ -928,48 +893,16 @@
928893 "type": "github"
929894 }
930895 },
931 "homebrew-cask": {
932 "flake": false,
933 "locked": {
934 "lastModified": 1728663222,
935 "narHash": "sha256-znywq7nsS6xne+AJ4VLJuhVUyr2JAkmUsFw66S4DNnY=",
936 "owner": "homebrew",
937 "repo": "homebrew-cask",
938 "rev": "f1ce4ce295d8296afa0b613b890067345d07668e",
939 "type": "github"
940 },
941 "original": {
942 "owner": "homebrew",
943 "repo": "homebrew-cask",
944 "type": "github"
945 }
946 },
947 "homebrew-core": {
948 "flake": false,
949 "locked": {
950 "lastModified": 1728663080,
951 "narHash": "sha256-/4YPevo9QfB1I4d0/QEob4YKhlKe9tQPzyIR/iPlDNw=",
952 "owner": "homebrew",
953 "repo": "homebrew-core",
954 "rev": "a9df7e41456a591da73b2563b44c361e49cdbd50",
955 "type": "github"
956 },
957 "original": {
958 "owner": "homebrew",
959 "repo": "homebrew-core",
960 "type": "github"
961 }
962 },
963896 "hosts": {
964897 "inputs": {
965898 "nixpkgs": "nixpkgs"
966899 },
967900 "locked": {
968 "lastModified": 1728661161,
969 "narHash": "sha256-DlG6hVllwffMZWPVcVCToPBmGwwr7qKQmTisixRbrdA=",
901 "lastModified": 1728682327,
902 "narHash": "sha256-lTYUdo00JzPLJgtvv2dETHKyZ67vSY6Vd+fOin4L2z4=",
970903 "owner": "StevenBlack",
971904 "repo": "hosts",
972 "rev": "c3410ef0f828f954ca22fcc6c505f1657955fc9d",
905 "rev": "ebcd90663f670627612d86de564eb504e7e63b35",
973906 "type": "github"
974907 },
975908 "original": {
......@@ -1203,50 +1136,11 @@
12031136 "type": "github"
12041137 }
12051138 },
1206 "nix-darwin": {
1207 "inputs": {
1208 "nixpkgs": "nixpkgs_9"
1209 },
1210 "locked": {
1211 "lastModified": 1716329735,
1212 "narHash": "sha256-ap51w+VqG21vuzyQ04WrhI2YbWHd3UGz0e7dc/QQmoA=",
1213 "owner": "LnL7",
1214 "repo": "nix-darwin",
1215 "rev": "eac4f25028c1975a939c8f8fba95c12f8a25e01c",
1216 "type": "github"
1217 },
1218 "original": {
1219 "owner": "LnL7",
1220 "repo": "nix-darwin",
1221 "type": "github"
1222 }
1223 },
1224 "nix-homebrew": {
1225 "inputs": {
1226 "brew-src": "brew-src",
1227 "flake-utils": "flake-utils_7",
1228 "nix-darwin": "nix-darwin",
1229 "nixpkgs": "nixpkgs_10"
1230 },
1231 "locked": {
1232 "lastModified": 1728153462,
1233 "narHash": "sha256-jOF15LIzDf7SIkbjzhKq9nlnkS1aFTUCiIo92ipXMY4=",
1234 "owner": "zhaofengli-wip",
1235 "repo": "nix-homebrew",
1236 "rev": "86af3bb8f7d365eb496ef5553646ec2fe06a3662",
1237 "type": "github"
1238 },
1239 "original": {
1240 "owner": "zhaofengli-wip",
1241 "repo": "nix-homebrew",
1242 "type": "github"
1243 }
1244 },
12451139 "nix-options-search": {
12461140 "inputs": {
1247 "flake-utils": "flake-utils_8",
1141 "flake-utils": "flake-utils_7",
12481142 "gitignore": "gitignore_5",
1249 "nixpkgs": "nixpkgs_11"
1143 "nixpkgs": "nixpkgs_9"
12501144 },
12511145 "locked": {
12521146 "lastModified": 1721325991,
......@@ -1320,11 +1214,11 @@
13201214 "rust-overlay": "rust-overlay"
13211215 },
13221216 "locked": {
1323 "lastModified": 1728616391,
1324 "narHash": "sha256-xFQpxbBYaPktRuM9XBEJfWKGbq8odEikZP77+d/0o44=",
1217 "lastModified": 1728672034,
1218 "narHash": "sha256-0l9XOUKYAXIMqKcrroDAhqxlDbfeGQKvAlnOlNGXbPo=",
13251219 "owner": "lilyinstarlight",
13261220 "repo": "nixos-cosmic",
1327 "rev": "c0fe031a0bb89e6641f9ab3fb0d413babe4845d4",
1221 "rev": "cb94f2663d7dc9925e35e171c930681edb9b8d38",
13281222 "type": "github"
13291223 },
13301224 "original": {
......@@ -1336,8 +1230,8 @@
13361230 "nixpkgs": {
13371231 "locked": {
13381232 "lastModified": 0,
1339 "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
1340 "path": "/nix/store/r2hk87rfvc5fpfbl2bj64a3x7mcq9f6c-source",
1233 "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
1234 "path": "/nix/store/60sn02zhawl3kwn0r515zff3h6hg6ydz-source",
13411235 "type": "path"
13421236 },
13431237 "original": {
......@@ -1425,38 +1319,6 @@
14251319 }
14261320 },
14271321 "nixpkgs_10": {
1428 "locked": {
1429 "lastModified": 1716330097,
1430 "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
1431 "owner": "NixOS",
1432 "repo": "nixpkgs",
1433 "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
1434 "type": "github"
1435 },
1436 "original": {
1437 "owner": "NixOS",
1438 "ref": "nixos-unstable",
1439 "repo": "nixpkgs",
1440 "type": "github"
1441 }
1442 },
1443 "nixpkgs_11": {
1444 "locked": {
1445 "lastModified": 1728492678,
1446 "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
1447 "owner": "nixos",
1448 "repo": "nixpkgs",
1449 "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
1450 "type": "github"
1451 },
1452 "original": {
1453 "owner": "nixos",
1454 "ref": "nixos-unstable",
1455 "repo": "nixpkgs",
1456 "type": "github"
1457 }
1458 },
1459 "nixpkgs_12": {
14601322 "locked": {
14611323 "lastModified": 1728492678,
14621324 "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
......@@ -1471,7 +1333,7 @@
14711333 "type": "indirect"
14721334 }
14731335 },
1474 "nixpkgs_13": {
1336 "nixpkgs_11": {
14751337 "locked": {
14761338 "lastModified": 1708161998,
14771339 "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=",
......@@ -1487,7 +1349,7 @@
14871349 "type": "github"
14881350 }
14891351 },
1490 "nixpkgs_14": {
1352 "nixpkgs_12": {
14911353 "locked": {
14921354 "lastModified": 1717696253,
14931355 "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=",
......@@ -1609,15 +1471,18 @@
16091471 },
16101472 "nixpkgs_9": {
16111473 "locked": {
1612 "lastModified": 1687274257,
1613 "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=",
1614 "path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source",
1615 "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5",
1616 "type": "path"
1474 "lastModified": 1728492678,
1475 "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
1476 "owner": "nixos",
1477 "repo": "nixpkgs",
1478 "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
1479 "type": "github"
16171480 },
16181481 "original": {
1619 "id": "nixpkgs",
1620 "type": "indirect"
1482 "owner": "nixos",
1483 "ref": "nixos-unstable",
1484 "repo": "nixpkgs",
1485 "type": "github"
16211486 }
16221487 },
16231488 "pre-commit-hooks": {
......@@ -1758,16 +1623,13 @@
17581623 "darwin": "darwin",
17591624 "ghostty": "ghostty",
17601625 "home-manager": "home-manager",
1761 "homebrew-cask": "homebrew-cask",
1762 "homebrew-core": "homebrew-core",
17631626 "hosts": "hosts",
17641627 "hyprland": "hyprland",
17651628 "hyprland-plugins": "hyprland-plugins",
17661629 "nh_darwin": "nh_darwin",
1767 "nix-homebrew": "nix-homebrew",
17681630 "nix-options-search": "nix-options-search",
17691631 "nixos-cosmic": "nixos-cosmic",
1770 "nixpkgs": "nixpkgs_12",
1632 "nixpkgs": "nixpkgs_10",
17711633 "nixpkgs-stable": "nixpkgs-stable_4",
17721634 "zig": "zig_2",
17731635 "zls": "zls"
......@@ -1839,21 +1701,6 @@
18391701 "type": "github"
18401702 }
18411703 },
1842 "systems_12": {
1843 "locked": {
1844 "lastModified": 1681028828,
1845 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
1846 "owner": "nix-systems",
1847 "repo": "default",
1848 "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
1849 "type": "github"
1850 },
1851 "original": {
1852 "owner": "nix-systems",
1853 "repo": "default",
1854 "type": "github"
1855 }
1856 },
18571704 "systems_2": {
18581705 "locked": {
18591706 "lastModified": 1689347949,
......@@ -2043,7 +1890,7 @@
20431890 "zig-overlay": {
20441891 "inputs": {
20451892 "flake-compat": "flake-compat_7",
2046 "flake-utils": "flake-utils_11",
1893 "flake-utils": "flake-utils_10",
20471894 "nixpkgs": [
20481895 "zls",
20491896 "nixpkgs"
......@@ -2066,8 +1913,8 @@
20661913 "zig_2": {
20671914 "inputs": {
20681915 "flake-compat": "flake-compat_6",
2069 "flake-utils": "flake-utils_9",
2070 "nixpkgs": "nixpkgs_13"
1916 "flake-utils": "flake-utils_8",
1917 "nixpkgs": "nixpkgs_11"
20711918 },
20721919 "locked": {
20731920 "lastModified": 1728606533,
......@@ -2085,10 +1932,10 @@
20851932 },
20861933 "zls": {
20871934 "inputs": {
2088 "flake-utils": "flake-utils_10",
1935 "flake-utils": "flake-utils_9",
20891936 "gitignore": "gitignore_6",
20901937 "langref": "langref",
2091 "nixpkgs": "nixpkgs_14",
1938 "nixpkgs": "nixpkgs_12",
20921939 "zig-overlay": "zig-overlay"
20931940 },
20941941 "locked": {
flake.nix+37-37
......@@ -13,16 +13,16 @@
1313 inputs.nixpkgs.follows = "nixpkgs";
1414 };
1515
16 nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew";
17
18 homebrew-core = {
19 url = "github:homebrew/homebrew-core";
20 flake = false;
21 };
22 homebrew-cask = {
23 url = "github:homebrew/homebrew-cask";
24 flake = false;
25 };
16 # nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew";
17 #
18 # homebrew-core = {
19 # url = "github:homebrew/homebrew-core";
20 # flake = false;
21 # };
22 # homebrew-cask = {
23 # url = "github:homebrew/homebrew-cask";
24 # flake = false;
25 # };
2626
2727 hosts = {
2828 url = "github:StevenBlack/hosts";
......@@ -72,9 +72,9 @@
7272 ghostty,
7373 nixos-cosmic,
7474 nh_darwin,
75 nix-homebrew,
76 homebrew-core,
77 homebrew-cask,
75 # nix-homebrew,
76 # homebrew-core,
77 # homebrew-cask,
7878 ...
7979 } @ inputs: let
8080 overlays = [
......@@ -114,30 +114,30 @@
114114 "Natalies-MacBook-Air" = darwin.lib.darwinSystem {
115115 system = "aarch64-darwin";
116116 modules = [
117 nix-homebrew.darwinModules.nix-homebrew
118 {
119 nix-homebrew = {
120 # Install Homebrew under the default prefix
121 enable = true;
122
123 # Apple Silicon Only: Also install Homebrew under the default Intel prefix for Rosetta 2
124 enableRosetta = true;
125
126 # User owning the Homebrew prefix
127 user = "yourname";
128
129 # Optional: Declarative tap management
130 taps = {
131 "homebrew/homebrew-core" = homebrew-core;
132 "homebrew/homebrew-cask" = homebrew-cask;
133 };
134
135 # Optional: Enable fully-declarative tap management
136 #
137 # With mutableTaps disabled, taps can no longer be added imperatively with `brew tap`.
138 mutableTaps = false;
139 };
140 }
117 # nix-homebrew.darwinModules.nix-homebrew
118 # {
119 # nix-homebrew = {
120 # # Install Homebrew under the default prefix
121 # enable = true;
122 #
123 # # Apple Silicon Only: Also install Homebrew under the default Intel prefix for Rosetta 2
124 # enableRosetta = true;
125 #
126 # # User owning the Homebrew prefix
127 # user = "nmarks";
128 #
129 # # Optional: Declarative tap management
130 # taps = {
131 # "homebrew/homebrew-core" = homebrew-core;
132 # "homebrew/homebrew-cask" = homebrew-cask;
133 # };
134 #
135 # # Optional: Enable fully-declarative tap management
136 # #
137 # # With mutableTaps disabled, taps can no longer be added imperatively with `brew tap`.
138 # mutableTaps = false;
139 # };
140 # }
141141 # nh_darwin.nixDarwinModules.default
142142 {nixpkgs.overlays = overlays;}
143143 ./hosts/laptop/configuration.nix
hosts/laptop/configuration.nix+27-27
......@@ -6,7 +6,7 @@
66 # nixpkgs.overlays = [
77 # (final: prev: {nh-darwin = nh_darwin.packages.${prev.system}.default;})
88 # ];
9 environment.shellAliases.nh = "nh_darwin";
9 # environment.shellAliases.nh = "nh_darwin";
1010
1111 # programs.nh = {
1212 # enable = true;
......@@ -62,32 +62,32 @@
6262 services.tailscale.enable = true;
6363
6464 # Use homebrew to install casks and Mac App Store apps
65 homebrew = {
66 enable = true;
67
68 onActivation = {
69 autoUpdate = true;
70 cleanup = "uninstall";
71 upgrade = true;
72 };
73
74 taps = [
75 "armcord/armcord"
76 ];
77
78 casks = [
79 "1password"
80 "firefox"
81 "obsidian"
82 "raycast"
83 "armcord"
84 "battle-net"
85 ];
86
87 masApps = {
88 "wireguard" = 1451685025;
89 };
90 };
65 # homebrew = {
66 # enable = true;
67 #
68 # onActivation = {
69 # autoUpdate = true;
70 # cleanup = "uninstall";
71 # upgrade = true;
72 # };
73 #
74 # taps = [
75 # "armcord/armcord"
76 # ];
77 #
78 # casks = [
79 # "1password"
80 # "firefox"
81 # "obsidian"
82 # "raycast"
83 # "armcord"
84 # "battle-net"
85 # ];
86 #
87 # masApps = {
88 # "wireguard" = 1451685025;
89 # };
90 # };
9191
9292 # set some OSX preferences that I always end up hunting down and changing.
9393 system.defaults = {