From 148b537c444a1e01fa13bef729c4a0fcaae74890 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Mon, 15 Jan 2024 22:21:24 -0500 Subject: [PATCH 1/2] feat(mac): completely remove homebrew --- machines/mac/configuration.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/machines/mac/configuration.nix b/machines/mac/configuration.nix index d6fb55d..5ae9b07 100644 --- a/machines/mac/configuration.nix +++ b/machines/mac/configuration.nix @@ -32,6 +32,8 @@ checkstyle # XCode cocoapods + # Android Development + android-tools ]; }; @@ -53,22 +55,6 @@ nix-daemon.enable = true; }; - homebrew = { - enable = true; - onActivation = { - # Auto update packages - autoUpdate = true; - # Uninstall not listed packages and casks - cleanup = "zap"; - # Upgrade outdated formulae on activation - upgrade = true; - }; - casks = [ - "hiddenbar" - "android-platform-tools" - ]; - }; - nixpkgs = { # Workaround for pyopenssl being marked broken config.allowBroken = true; From 0b7b01fe884be86897120c08f8d9efe6215bd53a Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Wed, 17 Jan 2024 11:44:16 -0500 Subject: [PATCH 2/2] feat: init emacs --- user/environments/mac/home.nix | 1 + user/modules/emacs.nix | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 user/modules/emacs.nix diff --git a/user/environments/mac/home.nix b/user/environments/mac/home.nix index daa23f8..670efbd 100644 --- a/user/environments/mac/home.nix +++ b/user/environments/mac/home.nix @@ -2,6 +2,7 @@ imports = [ ../../modules/zsh.nix ../../modules/dev.nix + ../../modules/emacs.nix ../../modules/git.nix ../../modules/fonts.nix ../../modules/latex.nix diff --git a/user/modules/emacs.nix b/user/modules/emacs.nix new file mode 100644 index 0000000..6424dac --- /dev/null +++ b/user/modules/emacs.nix @@ -0,0 +1,7 @@ +{pkgs, ...}: { + programs.emacs = { + enable = true; + package = pkgs.unstable.emacs; + extraPackages = epkgs: [epkgs.vterm]; + }; +}