From 7c22b891abb805c09c4044ad3a3fd8b6bf1a7baa Mon Sep 17 00:00:00 2001
From: Natalie <nmarks413@gmail.com>
Date: Thu, 10 Apr 2025 20:04:30 -0700
Subject: [PATCH 1/3] test signing

---
 hosts/desktop/home.nix         |  1 +
 hosts/laptop/configuration.nix | 11 +++++------
 hosts/shared/home-programs.nix |  1 +
 hosts/shared/packages.nix      |  5 ++++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index 182497e0437b314573445e7942156abc5f5ff383..f396264b3270d8c018c2ef1af7600ccb5428fdf8 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -57,6 +57,7 @@ in {
         kdePackages.dolphin
         #broken on macos
         calibre
+        mpv
       ]
       ++ [
         zls.packages.x86_64-linux.zls
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index f708df22aa55ddabacf0cc57c0d31d6c84a9dd14..9fb6eab90a32e8143abe7c1522318c4f8f7c10e8 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -6,6 +6,7 @@
   environment.systemPackages = [
     pkgs.home-manager
     pkgs.neovim
+    pkgs.pinentry_mac
   ];
 
   nixpkgs.config.allowUnfree = true;
@@ -56,7 +57,7 @@
 
     onActivation = {
       autoUpdate = true;
-      cleanup = "uninstall";
+      cleanup = "none";
       upgrade = true;
     };
 
@@ -66,18 +67,16 @@
 
     brews = [
       "imagemagick"
+      "opam"
     ];
 
     casks = [
-      # "1password"
-      # "firefox"
-      # "obsidian"
-      # "raycast"
-      # "legcord"
       "battle-net"
       "stremio"
       "alt-tab"
       "legcord"
+      "zulip"
+      "zen-browser"
     ];
 
     masApps = {
diff --git a/hosts/shared/home-programs.nix b/hosts/shared/home-programs.nix
index d374085a80e54b9da8413813a1b9b04200c0ff55..040ae8f0b5274a094920ff843d40e237bec32daf 100644
--- a/hosts/shared/home-programs.nix
+++ b/hosts/shared/home-programs.nix
@@ -59,6 +59,7 @@
     shellAliases = {
       reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
     };
+    shellInit = "test -r '/Users/nmarks/.opam/opam-init/init.fish' && source '/Users/nmarks/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true";
   };
 
   home-manager.enable = true;
diff --git a/hosts/shared/packages.nix b/hosts/shared/packages.nix
index b8002ba597d41d2141a0bc9cd194da8a38602843..cb174f2c5480ecd0ddb9432aabd035f1a343aceb 100644
--- a/hosts/shared/packages.nix
+++ b/hosts/shared/packages.nix
@@ -11,6 +11,8 @@ with pkgs; [
   git
   unzip
   clang
+  cmake
+  gnupg
 
   #ides
   zed-editor
@@ -65,12 +67,12 @@ with pkgs; [
   #media
   spotify
   qbittorrent
-  mpv
 
   #language servers
   typst-live
   lua-language-server
   nil
+  nixd
   texlab
   texlivePackages.chktex
 
@@ -100,6 +102,7 @@ with pkgs; [
   nodePackages.npm
   go
   coq
+  elan
 
   #gaming
   prismlauncher
-- 
2.54.0


From 7315c0796c2a442e6bae30760807c2ccf1546262 Mon Sep 17 00:00:00 2001
From: Natalie <nmarks413@gmail.com>
Date: Thu, 10 Apr 2025 20:06:11 -0700
Subject: [PATCH 2/3] remove redunancy

---
 hosts/laptop/configuration.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index 9fb6eab90a32e8143abe7c1522318c4f8f7c10e8..11a565fabeac7a346ecadc07928360a7808cbf30 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -3,10 +3,10 @@
   pkgs,
   ...
 }: {
-  environment.systemPackages = [
-    pkgs.home-manager
-    pkgs.neovim
-    pkgs.pinentry_mac
+  environment.systemPackages = with pkgs; [
+    home-manager
+    neovim
+    pinentry_mac
   ];
 
   nixpkgs.config.allowUnfree = true;
-- 
2.54.0


From 81e27779d6edcc06a3ea7db3c16efc0d9689991f Mon Sep 17 00:00:00 2001
From: Natalie <nmarks413@gmail.com>
Date: Thu, 10 Apr 2025 20:07:05 -0700
Subject: [PATCH 3/3] test signing 2

---
 hosts/shared/home-programs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosts/shared/home-programs.nix b/hosts/shared/home-programs.nix
index 040ae8f0b5274a094920ff843d40e237bec32daf..3ff5a8a0b3cb09caf597ceebf2a6797af6c0ec83 100644
--- a/hosts/shared/home-programs.nix
+++ b/hosts/shared/home-programs.nix
@@ -40,7 +40,7 @@
         # custom_colors = [];
         # fore_back = null;
       };
-      distro = null;
+      distro = "nixos";
       pride_month_shown = [
       ];
       pride_month_disable = false;
-- 
2.54.0