🔧 Fix packages for mac

turtton · Jan 16, 2025 · 58cefd2 · 58cefd2
1 parent 160aaa7
commit 58cefd2
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 23 deletions.
diff --git a/home-manager/cli/dev/cargo.nix b/home-manager/cli/dev/cargo.nix
@@ -22,7 +22,7 @@ in
     cargo-machete # unused dependencies detector
     cargo-features-manager # unused feature detector
     cargo-watch # auto-reload
-    cargo-vet # crate security checker
+    # cargo-vet # crate security checker TODO: https://github.com/NixOS/nixpkgs/pull/370510
     crate2nix
   ];
   # clang+mold could not resolve devEnv libraries defined in flake

diff --git a/home-manager/cli/shared/gpg.nix b/home-manager/cli/shared/gpg.nix
@@ -7,6 +7,6 @@
   };
   services.gpg-agent = {
     enable = true;
-    pinentryPackage = pkgs.pinentry-qt;
+    pinentryPackage = if pkgs.hostPlatform.isLinux then pkgs.pinentry-all else pkgs.pinentry_mac;
   };
 }
diff --git a/home-manager/gui/dev/default.nix b/home-manager/gui/dev/default.nix
@@ -3,12 +3,12 @@
     ./idea
     ./vscode.nix
   ];
-  home.packages = (with pkgs; [
-    insomnia # RestAPI dev	tool
-    remmina # Remote desktop client
+  home.packages = with pkgs; [
+    hoppscotch # WebAPI dev	tool
     gitify
     drawio
-  ]) ++ pkgs.lib.optionals pkgs.hostPlatform.isLinux [
-    pkgs.unityhub
+  ] ++ lib.optionals hostPlatform.isLinux [
+    unityhub
+    remmina # Remote desktop client TODO: https://github.com/NixOS/nixpkgs/pull/372613
   ];
 }
diff --git a/home-manager/gui/dev/idea/default.nix b/home-manager/gui/dev/idea/default.nix
@@ -2,9 +2,10 @@
 let
   # https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/applications/editors/jetbrains/plugins/plugins.json
   plugins = [
+    "github-copilot"
     "ideavim"
     "nixidea"
-  ] ++ pkgs.lib.optionals pkgs.hostPlatform.isLinux [ "github-copilot" ];
+  ];
   applyPlugins = ide: with pkgs; (jetbrains.plugins.addPlugins ide plugins);
   ides = with pkgs.jetbrains; [
     idea-ultimate
@@ -16,11 +17,12 @@ let
   ];
 in
 {
-  home.packages = with pkgs; lib.optionals hostPlatform.isLinux [
-    android-studio
-    # basically should not use toolbox because of issues(https://github.com/NixOS/nixpkgs/issues/240444) but useful to preview IDE 
-    jetbrains-toolbox
-  ]
-  ++ (map (ide: (applyPlugins ide)) ides);
+  home.packages = with pkgs; if hostPlatform.isLinux then
+    [
+      android-studio
+      # basically should not use toolbox because of issues(https://github.com/NixOS/nixpkgs/issues/240444) but useful to preview IDE 
+      jetbrains-toolbox
+    ] ++ (map (ide: (applyPlugins ide)) ides)
+  else ides;
   home.file.".ideavimrc".source = ./ideavimrc;
 }
diff --git a/home-manager/gui/shared/browser.nix b/home-manager/gui/shared/browser.nix
@@ -4,8 +4,11 @@ let
 in
 {
   programs = {
-    firefox.enable = true;
-    chromium.enable = true;
+    firefox = {
+      enable = true;
+      package = if isLinux then pkgs.firefox else pkgs.firefox-unwrapped;
+    };
+    chromium.enable = isLinux;
     vivaldi.enable = isLinux;
   };
   home.packages = pkgs.lib.optionals isLinux [

diff --git a/home-manager/gui/shared/media.nix b/home-manager/gui/shared/media.nix
@@ -1,12 +1,13 @@
 { pkgs, ... }: {
-  home.packages = (with pkgs; [
-    mpv
-    tauon
+  home.packages = with pkgs; [
     spotify
     yt-dlp
-  ]) ++ pkgs.lib.optionals pkgs.hostPlatform.isLinux [
-    pkgs.vlc
-    pkgs.kdenlive
+  ]
+  ++ lib.optionals hostPlatform.isLinux [
+    mpv
+    tauon
+    vlc
+    kdenlive
   ];
-  programs.obs-studio.enable = true;
+  programs.obs-studio.enable = pkgs.hostPlatform.isLinux;
 }