split home packages out of home manager

modules/universal/env/home-manager.nix

@@ -252,84 +252,8 @@ in
 
       wayland.windowManager = cfg.windowManager;
 
-      # devtools:
-      # bison
-      # dtc
-      # flex
-      # gcc-arm-embedded
-      # gcc_multi
-      # swig
-
-      home.packages = with pkgs; [
-        backblaze-b2
-        duplicity
-        gcc
-        gnumake
-        ifuse
-        ipfs
-        libimobiledevice
-        lm_sensors  # for sensors-detect
-        mix2nix
-        networkmanager
-        nixpkgs-review
-        # nixos-generators
-        # nettools
-        oathToolkit  # for oathtool
-        # ponymix
-        pulsemixer
-        python3
-        rmlint
-        rustup
-        sane-scripts
-        snapper
-        sops
-        ssh-to-age
-        sudo
-        wireguard-tools
-        youtube-dl
-        zola
-      ]
-      ++ (if sysconfig.colinsane.gui.enable then
-      with pkgs;
-      [
-        # GUI only
-        aerc  # email client
-        audacity
-        chromium
-        clinfo
-        element-desktop  # broken on phosh
-        evince  # works on phosh
-        font-manager
-        gimp  # broken on phosh
-        gnome.dconf-editor
-        gnome-feeds  # RSS reader (with claimed mobile support)
-        gnome.file-roller
-        gnome.gnome-maps  # works on phosh
-        gnome.nautilus
-        gnome-podcasts
-        gnome.gnome-terminal  # works on phosh
-        inkscape
-        libreoffice-fresh  # XXX colin: maybe don't want this on mobile
-        mesa-demos
-        networkmanagerapplet
-        obsidian
-        playerctl
-        tdesktop  # broken on phosh
-        vlc  # works on phosh
-        whalebird # pleroma client. input is broken on phosh
-        xterm  # broken on phosh
-      ] else [])
-      ++ (if sysconfig.colinsane.gui.enable && pkgs.system == "x86_64-linux" then
-      with pkgs;
-      [
-        # x86_64 only
-        discord
-        kaiteki  # Pleroma client
-        gnome.zenity # for kaiteki (it will use qarma, kdialog, or zenity)
-        signal-desktop
-        spotify
-      ] else [])
-      ++ cfg.extraPackages;
+      home.packages = (import ./home-packages.nix { config = sysconfig; inherit pkgs; })
+        ++ cfg.extraPackages;
     };
   };
 }

modules/universal/env/home-packages.nix

@@ -0,0 +1,81 @@
+{ config, pkgs }:
+
+
+# useful devtools:
+# bison
+# dtc
+# flex
+# gcc-arm-embedded
+# gcc_multi
+# swig
+with pkgs;
+[
+  backblaze-b2
+  duplicity
+  gcc
+  gnumake
+  ifuse
+  ipfs
+  libimobiledevice
+  lm_sensors  # for sensors-detect
+  mix2nix
+  networkmanager
+  nixpkgs-review
+  # nixos-generators
+  # nettools
+  oathToolkit  # for oathtool
+  # ponymix
+  pulsemixer
+  python3
+  rmlint
+  rustup
+  sane-scripts
+  snapper
+  sops
+  ssh-to-age
+  sudo
+  wireguard-tools
+  youtube-dl
+  zola
+]
+++ (if config.colinsane.gui.enable then
+with pkgs;
+[
+  # GUI only
+  aerc  # email client
+  audacity
+  chromium
+  clinfo
+  element-desktop  # broken on phosh
+  evince  # works on phosh
+  font-manager
+  gimp  # broken on phosh
+  gnome.dconf-editor
+  gnome-feeds  # RSS reader (with claimed mobile support)
+  gnome.file-roller
+  gnome.gnome-maps  # works on phosh
+  gnome.nautilus
+  gnome-podcasts
+  gnome.gnome-terminal  # works on phosh
+  inkscape
+  libreoffice-fresh  # XXX colin: maybe don't want this on mobile
+  mesa-demos
+  networkmanagerapplet
+  obsidian
+  playerctl
+  tdesktop  # broken on phosh
+  vlc  # works on phosh
+  whalebird # pleroma client. input is broken on phosh
+  xterm  # broken on phosh
+] else [])
+++ (if config.colinsane.gui.enable && pkgs.system == "x86_64-linux" then
+with pkgs;
+[
+  # x86_64 only
+  discord
+  kaiteki  # Pleroma client
+  gnome.zenity # for kaiteki (it will use qarma, kdialog, or zenity)
+  signal-desktop
+  spotify
+] else [])
+