fix brew-src input.

This commit is contained in:
Olaf
2026-09-08 16:23:47 +02:00
parent f21017f708
commit 9ffa766ed9
2 changed files with 24 additions and 7 deletions
+23 -6
View File
@@ -1,25 +1,31 @@
{ {
description = "Starter configuration for macOS with nix-darwin"; description = "Starter configuration for macOS with nix-darwin";
inputs = { inputs = {
nixpkgs = { nixpkgs = {
url = "github:nixos/nixpkgs//nixpkgs-26.05-darwin"; url = "github:nixos/nixpkgs//nixpkgs-26.05-darwin";
# url = "github:nixos/nixpkgs/nixpkgs-unstable"; # url = "github:nixos/nixpkgs/nixpkgs-unstable";
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
}; };
nixd = { nixd = {
url = "github:nix-community/nixd"; url = "github:nix-community/nixd";
}; };
darwin = { darwin = {
# url = "github:nix-darwin/nix-darwin"; # url = "github:nix-darwin/nix-darwin";
url = "github:nix-darwin/nix-darwin/nix-darwin-26.05"; url = "github:nix-darwin/nix-darwin/nix-darwin-26.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
brew-src = { brew-src = {
url = "github:Homebrew/brew/master"; url = "github:Homebrew/brew/main";
flake = false; flake = false;
}; };
nix-homebrew = { nix-homebrew = {
url = "github:zhaofengli-wip/nix-homebrew"; url = "github:zhaofengli-wip/nix-homebrew";
inputs.brew-src.follows = "brew-src"; inputs.brew-src.follows = "brew-src";
@@ -29,20 +35,25 @@
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;
}; };
sops-nix = { sops-nix = {
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-vscode-extensions = { nix-vscode-extensions = {
url = "github:nix-community/nix-vscode-extensions"; url = "github:nix-community/nix-vscode-extensions";
}; };
catppuccin = { catppuccin = {
url = "github:catppuccin/nix"; url = "github:catppuccin/nix";
}; };
llm-agents = { llm-agents = {
url = "github:numtide/llm-agents.nix"; url = "github:numtide/llm-agents.nix";
}; };
@@ -52,6 +63,7 @@
# url = "github:hraban/mac-app-util"; # url = "github:hraban/mac-app-util";
# }; # };
}; };
outputs = outputs =
{ {
self, self,
@@ -74,7 +86,9 @@
"aarch64-darwin" "aarch64-darwin"
"x86_64-darwin" "x86_64-darwin"
]; ];
forAllSystems = f: nixpkgs.lib.genAttrs darwinSystems f; forAllSystems = f: nixpkgs.lib.genAttrs darwinSystems f;
devShell = devShell =
system: system:
let let
@@ -88,14 +102,17 @@
bashInteractive bashInteractive
git git
]; ];
shellHook = with pkgs; ''
shellHook = ''
export EDITOR=vim export EDITOR=vim
''; '';
buildInputs = with pkgs; [ buildInputs = with pkgs; [
rnix-lsp rnix-lsp
]; ];
}; };
}; };
mkApp = scriptName: system: { mkApp = scriptName: system: {
type = "app"; type = "app";
program = "${ program = "${
@@ -108,6 +125,7 @@
'') '')
}/bin/${scriptName}"; }/bin/${scriptName}";
}; };
mkDarwinApps = system: { mkDarwinApps = system: {
"apply" = mkApp "apply" system; "apply" = mkApp "apply" system;
"build" = mkApp "build" system; "build" = mkApp "build" system;
@@ -127,7 +145,6 @@
modules = [ modules = [
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
nix-homebrew.darwinModules.nix-homebrew nix-homebrew.darwinModules.nix-homebrew
# mac-app-util.darwinModules.default
{ {
nix-homebrew = { nix-homebrew = {
inherit user; inherit user;
@@ -139,12 +156,12 @@
mutableTaps = false; mutableTaps = false;
autoMigrate = true; autoMigrate = true;
}; };
home-manager.sharedModules = [
# mac-app-util.homeManagerModules.default
catppuccin.homeModules.catppuccin
home-manager.sharedModules = [
catppuccin.homeModules.catppuccin
]; ];
} }
./hosts/darwin ./hosts/darwin
]; ];
} }
+1 -1
View File
@@ -1,7 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
emacsOverlaySha256 = "1ypxan48239skivldlk5fnl99r7gwm5rzblgkpy4x7n0hixamkig"; emacsOverlaySha256 = "1nf0qdkbabakbxkg358cps0c941irn3rff69cabl7b4vjfd3cra3";
in in
{ {
home-manager.backupFileExtension = "nix-backup"; home-manager.backupFileExtension = "nix-backup";