From ead04d4bc0ba4182733908780021f5f4557d74c3 Mon Sep 17 00:00:00 2001 From: Abhinav Sarkar Date: Sat, 23 Nov 2024 22:49:32 +0530 Subject: [PATCH] Changes for m4 --- flake.nix | 6 ++++-- homebrew.nix | 11 ++--------- nix.nix | 5 ++++- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index a916b53..1bf9051 100644 --- a/flake.nix +++ b/flake.nix @@ -55,7 +55,7 @@ ... }: let - system = "x86_64-darwin"; + system = "aarch64-darwin"; pkgs = import nixpkgs { inherit system; config = { @@ -70,7 +70,7 @@ }; in { - darwinConfigurations."Abhinavs-MacBook-Pro" = nix-darwin.lib.darwinSystem { + darwinConfigurations."Abhinavs-M4-MacBook-Pro" = nix-darwin.lib.darwinSystem { inherit system; specialArgs = { inherit inputs pkgs-stable; @@ -96,6 +96,8 @@ buildInputs = with pkgs; [ (import home-manager { inherit pkgs; }).home-manager just + nix-output-monitor + nvd ]; shellHook = '' export NIXPKGS_PATH=${pkgs.path}; diff --git a/homebrew.nix b/homebrew.nix index 4e17a6a..c4468b7 100644 --- a/homebrew.nix +++ b/homebrew.nix @@ -25,20 +25,14 @@ "appcleaner" "calibre" "dropbox" - "fanny" "firefox" - "garmin-express" "google-chrome" - "homebrew/cask/handbrake" - "lastfm" "monodraw" - "obsidian" "signal" "spotify" - "steam" +# "steam" "telegram" - "utm" - "vlc" +# "vlc" "zed" ]; masApps = { @@ -51,7 +45,6 @@ NextDNS = 1464122853; Numbers = 409203825; Pages = 409201541; - Reeder = 1449412482; TestFlight = 899247664; Xcode = 497799835; }; diff --git a/nix.nix b/nix.nix index d301532..50bafa9 100644 --- a/nix.nix +++ b/nix.nix @@ -49,6 +49,8 @@ in distributedBuilds = true; linux-builder = { enable = true; + package = pkgs.darwin.linux-builder-x86_64; + systems = [ "x86_64-linux" ]; maxJobs = 3; config = ( { pkgs, ... }: @@ -68,13 +70,14 @@ in nix.settings = nixSettings // { sandbox = false; }; + nixpkgs.config.allowUnfree = true; environment.systemPackages = [ pkgs.htop ]; } ); }; }; nixpkgs = { - hostPlatform = "x86_64-darwin"; + hostPlatform = "aarch64-darwin"; config.allowUnfree = true; }; }