From 3ef5afeb2cda8c94be8b850f2a5d834bba454693 Mon Sep 17 00:00:00 2001 From: Nico Date: Sat, 3 May 2025 16:16:03 +1000 Subject: [PATCH] nix: merge linux/applications into applications --- modules/applications.nix | 10 +++++++++- modules/linux/applications.nix | 16 ---------------- 2 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 modules/linux/applications.nix diff --git a/modules/applications.nix b/modules/applications.nix index efc3861..9da1b3e 100644 --- a/modules/applications.nix +++ b/modules/applications.nix @@ -8,5 +8,13 @@ obsidian keepassxc ani-cli - ]; + ] ++ lib.optionals pkgs.stdenv.isLinux (with pkgs; [ + mpv + ghostty + thunderbird + krita + openutau + obs-studio + blender + ]); } diff --git a/modules/linux/applications.nix b/modules/linux/applications.nix deleted file mode 100644 index af8b518..0000000 --- a/modules/linux/applications.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ ../applications.nix ]; - - # nix pkgs - environment.systemPackages = with pkgs; [ - mpv - ghostty - thunderbird - krita - openutau - obs-studio - blender - ]; -}