From fddd6559164cef4ed1195926a9330bdaae7057f9 Mon Sep 17 00:00:00 2001
From: ElnuDev <elnu@elnu.com>
Date: Wed, 8 Nov 2023 00:03:49 -0800
Subject: [PATCH] Add command line utility apps to servers

---
 hosts/apps-desktop.nix | 50 ++++++++++++++++++++++++++++++++++++++++++
 hosts/apps.nix         | 48 +++-------------------------------------
 hosts/home-desktop.nix |  2 +-
 hosts/home.nix         |  1 +
 4 files changed, 55 insertions(+), 46 deletions(-)
 create mode 100644 hosts/apps-desktop.nix

diff --git a/hosts/apps-desktop.nix b/hosts/apps-desktop.nix
new file mode 100644
index 0000000..242fa5d
--- /dev/null
+++ b/hosts/apps-desktop.nix
@@ -0,0 +1,50 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    # Desktop command line utilities
+    wine
+    pandoc
+    texlive.combined.scheme-full
+
+    # Programming languages
+    jdk
+
+    # Tray applications
+    networkmanagerapplet # nm-applet
+    nextcloud-client
+    protonmail-bridge
+
+    # GNOME apps
+    gnome.cheese
+    gnome.nautilus
+    gnome.file-roller
+    gnome.gnome-calculator
+    gnome.gnome-disk-utility
+    gnome.simple-scan
+
+    # Applications
+    anki-bin
+    mpv # required for audio
+    discord
+    gimp
+    krita
+    inkscape
+    obs-studio
+    qbittorrent
+    pureref
+    libreoffice
+    gnome.ghex
+    evince
+    pdfsam-basic
+    steam
+    sqlitebrowser
+    vscodium
+    zoom-us
+    thunderbird
+    blender
+
+    # Games
+    prismlauncher
+  ];
+}
diff --git a/hosts/apps.nix b/hosts/apps.nix
index 08a11be..d2e7ed3 100644
--- a/hosts/apps.nix
+++ b/hosts/apps.nix
@@ -2,55 +2,13 @@
 
 {
   home.packages = with pkgs; [
-    # Command line utilities
+    # Essential command line utilities
     wget
     neofetch
     killall
     htop
     trash-cli # aliased to rm in .bashrc
-    unzip pipes
-    wine
-    pandoc
-    texlive.combined.scheme-full
-
-    # Programming languages
-    jdk
-
-    # Tray applications
-    networkmanagerapplet # nm-applet
-    nextcloud-client
-    protonmail-bridge
-
-    # GNOME apps
-    gnome.cheese
-    gnome.nautilus
-    gnome.file-roller
-    gnome.gnome-calculator
-    gnome.gnome-disk-utility
-    gnome.simple-scan
-
-    # Applications
-    anki-bin
-    mpv # required for audio
-    discord
-    gimp
-    krita
-    inkscape
-    obs-studio
-    qbittorrent
-    pureref
-    libreoffice
-    gnome.ghex
-    evince
-    pdfsam-basic
-    steam
-    sqlitebrowser
-    vscodium
-    zoom-us
-    thunderbird
-    blender
-
-    # Games
-    prismlauncher
+    unzip
+    pipes
   ];
 }
diff --git a/hosts/home-desktop.nix b/hosts/home-desktop.nix
index 35c9b48..2c74f32 100644
--- a/hosts/home-desktop.nix
+++ b/hosts/home-desktop.nix
@@ -5,7 +5,7 @@ let
 in
 {
   imports = [
-    ./apps.nix
+    ./apps-desktop.nix
     ../modules/bash
     #../modules/emacs
     ../modules/fcitx5
diff --git a/hosts/home.nix b/hosts/home.nix
index 64ab75a..faf955f 100644
--- a/hosts/home.nix
+++ b/hosts/home.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ../modules/git
+    ./apps.nix
   ];
 
   home = {