From 34d9c2a9db5e97ee7dc64abff6613c036b8d06d1 Mon Sep 17 00:00:00 2001 From: Abhinav Sarkar Date: Wed, 31 Jan 2024 16:00:03 +0530 Subject: [PATCH] Adds Homebrew support and packages --- flake.nix | 3 ++- homebrew.nix | 43 +++++++++++++++++++++++++++++++++++++++++++ justfile | 7 ++++++- programs/fish.nix | 1 + 4 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 homebrew.nix diff --git a/flake.nix b/flake.nix index 9b55c3e..f90684a 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "Home Manager configuration of Abhinav Sarkar"; + description = "Nix Darwin + Home Manager configuration of Abhinav Sarkar"; inputs = { nixpkgs.url = "github:nixos/nixpkgs?rev=5f5210aa20e343b7e35f40c033000db0ef80d7b9"; @@ -47,6 +47,7 @@ specialArgs = { inherit inputs; }; modules = [ ./configuration.nix + ./homebrew.nix home-manager.darwinModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/homebrew.nix b/homebrew.nix new file mode 100644 index 0000000..c5916c0 --- /dev/null +++ b/homebrew.nix @@ -0,0 +1,43 @@ +{ ... }: { + homebrew = { + enable = true; + onActivation = { + autoUpdate = false; + cleanup = "uninstall"; + upgrade = false; + }; + global = { + autoUpdate = false; + brewfile = true; + }; + casks = [ + "amethyst" + "calibre" + "dropbox" + "fanny" + "firefox" + "garmin-express" + "google-chrome" + "homebrew/cask/handbrake" + "spotify" + "telegram" + "utm" + "vlc" + ]; + masApps = { + Amphetamine = 937984704; + Bear = 1091189122; + GarageBand = 682658836; + iMovie = 408981434; + Ivory = 6444602274; + Keynote = 409183694; + Kindle = 302584613; + NextDNS = 1464122853; + Numbers = 409203825; + Pages = 409201541; + Reeder = 1449412482; + TestFlight = 899247664; + Xcode = 497799835; + }; + }; +} diff --git a/justfile b/justfile index 29cd659..c9f042f 100644 --- a/justfile +++ b/justfile @@ -30,11 +30,16 @@ _switch: _build # switch to latest home-manager generation switch: (_run "_switch") -_update: && _switch +_update: && _switch _brew-update nix flake update --commit-lock-file "{{ root_dir }}" $NIXPKGS_PATH/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh > \ {{ root_dir }}/programs/vscode/extensions.nix +_brew-update: + brew update + brew upgrade + mas upgrade + # update packages and switch update: (_run "_update") diff --git a/programs/fish.nix b/programs/fish.nix index cb9a115..2f66aa1 100644 --- a/programs/fish.nix +++ b/programs/fish.nix @@ -32,6 +32,7 @@ in { fenv source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh fenv source /etc/profiles/per-user/${username}/etc/profile.d/hm-session-vars.sh fish_add_path -m ~/.local/bin ~/.cabal/bin /etc/profiles/per-user/${username}/bin + eval "$(/usr/local/bin/brew shellenv)" ''; }; }