From 98e31513f2657d03cf6f1b0c761c953253ec4c54 Mon Sep 17 00:00:00 2001
From: Natalie <nmarks413@gmail.com>
Date: Sat, 9 Nov 2024 18:11:01 -0800
Subject: [PATCH] changes

---
 flake.nix                      | 38 ----------------------
 hosts/laptop/configuration.nix | 58 +++++++++++++++++++---------------
 hosts/laptop/home.nix          | 12 +++++--
 3 files changed, 41 insertions(+), 67 deletions(-)

diff --git a/flake.nix b/flake.nix
index a461058..5ae661f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,17 +13,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    # nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew";
-    #
-    # homebrew-core = {
-    #   url = "github:homebrew/homebrew-core";
-    #   flake = false;
-    # };
-    # homebrew-cask = {
-    #   url = "github:homebrew/homebrew-cask";
-    #   flake = false;
-    # };
-
     hosts = {
       url = "github:StevenBlack/hosts";
       #flake = false;
@@ -72,9 +61,6 @@
     ghostty,
     nixos-cosmic,
     nh_darwin,
-    # nix-homebrew,
-    # homebrew-core,
-    # homebrew-cask,
     ...
   } @ inputs: let
     overlays = [
@@ -114,30 +100,6 @@
       "Natalies-MacBook-Air" = darwin.lib.darwinSystem {
         system = "aarch64-darwin";
         modules = [
-          # nix-homebrew.darwinModules.nix-homebrew
-          # {
-          #   nix-homebrew = {
-          #     # Install Homebrew under the default prefix
-          #     enable = true;
-          #
-          #     # Apple Silicon Only: Also install Homebrew under the default Intel prefix for Rosetta 2
-          #     enableRosetta = true;
-          #
-          #     # User owning the Homebrew prefix
-          #     user = "nmarks";
-          #
-          #     # Optional: Declarative tap management
-          #     taps = {
-          #       "homebrew/homebrew-core" = homebrew-core;
-          #       "homebrew/homebrew-cask" = homebrew-cask;
-          #     };
-          #
-          #     # Optional: Enable fully-declarative tap management
-          #     #
-          #     # With mutableTaps disabled, taps can no longer be added imperatively with `brew tap`.
-          #     mutableTaps = false;
-          #   };
-          # }
           # nh_darwin.nixDarwinModules.default
           {nixpkgs.overlays = overlays;}
           ./hosts/laptop/configuration.nix
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index a97cf98..5742c6c 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -62,32 +62,38 @@
   services.tailscale.enable = true;
 
   # Use homebrew to install casks and Mac App Store apps
-  # homebrew = {
-  #   enable = true;
-  #
-  #   onActivation = {
-  #     autoUpdate = true;
-  #     cleanup = "uninstall";
-  #     upgrade = true;
-  #   };
-  #
-  #   taps = [
-  #     "armcord/armcord"
-  #   ];
-  #
-  #   casks = [
-  #     "1password"
-  #     "firefox"
-  #     "obsidian"
-  #     "raycast"
-  #     "armcord"
-  #     "battle-net"
-  #   ];
-  #
-  #   masApps = {
-  #     "wireguard" = 1451685025;
-  #   };
-  # };
+  homebrew = {
+    enable = true;
+
+    onActivation = {
+      autoUpdate = true;
+      cleanup = "uninstall";
+      upgrade = true;
+    };
+
+    # taps = [
+    #   "legcord/legcord"
+    # ];
+
+    brews = [
+      "imagemagick"
+    ];
+
+    casks = [
+      # "1password"
+      # "firefox"
+      # "obsidian"
+      # "raycast"
+      # "legcord"
+      "battle-net"
+      "stremio"
+      "alt-tab"
+    ];
+
+    masApps = {
+      "wireguard" = 1451685025;
+    };
+  };
 
   # set some OSX preferences that I always end up hunting down and changing.
   system.defaults = {
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index 84d154d..ab56a09 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -32,9 +32,14 @@
 
   home.packages = with pkgs; [
     # ghostty.packages.aarch64-darwin.default
+    lua51Packages.lua
+    lua51Packages.luarocks
+    luajitPackages.magick
+    ripgrep
+    lemonade
     anki-bin
     wireguard-tools
-    pyright
+    basedpyright
     ruff
     python312Packages.jedi-language-server
     tor
@@ -112,8 +117,8 @@
   programs.neovim = {
     viAlias = true;
     vimAlias = true;
-    extraPackages = with pkgs; [
-    ];
+    extraLuaPackages = ps: [ps.magick];
+    extraPackages = [pkgs.imagemagick];
   };
   #Link neovim config into nix
   #xdg.configFile.nvim.source = ./nvim;
@@ -130,6 +135,7 @@
       }
     ];
     shellAliases = {
+      DYLD_FALLBACK_LIBRARY_PATH = "$(brew --prefix)/lib:$DYLD_FALLBACK_LIBRARY_PATH";
     };
   };