From c83a6109d1d8c3be603bbcd902d8b74d95de30ee Mon Sep 17 00:00:00 2001
From: willemml <willem@leit.so>
Date: Fri, 10 Feb 2023 09:08:10 -0800
Subject: [PATCH] pngpaste back into user profile, add mesa to utmvm

---
 home/packages.nix      | 7 ++++++-
 home/programs.nix      | 2 +-
 system/zeus.darwin.nix | 5 -----
 system/zeus.utmvm.nix  | 2 ++
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/home/packages.nix b/home/packages.nix
index 6140392..d98edba 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -1,7 +1,12 @@
 { pkgs, lib, ... }:
 
 let
-  darwin = with pkgs; [ ];
+  darwin = with pkgs; [
+    pngpaste
+    pinentry-touchid
+    pinentry-mac
+    spoof-mac
+  ];
   linux = with pkgs; [ ];
   pass-extended = pkgs.pass.withExtensions (exts: [ exts.pass-genphrase exts.pass-otp exts.pass-import ]);
   python-wp = pkgs.python310.withPackages (p: with p; [ setuptools pyaml requests latexify-py ]);
diff --git a/home/programs.nix b/home/programs.nix
index cd17f78..113710f 100644
--- a/home/programs.nix
+++ b/home/programs.nix
@@ -149,7 +149,7 @@
         ew = "emacsclient -c";
         l = "ls -1";
         np = "nix-shell -p";
-        nrs = lib.optionals pkgs.stdenv.isLinux "sudo nixos-rebuild switch --flake ${config.home.homeDirectory}/.config/dotfiles.nix#";
+        nrs = lib.mkIf pkgs.stdenv.isLinux "sudo nixos-rebuild switch --flake ${config.home.homeDirectory}/.config/dotfiles.nix#";
         org = "z ${config.home.sessionVariables.ORGDIR}";
         ubc = "z ${config.home.sessionVariables.UBCDIR}";
       };
diff --git a/system/zeus.darwin.nix b/system/zeus.darwin.nix
index f5a1644..b13a09b 100644
--- a/system/zeus.darwin.nix
+++ b/system/zeus.darwin.nix
@@ -22,13 +22,8 @@
     darwin-zsh-completions
     discord
     freecad-mac
-    gnused
     iterm2
-    pinentry-touchid
-    pinentry-mac
-    pngpaste
     qbittorrent-mac
-    spoof-mac
     spotify-mac
     utm
     vlc-mac
diff --git a/system/zeus.utmvm.nix b/system/zeus.utmvm.nix
index 8af4ae1..d00b8d4 100644
--- a/system/zeus.utmvm.nix
+++ b/system/zeus.utmvm.nix
@@ -11,6 +11,8 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.efi.efiSysMountPoint = "/boot/efi";
+
+  environment.systemPackages = with pkgs; [ mesa ];
   
   fileSystems."/" = {
     device = "/dev/disk/by-label/nixos";