fixing brew nonsense
This commit is contained in:
parent
1afac0b071
commit
75e3fc2ec9
3 changed files with 112 additions and 265 deletions
249
flake.lock
249
flake.lock
|
|
@ -33,23 +33,6 @@
|
|||
"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": {
|
||||
"inputs": {
|
||||
"devenv": [
|
||||
|
|
@ -580,24 +563,6 @@
|
|||
"inputs": {
|
||||
"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": {
|
||||
"lastModified": 1705309234,
|
||||
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
|
||||
|
|
@ -706,24 +671,6 @@
|
|||
"inputs": {
|
||||
"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": {
|
||||
"lastModified": 1726560853,
|
||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||
|
|
@ -738,9 +685,9 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_9": {
|
||||
"flake-utils_8": {
|
||||
"inputs": {
|
||||
"systems": "systems_10"
|
||||
"systems": "systems_9"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1705309234,
|
||||
|
|
@ -756,6 +703,24 @@
|
|||
"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": {
|
||||
"inputs": {
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
|
|
@ -928,48 +893,16 @@
|
|||
"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": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728661161,
|
||||
"narHash": "sha256-DlG6hVllwffMZWPVcVCToPBmGwwr7qKQmTisixRbrdA=",
|
||||
"lastModified": 1728682327,
|
||||
"narHash": "sha256-lTYUdo00JzPLJgtvv2dETHKyZ67vSY6Vd+fOin4L2z4=",
|
||||
"owner": "StevenBlack",
|
||||
"repo": "hosts",
|
||||
"rev": "c3410ef0f828f954ca22fcc6c505f1657955fc9d",
|
||||
"rev": "ebcd90663f670627612d86de564eb504e7e63b35",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1203,50 +1136,11 @@
|
|||
"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": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_8",
|
||||
"flake-utils": "flake-utils_7",
|
||||
"gitignore": "gitignore_5",
|
||||
"nixpkgs": "nixpkgs_11"
|
||||
"nixpkgs": "nixpkgs_9"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721325991,
|
||||
|
|
@ -1320,11 +1214,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728616391,
|
||||
"narHash": "sha256-xFQpxbBYaPktRuM9XBEJfWKGbq8odEikZP77+d/0o44=",
|
||||
"lastModified": 1728672034,
|
||||
"narHash": "sha256-0l9XOUKYAXIMqKcrroDAhqxlDbfeGQKvAlnOlNGXbPo=",
|
||||
"owner": "lilyinstarlight",
|
||||
"repo": "nixos-cosmic",
|
||||
"rev": "c0fe031a0bb89e6641f9ab3fb0d413babe4845d4",
|
||||
"rev": "cb94f2663d7dc9925e35e171c930681edb9b8d38",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1336,8 +1230,8 @@
|
|||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 0,
|
||||
"narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
|
||||
"path": "/nix/store/r2hk87rfvc5fpfbl2bj64a3x7mcq9f6c-source",
|
||||
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
|
||||
"path": "/nix/store/60sn02zhawl3kwn0r515zff3h6hg6ydz-source",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1425,38 +1319,6 @@
|
|||
}
|
||||
},
|
||||
"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": {
|
||||
"lastModified": 1728492678,
|
||||
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
|
||||
|
|
@ -1471,7 +1333,7 @@
|
|||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_13": {
|
||||
"nixpkgs_11": {
|
||||
"locked": {
|
||||
"lastModified": 1708161998,
|
||||
"narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=",
|
||||
|
|
@ -1487,7 +1349,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_14": {
|
||||
"nixpkgs_12": {
|
||||
"locked": {
|
||||
"lastModified": 1717696253,
|
||||
"narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=",
|
||||
|
|
@ -1609,15 +1471,18 @@
|
|||
},
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
"lastModified": 1687274257,
|
||||
"narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=",
|
||||
"path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source",
|
||||
"rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5",
|
||||
"type": "path"
|
||||
"lastModified": 1728492678,
|
||||
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"type": "indirect"
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"pre-commit-hooks": {
|
||||
|
|
@ -1758,16 +1623,13 @@
|
|||
"darwin": "darwin",
|
||||
"ghostty": "ghostty",
|
||||
"home-manager": "home-manager",
|
||||
"homebrew-cask": "homebrew-cask",
|
||||
"homebrew-core": "homebrew-core",
|
||||
"hosts": "hosts",
|
||||
"hyprland": "hyprland",
|
||||
"hyprland-plugins": "hyprland-plugins",
|
||||
"nh_darwin": "nh_darwin",
|
||||
"nix-homebrew": "nix-homebrew",
|
||||
"nix-options-search": "nix-options-search",
|
||||
"nixos-cosmic": "nixos-cosmic",
|
||||
"nixpkgs": "nixpkgs_12",
|
||||
"nixpkgs": "nixpkgs_10",
|
||||
"nixpkgs-stable": "nixpkgs-stable_4",
|
||||
"zig": "zig_2",
|
||||
"zls": "zls"
|
||||
|
|
@ -1839,21 +1701,6 @@
|
|||
"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": {
|
||||
"locked": {
|
||||
"lastModified": 1689347949,
|
||||
|
|
@ -2043,7 +1890,7 @@
|
|||
"zig-overlay": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_7",
|
||||
"flake-utils": "flake-utils_11",
|
||||
"flake-utils": "flake-utils_10",
|
||||
"nixpkgs": [
|
||||
"zls",
|
||||
"nixpkgs"
|
||||
|
|
@ -2066,8 +1913,8 @@
|
|||
"zig_2": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_6",
|
||||
"flake-utils": "flake-utils_9",
|
||||
"nixpkgs": "nixpkgs_13"
|
||||
"flake-utils": "flake-utils_8",
|
||||
"nixpkgs": "nixpkgs_11"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728606533,
|
||||
|
|
@ -2085,10 +1932,10 @@
|
|||
},
|
||||
"zls": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_10",
|
||||
"flake-utils": "flake-utils_9",
|
||||
"gitignore": "gitignore_6",
|
||||
"langref": "langref",
|
||||
"nixpkgs": "nixpkgs_14",
|
||||
"nixpkgs": "nixpkgs_12",
|
||||
"zig-overlay": "zig-overlay"
|
||||
},
|
||||
"locked": {
|
||||
|
|
|
|||
74
flake.nix
74
flake.nix
|
|
@ -13,16 +13,16 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew";
|
||||
|
||||
homebrew-core = {
|
||||
url = "github:homebrew/homebrew-core";
|
||||
flake = false;
|
||||
};
|
||||
homebrew-cask = {
|
||||
url = "github:homebrew/homebrew-cask";
|
||||
flake = false;
|
||||
};
|
||||
# nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew";
|
||||
#
|
||||
# homebrew-core = {
|
||||
# url = "github:homebrew/homebrew-core";
|
||||
# flake = false;
|
||||
# };
|
||||
# homebrew-cask = {
|
||||
# url = "github:homebrew/homebrew-cask";
|
||||
# flake = false;
|
||||
# };
|
||||
|
||||
hosts = {
|
||||
url = "github:StevenBlack/hosts";
|
||||
|
|
@ -72,9 +72,9 @@
|
|||
ghostty,
|
||||
nixos-cosmic,
|
||||
nh_darwin,
|
||||
nix-homebrew,
|
||||
homebrew-core,
|
||||
homebrew-cask,
|
||||
# nix-homebrew,
|
||||
# homebrew-core,
|
||||
# homebrew-cask,
|
||||
...
|
||||
} @ inputs: let
|
||||
overlays = [
|
||||
|
|
@ -114,30 +114,30 @@
|
|||
"Natalies-MacBook-Air" = darwin.lib.darwinSystem {
|
||||
system = "aarch64-darwin";
|
||||
modules = [
|
||||
nix-homebrew.darwinModules.nix-homebrew
|
||||
{
|
||||
nix-homebrew = {
|
||||
# Install Homebrew under the default prefix
|
||||
enable = true;
|
||||
|
||||
# Apple Silicon Only: Also install Homebrew under the default Intel prefix for Rosetta 2
|
||||
enableRosetta = true;
|
||||
|
||||
# User owning the Homebrew prefix
|
||||
user = "yourname";
|
||||
|
||||
# Optional: Declarative tap management
|
||||
taps = {
|
||||
"homebrew/homebrew-core" = homebrew-core;
|
||||
"homebrew/homebrew-cask" = homebrew-cask;
|
||||
};
|
||||
|
||||
# Optional: Enable fully-declarative tap management
|
||||
#
|
||||
# With mutableTaps disabled, taps can no longer be added imperatively with `brew tap`.
|
||||
mutableTaps = false;
|
||||
};
|
||||
}
|
||||
# nix-homebrew.darwinModules.nix-homebrew
|
||||
# {
|
||||
# nix-homebrew = {
|
||||
# # Install Homebrew under the default prefix
|
||||
# enable = true;
|
||||
#
|
||||
# # Apple Silicon Only: Also install Homebrew under the default Intel prefix for Rosetta 2
|
||||
# enableRosetta = true;
|
||||
#
|
||||
# # User owning the Homebrew prefix
|
||||
# user = "nmarks";
|
||||
#
|
||||
# # Optional: Declarative tap management
|
||||
# taps = {
|
||||
# "homebrew/homebrew-core" = homebrew-core;
|
||||
# "homebrew/homebrew-cask" = homebrew-cask;
|
||||
# };
|
||||
#
|
||||
# # Optional: Enable fully-declarative tap management
|
||||
# #
|
||||
# # With mutableTaps disabled, taps can no longer be added imperatively with `brew tap`.
|
||||
# mutableTaps = false;
|
||||
# };
|
||||
# }
|
||||
# nh_darwin.nixDarwinModules.default
|
||||
{nixpkgs.overlays = overlays;}
|
||||
./hosts/laptop/configuration.nix
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
# nixpkgs.overlays = [
|
||||
# (final: prev: {nh-darwin = nh_darwin.packages.${prev.system}.default;})
|
||||
# ];
|
||||
environment.shellAliases.nh = "nh_darwin";
|
||||
# environment.shellAliases.nh = "nh_darwin";
|
||||
|
||||
# programs.nh = {
|
||||
# enable = true;
|
||||
|
|
@ -62,32 +62,32 @@
|
|||
services.tailscale.enable = true;
|
||||
|
||||
# Use homebrew to install casks and Mac App Store apps
|
||||
homebrew = {
|
||||
enable = true;
|
||||
|
||||
onActivation = {
|
||||
autoUpdate = true;
|
||||
cleanup = "uninstall";
|
||||
upgrade = true;
|
||||
};
|
||||
|
||||
taps = [
|
||||
"armcord/armcord"
|
||||
];
|
||||
|
||||
casks = [
|
||||
"1password"
|
||||
"firefox"
|
||||
"obsidian"
|
||||
"raycast"
|
||||
"armcord"
|
||||
"battle-net"
|
||||
];
|
||||
|
||||
masApps = {
|
||||
"wireguard" = 1451685025;
|
||||
};
|
||||
};
|
||||
# homebrew = {
|
||||
# enable = true;
|
||||
#
|
||||
# onActivation = {
|
||||
# autoUpdate = true;
|
||||
# cleanup = "uninstall";
|
||||
# upgrade = true;
|
||||
# };
|
||||
#
|
||||
# taps = [
|
||||
# "armcord/armcord"
|
||||
# ];
|
||||
#
|
||||
# casks = [
|
||||
# "1password"
|
||||
# "firefox"
|
||||
# "obsidian"
|
||||
# "raycast"
|
||||
# "armcord"
|
||||
# "battle-net"
|
||||
# ];
|
||||
#
|
||||
# masApps = {
|
||||
# "wireguard" = 1451685025;
|
||||
# };
|
||||
# };
|
||||
|
||||
# set some OSX preferences that I always end up hunting down and changing.
|
||||
system.defaults = {
|
||||
|
|
|
|||
Loading…
Reference in a new issue