From bf4c3b2b19909b46ed8a129a2f356758a98f5c52 Mon Sep 17 00:00:00 2001
From: Kenny Ballou <kballou@devnulllabs.io>
Date: Thu, 21 Jan 2021 13:11:40 -0700
Subject: packages: split packages into purpose

Signed-off-by: Kenny Ballou <kballou@devnulllabs.io>
---
 daeva/configuration.nix |  3 +-
 packages/base.nix       | 92 +++++++++++++++++++++++++++++++++++++++++++++++++
 packages/desktop.nix    | 11 ++++++
 3 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 packages/base.nix
 create mode 100644 packages/desktop.nix

diff --git a/daeva/configuration.nix b/daeva/configuration.nix
index a559d3c..bb698cd 100644
--- a/daeva/configuration.nix
+++ b/daeva/configuration.nix
@@ -8,6 +8,8 @@
   imports = [
     ../hardware-configuration.nix
     ../overlays.nix
+    ../packages/base.nix
+    ../packages/desktop.nix
     ../programs/mtr.nix
     ../secrets.nix
     ../services/clamav.nix
@@ -30,7 +32,6 @@
     ../system/networking.nix
     ../system/nix.nix
     ../system/opengl.nix
-    ../system/packages.nix
     ../system/security.nix
     ../system/timezone.nix
     ../system/users.nix
diff --git a/packages/base.nix b/packages/base.nix
new file mode 100644
index 0000000..c06b939
--- /dev/null
+++ b/packages/base.nix
@@ -0,0 +1,92 @@
+{ config, pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    ag
+    apg
+    aria2
+    aspell
+    bash-completion
+    bashInteractive
+    cacert
+    clamav
+    cryptsetup
+    diffstat
+    diffutils
+    dnsutils
+    dos2unix
+    dot2tex
+    duplicity
+    entr
+    exiv2
+    fd
+    ffmpeg
+    file
+    findutils
+    fontconfig
+    fzf
+    gawk
+    git
+    gnugrep
+    gnupg
+    gnused
+    gnutar
+    gnutls
+    gptfdisk
+    groff
+    htop
+    httperf
+    iotop
+    iperf
+    jq
+    less
+    linux-overlay
+    lsof
+    ltrace
+    #mitmproxy
+    mkpasswd
+    mtr
+    ncdu
+    nfs-utils
+    nixOverlay
+    nmap
+    openssh
+    openssl
+    openvpn
+    parallel
+    patch
+    patchutils
+    pciutils
+    pstree
+    pv
+    pwgen
+    rclone
+    renameutils
+    ripgrep
+    rsync
+    screen
+    silver-searcher
+    smartmontools
+    socat
+    stow
+    strace
+    tcpdump
+    time
+    tmux
+    tree
+    unzip
+    vim
+    w3m
+    watch
+    watchman
+    wavemon
+    wget
+    whois
+    wordnet
+    xsv
+    xz
+    yubikey-personalization
+    zip
+    zsh
+    zsh-syntax-highlighting
+  ];
+}
diff --git a/packages/desktop.nix b/packages/desktop.nix
new file mode 100644
index 0000000..2aa043c
--- /dev/null
+++ b/packages/desktop.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    calibre
+    freecad
+    gimp
+    gnome-applications
+    picard
+    xorg.xev
+  ];
+}
-- 
cgit v1.2.1