From 2c64a07b452de4298620dbb6f64a06248e37d773 Mon Sep 17 00:00:00 2001
From: willemml <willem@leit.so>
Date: Tue, 11 Apr 2023 00:46:24 -0700
Subject: [PATCH] fixes (vkquake don't relink, emacs and darwin packages)

---
 .../modules/profiles/user/willem/packages.nix     |  1 -
 .../user/willem/programs/emacs/default.nix        | 10 +---------
 packages/vkquake/default.nix                      | 15 ---------------
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/home-manager/modules/profiles/user/willem/packages.nix b/home-manager/modules/profiles/user/willem/packages.nix
index 1891a9d..95f9125 100644
--- a/home-manager/modules/profiles/user/willem/packages.nix
+++ b/home-manager/modules/profiles/user/willem/packages.nix
@@ -124,7 +124,6 @@ in {
       yq
       zsh-completions
     ]
-    ++ lib.optionals stdenv.isDarwin darwin
     ++ lib.optionals stdenv.isLinux linux
     ++ node-packages;
 }
diff --git a/home-manager/modules/profiles/user/willem/programs/emacs/default.nix b/home-manager/modules/profiles/user/willem/programs/emacs/default.nix
index 9b7ad24..f794b27 100644
--- a/home-manager/modules/profiles/user/willem/programs/emacs/default.nix
+++ b/home-manager/modules/profiles/user/willem/programs/emacs/default.nix
@@ -114,24 +114,16 @@
       ])
       ++ (with pkgs; [
         gnuplot
-        mu
         plantuml
         sqlite
       ]));
-  emacsConfig = pkgs.emacsWithPackagesFromUsePackage {
-    config = ./init.el;
-
-    defaultInitFile = true;
-
-    package = emacsPackage;
-  };
 in {
   home.file.".emacs.d/early-init.el".source = ./early-init.el;
   home.file.".emacs.d/init.el".source = ./init.el;
 
   programs.emacs.enable = true;
 
-  programs.emacs.package = emacsConfig;
+  programs.emacs.package = emacsPackage;
 
   services.emacs = pkgs.lib.mkIf pkgs.stdenv.isLinux {
     enable = true;
diff --git a/packages/vkquake/default.nix b/packages/vkquake/default.nix
index bf656cc..c99af79 100644
--- a/packages/vkquake/default.nix
+++ b/packages/vkquake/default.nix
@@ -50,21 +50,6 @@ stdenv.mkDerivation {
     chmod -R a+rw vkQuake.app
     ls
     cp build/vkquake vkQuake.app/Contents/Resources/vkquake
-    mkdir vkQuake.app/Contents/Frameworks
-    otool -L build/vkquake |
-    	rg nix |
-    	cut -f1 -d' ' |
-    	awk '{$1=$1};1' |
-    	sort |
-    	uniq |
-    	xargs -I {} cp {} vkQuake.app/Contents/Frameworks/.
-    otool -L vkQuake.app/Contents/Frameworks/* |
-    	rg nix |
-    	cut -f1 -d' ' |
-    	awk '{$1=$1};1' |
-    	sort |
-    	uniq |
-    	xargs -I {} cp -u {} vkQuake.app/Contents/Frameworks/.
   '';
 
   installPhase = ''