5 files changed, 50 insertions, 33 deletions
diff --git a/hosts/common/core/default.nix b/hosts/common/core/default.nix
index ba8a861..fdd5589 100644
--- a/hosts/common/core/default.nix
+++ b/hosts/common/core/default.nix
@@ -13,55 +13,35 @@
   #  inherit (pkgs)
   environment.systemPackages = with pkgs; [
     acl
-    ansible
     bash
     bc
     bind
     binutils
-    bpftools
     bzip2
     colordiff
     conntrack-tools
     coreutils
     cpio
     curl
-    dict
     diffutils
     dig
     dmidecode
-    encfs
-    enscript
     ethtool
-    expect
-    ffmpeg
     file
     findutils
-    fio
-    flac
-    fortune
     fping
-    ghostscript
     git
     gnugrep
     gnupatch
     gnused
     gnutar
     gzip
-    imagemagick
-    inxi
-    iotop
-    ipcalc
-    iperf
     iproute2
     iputils
-    jq
-    lame
     less
     lshw
     lsof
     lvm2
-    mkvtoolnix
-    mutt
     nano
     netcat-openbsd
     nettools
@@ -73,22 +53,16 @@
     openssl
     patchelf
     pciutils
-    poppler_utils
-    powertop
     procps
     psmisc
     pv
     pwgen
     qemu_kvm
-    qrencode
-    radeontop
     recode
     rsync
     sg3_utils
     socat
-    speedtest-cli
     sqlite
-    sshfs
     stoken
     strace
     sysstat
@@ -103,11 +77,9 @@
     util-linux
     vim
     wdiff
-    weechat
     wget
     whois
     wireguard-tools
-    x265
     xz
     zip
     zstd#;
diff --git a/hosts/common/optional/misc.nix b/hosts/common/optional/misc.nix
new file mode 100644
index 0000000..60565a9
--- /dev/null
+++ b/hosts/common/optional/misc.nix
@@ -0,0 +1,28 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    ansible
+    bpftools
+    dict
+    encfs
+    enscript
+    expect
+    fio
+    fortune
+    ghostscript
+    imagemagick
+    inxi
+    iotop
+    ipcalc
+    iperf
+    jq
+    mutt
+    poppler_utils
+    powertop
+    qrencode
+    radeontop
+    speedtest-cli
+    sshfs
+    weechat
+  ];
+}
diff --git a/hosts/common/optional/multimedia.nix b/hosts/common/optional/multimedia.nix
new file mode 100644
index 0000000..fd8a83c
--- /dev/null
+++ b/hosts/common/optional/multimedia.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+{
+  #environment.systemPackages = builtins.attrValues {
+  #  inherit (pkgs)
+  environment.systemPackages = with pkgs; [
+    ffmpeg
+    flac
+    lame
+    mkvtoolnix
+    x265#;
+  ];
+  #};
+}
diff --git a/hosts/ginaz/default.nix b/hosts/ginaz/default.nix
index f3ef8e2..d9b4526 100644
--- a/hosts/ginaz/default.nix
+++ b/hosts/ginaz/default.nix
@@ -23,6 +23,8 @@
     ../common/optional/dev.nix
     ../common/optional/games.nix
     ../common/optional/google-authenticator.nix
+    ../common/optional/misc.nix
+    ../common/optional/multimedia.nix
     ../common/optional/pipewire.nix
     ../common/optional/sdr.nix
     ../common/optional/services/openssh.nix
diff --git a/hosts/richese/default.nix b/hosts/richese/default.nix
index a404535..979bd24 100644
--- a/hosts/richese/default.nix
+++ b/hosts/richese/default.nix
@@ -14,13 +14,15 @@
   imports = [
     ./hardware-configuration.nix
     ../common/core
-    ../common/optional/db.nix
-    ../common/optional/dev.nix
-    ../common/optional/pipewire.nix
+    #../common/optional/db.nix
+    #../common/optional/dev.nix
+    #../common/optional/misc.nix
+    #../common/optional/multimedia.nix
+    #../common/optional/pipewire.nix
     ../common/optional/services/openssh.nix
-    ../common/optional/services/xorg.nix
+    #../common/optional/services/xorg.nix
     ../common/optional/zfs.nix
-    ../common/users/nipsy
+    #../common/users/nipsy
     ../common/users/root
   ];