Merge branch 'main' of https://git.thomasfamily.duckdns.org/michael/nix-dots

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;

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

user/modules/emacs.nix

@@ -0,0 +1,7 @@
+{pkgs, ...}: {
+  programs.emacs = {
+    enable = true;
+    package = pkgs.unstable.emacs;
+    extraPackages = epkgs: [epkgs.vterm];
+  };
+}