From e690170647fe242117e97e1b2f4f89f8ca56d102 Mon Sep 17 00:00:00 2001
From: Don Harper <duck@duckland.org>
Date: Sat, 22 Jul 2023 11:00:57 -0500
Subject: [PATCH] refactoring!

---
 home/default.nix        |  3 +-
 home/packages-cli.nix   | 63 +++++++++++++++++++++++++++++++++++++++++
 home/packages-gui.nix   | 58 +++++++++++++++++++++++++++++++++++++
 workstation/default.nix | 54 -----------------------------------
 4 files changed, 123 insertions(+), 55 deletions(-)
 create mode 100644 home/packages-cli.nix
 create mode 100644 home/packages-gui.nix

diff --git a/home/default.nix b/home/default.nix
index 2eae7d6..343db41 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -2,7 +2,8 @@
 
 {
   imports = [
-    ./programs.nix
+    ./packages-cli.nix
+    ./packages-gui.nix
     ./services.nix
     ./mpv.nix
     ./tmux.nix
diff --git a/home/packages-cli.nix b/home/packages-cli.nix
new file mode 100644
index 0000000..c036817
--- /dev/null
+++ b/home/packages-cli.nix
@@ -0,0 +1,63 @@
+{ config, pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    bc
+    bitwarden-cli
+    diff-so-fancy
+    exiftool
+    ffmpeg
+    figlet
+    file
+    fzf
+    git-crypt
+    gitFull
+    gitui
+    gnumake
+    gnupg
+    gping
+    gtop
+    hugo
+    jq
+    keychain
+    keyutils
+    khal
+    khard
+    lazygit
+    links2
+    mairix
+    moreutils
+    mosh
+    mutt-ics
+    ncdu
+    neofetch
+    neomutt
+    newsboat
+    nmap
+    notmuch
+    pandoc
+    ps_mem
+    psmisc
+    ranger
+    sqlite
+    syncthing
+    tailscale
+    tasksh
+    taskwarrior
+    tig
+    timewarrior
+    tmux
+    tmux-cssh
+    tmuxp
+    toot
+    topgrade
+    tut
+    unzip
+    urlview
+    vdirsyncer
+    vifm-full
+    vit
+    wget
+    zip
+  ];
+
+}
diff --git a/home/packages-gui.nix b/home/packages-gui.nix
new file mode 100644
index 0000000..a97ef84
--- /dev/null
+++ b/home/packages-gui.nix
@@ -0,0 +1,58 @@
+{ config, pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    #sublime-music
+    authy
+    blueberry
+    cantarell-fonts
+    citrix_workspace
+    clipman
+    cura
+    darktable
+    dmenu-wayland
+    firefox
+    flameshot
+    font-awesome
+    fractal-next
+    fuzzel
+    gnome.gnome-tweaks
+    gnome.simple-scan
+    gnumeric
+    headset-charge-indicator
+    imv
+    jellyfin-media-player
+    kanshi
+    kitty
+    ktimer
+    lapce
+    libappindicator
+    libnotify
+    libreoffice-fresh
+    libsForQt5.kwallet
+    neovim-qt
+    nerdfonts
+    nextcloud-client
+    noto-fonts
+    nvd
+    obsidian
+    pasystray
+    pavucontrol
+    poweralertd
+    powerline-fonts
+    qpwgraph
+    qutebrowser-qt6
+    rofi
+    signal-desktop
+    sonixd
+    source-code-pro
+    stellarium
+    tdesktop
+    terminus-nerdfont
+    texlive.combined.scheme-medium
+    thunderbird
+    ubuntu_font_family
+    widevine-cdm
+    zoom-us
+  ];
+
+}
diff --git a/workstation/default.nix b/workstation/default.nix
index 0e53342..d6bc204 100644
--- a/workstation/default.nix
+++ b/workstation/default.nix
@@ -138,85 +138,31 @@ in
     acpi
     aspell
     aspellDicts.en
-    authy
     bash-completion
     nix-bash-completions
-    blueberry
     btop
-    cantarell-fonts
-    citrix_workspace
-    clipman
-    cura
-    darktable
-    dmenu-wayland
     espeak-classic
-    firefox
-    flameshot
-    font-awesome
-    fractal-next
-    fuzzel
-    gnome.gnome-tweaks
-    gnome.simple-scan
-    gnumeric
-    headset-charge-indicator
     headsetcontrol
     home-manager
     hunspell
     hunspellDicts.en_US
     imagemagick
-    imv
     isync
-    jellyfin-media-player
-    kanshi
-    kitty
-    ktimer
-    lapce
-    libappindicator
-    libnotify
-    libreoffice-fresh
-    libsForQt5.kwallet
     libsForQt5.qtkeychain
     lsb-release
-    #mpv
-    #mutt
-    neovim-qt
-    nerdfonts
-    nextcloud-client
-    noto-fonts
-    nvd
-    obsidian
-    pasystray
-    pavucontrol
     pkg-config
     playerctl
     poppler_utils
-    poweralertd
-    powerline-fonts
     pulseaudio
-    qpwgraph
-    qutebrowser-qt6
-    rofi
     ruby
-    signal-desktop
     sshuttle
-    sonixd
-    source-code-pro
     steam
-    stellarium
-    #sublime-music
-    tdesktop
-    terminus-nerdfont
-    texlive.combined.scheme-medium
-    thunderbird
-    ubuntu_font_family
     udiskie
-    widevine-cdm
     wireplumber
     wlsunset
     xdg-utils
     xfce.thunar
     zathura
-    zoom-us
   ];
 
   programs.steam = {