diff --git a/flake.nix b/flake.nix index f6ba9b3..ea6aeba 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,6 @@ ./modules/linux/desktop.nix ./modules/linux/ssh.nix ./modules/linux/opensnitch.nix - ./modules/linux/applications.nix ./modules/linux/hyprland.nix ./modules/linux/users.nix ./modules/linux/secureboot.nix diff --git a/modules/applications.nix b/modules/applications.nix index 612a0fe..28b230d 100644 --- a/modules/applications.nix +++ b/modules/applications.nix @@ -1,5 +1,8 @@ { config, lib, pkgs, ... }: +let + isLinux = pkgs.hostPlatform.system == "linux"; +in { environment.systemPackages = with pkgs; [ spotify @@ -9,5 +12,16 @@ element-desktop keepassxc ani-cli + ] + ++ lib.optionals (pkgs.hostPlatform.system == "linux") [ + # linux-specific/broken on OSX + mpv + ghostty + thunderbird + ] + ++ lib.optionals (pkgs.hostPlatform.system == "darwin") [ + iina + utm + raycast ]; } diff --git a/modules/darwin/applications.nix b/modules/darwin/applications.nix index 8064c75..2c078ab 100644 --- a/modules/darwin/applications.nix +++ b/modules/darwin/applications.nix @@ -19,13 +19,6 @@ "${pkgs.gimp}/Applications/GNU Image Manipulation Program.app" ]; - # nix pkgs - environment.systemPackages = with pkgs; [ - iina - utm - raycast # it actually picks up on my applications installed through nix (crazy right) - ]; - # homebrew pkgs homebrew = { enable = true; diff --git a/modules/linux/applications.nix b/modules/linux/applications.nix deleted file mode 100644 index 2173bd6..0000000 --- a/modules/linux/applications.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - # nix pkgs - environment.systemPackages = with pkgs; [ - mpv - ghostty - thunderbird - ]; -}