fixing brew nonsense

This commit is contained in:
Natalie 2024-10-11 14:37:12 -07:00
parent 1afac0b071
commit 75e3fc2ec9
3 changed files with 112 additions and 265 deletions

View file

@ -33,23 +33,6 @@
"type": "github" "type": "github"
} }
}, },
"brew-src": {
"flake": false,
"locked": {
"lastModified": 1727016223,
"narHash": "sha256-iZqd91Cp4O02BU6/eBZ0UZgJN8AlwH+0geQUpqF176E=",
"owner": "Homebrew",
"repo": "brew",
"rev": "916044581862c32fc2365e8e9ff0b1507a98925e",
"type": "github"
},
"original": {
"owner": "Homebrew",
"ref": "4.3.24",
"repo": "brew",
"type": "github"
}
},
"cachix": { "cachix": {
"inputs": { "inputs": {
"devenv": [ "devenv": [
@ -580,24 +563,6 @@
"inputs": { "inputs": {
"systems": "systems_11" "systems": "systems_11"
}, },
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_11": {
"inputs": {
"systems": "systems_12"
},
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
@ -706,24 +671,6 @@
"inputs": { "inputs": {
"systems": "systems_8" "systems": "systems_8"
}, },
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_8": {
"inputs": {
"systems": "systems_9"
},
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
@ -738,9 +685,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_9": { "flake-utils_8": {
"inputs": { "inputs": {
"systems": "systems_10" "systems": "systems_9"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1705309234,
@ -756,6 +703,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_9": {
"inputs": {
"systems": "systems_10"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"ghostty": { "ghostty": {
"inputs": { "inputs": {
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
@ -928,48 +893,16 @@
"type": "github" "type": "github"
} }
}, },
"homebrew-cask": {
"flake": false,
"locked": {
"lastModified": 1728663222,
"narHash": "sha256-znywq7nsS6xne+AJ4VLJuhVUyr2JAkmUsFw66S4DNnY=",
"owner": "homebrew",
"repo": "homebrew-cask",
"rev": "f1ce4ce295d8296afa0b613b890067345d07668e",
"type": "github"
},
"original": {
"owner": "homebrew",
"repo": "homebrew-cask",
"type": "github"
}
},
"homebrew-core": {
"flake": false,
"locked": {
"lastModified": 1728663080,
"narHash": "sha256-/4YPevo9QfB1I4d0/QEob4YKhlKe9tQPzyIR/iPlDNw=",
"owner": "homebrew",
"repo": "homebrew-core",
"rev": "a9df7e41456a591da73b2563b44c361e49cdbd50",
"type": "github"
},
"original": {
"owner": "homebrew",
"repo": "homebrew-core",
"type": "github"
}
},
"hosts": { "hosts": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1728661161, "lastModified": 1728682327,
"narHash": "sha256-DlG6hVllwffMZWPVcVCToPBmGwwr7qKQmTisixRbrdA=", "narHash": "sha256-lTYUdo00JzPLJgtvv2dETHKyZ67vSY6Vd+fOin4L2z4=",
"owner": "StevenBlack", "owner": "StevenBlack",
"repo": "hosts", "repo": "hosts",
"rev": "c3410ef0f828f954ca22fcc6c505f1657955fc9d", "rev": "ebcd90663f670627612d86de564eb504e7e63b35",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1203,50 +1136,11 @@
"type": "github" "type": "github"
} }
}, },
"nix-darwin": {
"inputs": {
"nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1716329735,
"narHash": "sha256-ap51w+VqG21vuzyQ04WrhI2YbWHd3UGz0e7dc/QQmoA=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "eac4f25028c1975a939c8f8fba95c12f8a25e01c",
"type": "github"
},
"original": {
"owner": "LnL7",
"repo": "nix-darwin",
"type": "github"
}
},
"nix-homebrew": {
"inputs": {
"brew-src": "brew-src",
"flake-utils": "flake-utils_7",
"nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs_10"
},
"locked": {
"lastModified": 1728153462,
"narHash": "sha256-jOF15LIzDf7SIkbjzhKq9nlnkS1aFTUCiIo92ipXMY4=",
"owner": "zhaofengli-wip",
"repo": "nix-homebrew",
"rev": "86af3bb8f7d365eb496ef5553646ec2fe06a3662",
"type": "github"
},
"original": {
"owner": "zhaofengli-wip",
"repo": "nix-homebrew",
"type": "github"
}
},
"nix-options-search": { "nix-options-search": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_8", "flake-utils": "flake-utils_7",
"gitignore": "gitignore_5", "gitignore": "gitignore_5",
"nixpkgs": "nixpkgs_11" "nixpkgs": "nixpkgs_9"
}, },
"locked": { "locked": {
"lastModified": 1721325991, "lastModified": 1721325991,
@ -1320,11 +1214,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1728616391, "lastModified": 1728672034,
"narHash": "sha256-xFQpxbBYaPktRuM9XBEJfWKGbq8odEikZP77+d/0o44=", "narHash": "sha256-0l9XOUKYAXIMqKcrroDAhqxlDbfeGQKvAlnOlNGXbPo=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "c0fe031a0bb89e6641f9ab3fb0d413babe4845d4", "rev": "cb94f2663d7dc9925e35e171c930681edb9b8d38",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1336,8 +1230,8 @@
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 0, "lastModified": 0,
"narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
"path": "/nix/store/r2hk87rfvc5fpfbl2bj64a3x7mcq9f6c-source", "path": "/nix/store/60sn02zhawl3kwn0r515zff3h6hg6ydz-source",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -1425,38 +1319,6 @@
} }
}, },
"nixpkgs_10": { "nixpkgs_10": {
"locked": {
"lastModified": 1716330097,
"narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": {
"lastModified": 1728492678,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_12": {
"locked": { "locked": {
"lastModified": 1728492678, "lastModified": 1728492678,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
@ -1471,7 +1333,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_13": { "nixpkgs_11": {
"locked": { "locked": {
"lastModified": 1708161998, "lastModified": 1708161998,
"narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=", "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=",
@ -1487,7 +1349,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_14": { "nixpkgs_12": {
"locked": { "locked": {
"lastModified": 1717696253, "lastModified": 1717696253,
"narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=",
@ -1609,15 +1471,18 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1687274257, "lastModified": 1728492678,
"narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
"path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source", "owner": "nixos",
"rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5", "repo": "nixpkgs",
"type": "path" "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
"type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "nixos",
"type": "indirect" "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"pre-commit-hooks": { "pre-commit-hooks": {
@ -1758,16 +1623,13 @@
"darwin": "darwin", "darwin": "darwin",
"ghostty": "ghostty", "ghostty": "ghostty",
"home-manager": "home-manager", "home-manager": "home-manager",
"homebrew-cask": "homebrew-cask",
"homebrew-core": "homebrew-core",
"hosts": "hosts", "hosts": "hosts",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprland-plugins": "hyprland-plugins", "hyprland-plugins": "hyprland-plugins",
"nh_darwin": "nh_darwin", "nh_darwin": "nh_darwin",
"nix-homebrew": "nix-homebrew",
"nix-options-search": "nix-options-search", "nix-options-search": "nix-options-search",
"nixos-cosmic": "nixos-cosmic", "nixos-cosmic": "nixos-cosmic",
"nixpkgs": "nixpkgs_12", "nixpkgs": "nixpkgs_10",
"nixpkgs-stable": "nixpkgs-stable_4", "nixpkgs-stable": "nixpkgs-stable_4",
"zig": "zig_2", "zig": "zig_2",
"zls": "zls" "zls": "zls"
@ -1839,21 +1701,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_12": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": { "systems_2": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
@ -2043,7 +1890,7 @@
"zig-overlay": { "zig-overlay": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_7", "flake-compat": "flake-compat_7",
"flake-utils": "flake-utils_11", "flake-utils": "flake-utils_10",
"nixpkgs": [ "nixpkgs": [
"zls", "zls",
"nixpkgs" "nixpkgs"
@ -2066,8 +1913,8 @@
"zig_2": { "zig_2": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_6", "flake-compat": "flake-compat_6",
"flake-utils": "flake-utils_9", "flake-utils": "flake-utils_8",
"nixpkgs": "nixpkgs_13" "nixpkgs": "nixpkgs_11"
}, },
"locked": { "locked": {
"lastModified": 1728606533, "lastModified": 1728606533,
@ -2085,10 +1932,10 @@
}, },
"zls": { "zls": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_10", "flake-utils": "flake-utils_9",
"gitignore": "gitignore_6", "gitignore": "gitignore_6",
"langref": "langref", "langref": "langref",
"nixpkgs": "nixpkgs_14", "nixpkgs": "nixpkgs_12",
"zig-overlay": "zig-overlay" "zig-overlay": "zig-overlay"
}, },
"locked": { "locked": {

View file

@ -13,16 +13,16 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew"; # nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew";
#
homebrew-core = { # homebrew-core = {
url = "github:homebrew/homebrew-core"; # url = "github:homebrew/homebrew-core";
flake = false; # flake = false;
}; # };
homebrew-cask = { # homebrew-cask = {
url = "github:homebrew/homebrew-cask"; # url = "github:homebrew/homebrew-cask";
flake = false; # flake = false;
}; # };
hosts = { hosts = {
url = "github:StevenBlack/hosts"; url = "github:StevenBlack/hosts";
@ -72,9 +72,9 @@
ghostty, ghostty,
nixos-cosmic, nixos-cosmic,
nh_darwin, nh_darwin,
nix-homebrew, # nix-homebrew,
homebrew-core, # homebrew-core,
homebrew-cask, # homebrew-cask,
... ...
} @ inputs: let } @ inputs: let
overlays = [ overlays = [
@ -114,30 +114,30 @@
"Natalies-MacBook-Air" = darwin.lib.darwinSystem { "Natalies-MacBook-Air" = darwin.lib.darwinSystem {
system = "aarch64-darwin"; system = "aarch64-darwin";
modules = [ modules = [
nix-homebrew.darwinModules.nix-homebrew # nix-homebrew.darwinModules.nix-homebrew
{ # {
nix-homebrew = { # nix-homebrew = {
# Install Homebrew under the default prefix # # Install Homebrew under the default prefix
enable = true; # enable = true;
#
# Apple Silicon Only: Also install Homebrew under the default Intel prefix for Rosetta 2 # # Apple Silicon Only: Also install Homebrew under the default Intel prefix for Rosetta 2
enableRosetta = true; # enableRosetta = true;
#
# User owning the Homebrew prefix # # User owning the Homebrew prefix
user = "yourname"; # user = "nmarks";
#
# Optional: Declarative tap management # # Optional: Declarative tap management
taps = { # taps = {
"homebrew/homebrew-core" = homebrew-core; # "homebrew/homebrew-core" = homebrew-core;
"homebrew/homebrew-cask" = homebrew-cask; # "homebrew/homebrew-cask" = homebrew-cask;
}; # };
#
# Optional: Enable fully-declarative tap management # # Optional: Enable fully-declarative tap management
# # #
# With mutableTaps disabled, taps can no longer be added imperatively with `brew tap`. # # With mutableTaps disabled, taps can no longer be added imperatively with `brew tap`.
mutableTaps = false; # mutableTaps = false;
}; # };
} # }
# nh_darwin.nixDarwinModules.default # nh_darwin.nixDarwinModules.default
{nixpkgs.overlays = overlays;} {nixpkgs.overlays = overlays;}
./hosts/laptop/configuration.nix ./hosts/laptop/configuration.nix

View file

@ -6,7 +6,7 @@
# nixpkgs.overlays = [ # nixpkgs.overlays = [
# (final: prev: {nh-darwin = nh_darwin.packages.${prev.system}.default;}) # (final: prev: {nh-darwin = nh_darwin.packages.${prev.system}.default;})
# ]; # ];
environment.shellAliases.nh = "nh_darwin"; # environment.shellAliases.nh = "nh_darwin";
# programs.nh = { # programs.nh = {
# enable = true; # enable = true;
@ -62,32 +62,32 @@
services.tailscale.enable = true; services.tailscale.enable = true;
# Use homebrew to install casks and Mac App Store apps # Use homebrew to install casks and Mac App Store apps
homebrew = { # homebrew = {
enable = true; # enable = true;
#
onActivation = { # onActivation = {
autoUpdate = true; # autoUpdate = true;
cleanup = "uninstall"; # cleanup = "uninstall";
upgrade = true; # upgrade = true;
}; # };
#
taps = [ # taps = [
"armcord/armcord" # "armcord/armcord"
]; # ];
#
casks = [ # casks = [
"1password" # "1password"
"firefox" # "firefox"
"obsidian" # "obsidian"
"raycast" # "raycast"
"armcord" # "armcord"
"battle-net" # "battle-net"
]; # ];
#
masApps = { # masApps = {
"wireguard" = 1451685025; # "wireguard" = 1451685025;
}; # };
}; # };
# set some OSX preferences that I always end up hunting down and changing. # set some OSX preferences that I always end up hunting down and changing.
system.defaults = { system.defaults = {