Merge branch 'main' of github.com:nmarks413/nix-config

hosts/desktop/home.nix

@@ -59,6 +59,7 @@ in {
         kdePackages.dolphin
         #broken on macos
         calibre
+        mpv
       ]
       ++ [
         zls.packages.x86_64-linux.zls

hosts/laptop/configuration.nix

@@ -3,9 +3,10 @@
   pkgs,
   ...
 }: {
-  environment.systemPackages = [
+  environment.systemPackages = with pkgs; [
-    pkgs.home-manager
+    home-manager
-    pkgs.neovim
+    neovim
+    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 = {

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;
@@ -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;

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
 
   #browsers
   tor