From 04d7ae93f516051acfc7a573752b0d1c56737177 Mon Sep 17 00:00:00 2001 From: Nico Date: Sat, 3 May 2025 16:16:01 +1000 Subject: [PATCH] revert "nix: merge all nix programs into applications.nix" This reverts commit 29296d8bbc1ec338643883b97bbe82aa0b21d424. --- flake.nix | 1 + modules/applications.nix | 16 ---------------- modules/darwin/applications.nix | 7 +++++++ modules/linux/applications.nix | 12 ++++++++++++ 4 files changed, 20 insertions(+), 16 deletions(-) create mode 100644 modules/linux/applications.nix diff --git a/flake.nix b/flake.nix index ea6aeba..f6ba9b3 100644 --- a/flake.nix +++ b/flake.nix @@ -28,6 +28,7 @@ ./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 1a6739a..612a0fe 100644 --- a/modules/applications.nix +++ b/modules/applications.nix @@ -1,8 +1,5 @@ { config, lib, pkgs, ... }: -let - isLinux = pkgs.hostPlatform.system == "linux"; -in { environment.systemPackages = with pkgs; [ spotify @@ -12,18 +9,5 @@ in element-desktop keepassxc ani-cli - ] - ++ lib.optionals (pkgs.hostPlatform.system == "linux") [ - # linux-specific/broken on OSX - mpv - ghostty - thunderbird - krita - openutau - ] - ++ lib.optionals (pkgs.hostPlatform.system == "darwin") [ - iina - utm - raycast ]; } diff --git a/modules/darwin/applications.nix b/modules/darwin/applications.nix index 329f6f6..9eb667d 100644 --- a/modules/darwin/applications.nix +++ b/modules/darwin/applications.nix @@ -21,6 +21,13 @@ "/Applications/OpenUTAU.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 new file mode 100644 index 0000000..24c84bf --- /dev/null +++ b/modules/linux/applications.nix @@ -0,0 +1,12 @@ +{ config, lib, pkgs, ... }: + +{ + # nix pkgs + environment.systemPackages = with pkgs; [ + mpv + ghostty + thunderbird + krita + openutau + ]; +}