Split up base packages into separate packages

common/base-packages.nix

@@ -4,41 +4,40 @@
 
   gcc
   git
+  git-lfs
   ripgrep
 
+  tailscale
+  openvpn
+
+  nfs-utils
+
   unstable.emacs
+  notmuch mu isync
+  keychain ledger gnupg
+  mailutils
+  # sendmail
+
   cmake
   gnumake
   libtool
-  notmuch
-  mu
-  keychain
-  ledger
-  gnupg
   pinentry-curses
-  isync
   tmux
   sqlite
+
   file
-
-  sbcl
-
-  unstable.firefox
-  unstable.google-chrome
   lynx
-  vlc
-  mpv
-  obs-studio
-  gparted
-  audacity
-
-  ninja
-  gdb
-  lldb
-  mold
-  lld
-  clang-tools_16 # clangd, clang-format
-  llvmPackages_16.libllvm
+  wget
+  htop
+  bind
+  nmap
+  wol
+  iperf
+  lsof
+  pciutils # lspci
+  usbutils # lsusb
+  lm_sensors
+  parallel
 
   (python311.withPackages (pythonPackages: with pythonPackages; [
     pymupdf
@@ -51,27 +50,6 @@
     beets
     # chromaprint
   ]))
-  nodejs_21
-
-  yt-dlp
-  dconf
-
-  tigervnc
-  xorg.xinit
-  sx
-
-  wget
-  lsof
-  pciutils # lspci
-  usbutils # lsusb
-  apcupsd
-  htop
-  bind
-  nmap
-  lm_sensors
-  parallel
-  wol
-  iperf
 
   (beets.override {
     pluginOverrides = {
@@ -82,29 +60,12 @@
     };
   })
   chromaprint
-  qdirstat
-  unstable.signal-desktop
-  parsec-bin
-  unstable.discord
-  unstable.telegram-desktop
-  dunst
-  shutter
-  # unstable.rustdesk
   ocrmypdf
-  mailutils
-  # sendmail
 
-  pcmanfm
-  libsForQt5.dolphin
-  libsForQt5.dolphin-plugins
-  libsForQt5.ffmpegthumbs
-  libsForQt5.kdegraphics-thumbnailers
+  tigervnc
 
-  nfs-utils
-  git-lfs
-  openvpn
-
-  pavucontrol
+  # Not necessary
+  apcupsd
 
   vim
 ]

common/configuration.nix

@@ -41,27 +41,7 @@
     LC_TIME = "en_US.UTF-8";
   };
 
-  # Enable sound with pipewire.
-  sound.enable = true;
-  hardware.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    jack.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is enabled by default,
-    # no need to redefine it in your config for now)
-    # media-session.enable = true;
-  };
-
-  fonts = {
-    packages = with pkgs; [
-      roboto-mono
-    ];
-  };
+  environment.systemPackages = import ./base-packages.nix { inherit pkgs; };
 
   services.tailscale.enable = true;
 

common/development-machine.nix

@@ -0,0 +1,17 @@
+{ inputs, config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    sbcl
+
+    ninja
+    gdb
+    lldb
+    mold
+    lld
+    clang-tools_16 # clangd, clang-format
+    llvmPackages_16.libllvm
+
+    nodejs_21
+  ];
+}

common/user-facing.nix

@@ -0,0 +1,60 @@
+{ inputs, config, pkgs, ... }:
+
+{
+  nix.settings.experimental-features = "nix-command flakes";
+
+  # Enable sound with pipewire.
+  sound.enable = true;
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    jack.enable = true;
+
+    # use the example session manager (no others are packaged yet so this is enabled by default,
+    # no need to redefine it in your config for now)
+    # media-session.enable = true;
+  };
+
+  fonts = {
+    packages = with pkgs; [
+      roboto-mono
+    ];
+  };
+
+  environment.systemPackages = with pkgs; [
+    unstable.firefox
+    unstable.google-chrome
+    vlc
+    mpv
+    obs-studio
+    gparted
+    audacity
+
+    qdirstat
+    unstable.signal-desktop
+    parsec-bin
+    unstable.discord
+    unstable.telegram-desktop
+    dunst
+    shutter
+    # unstable.rustdesk
+
+    pcmanfm
+    libsForQt5.dolphin
+    libsForQt5.dolphin-plugins
+    libsForQt5.ffmpegthumbs
+    libsForQt5.kdegraphics-thumbnailers
+
+    pavucontrol
+
+    xorg.xinit
+    sx
+
+    yt-dlp
+    dconf
+  ];
+}

hosts/NixAdvantage/configuration.nix

@@ -3,9 +3,6 @@
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
 { config, pkgs, ... }:
-let
-  commonPackages = import ../../common/packages.nix { inherit pkgs; };
-in
 {
   imports =
     [
@@ -51,7 +48,7 @@ in
   # $ nix search wget
   environment.systemPackages = with pkgs; [
 
-  ] ++ commonPackages;
+  ];
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions

hosts/NixDawn/configuration.nix

@@ -3,10 +3,6 @@
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
 { config, pkgs, ... }:
-
-let
-  commonPackages = import ../../common/packages.nix { inherit pkgs; };
-in
 {
   imports =
     [
@@ -125,7 +121,7 @@ in
     pavucontrol
     unstable.rustdesk
     gkraken
-  ] ++ commonPackages;
+  ];
 
   hardware.gkraken.enable = true;
 

hosts/NixFrame/configuration.nix

@@ -1,13 +1,11 @@
 { config, pkgs, ... }:
-
-let
-  commonPackages = import ../../common/packages.nix { inherit pkgs; };
-in
 {
   imports =
     [
       # ./home-git-repos.nix
       ../../common/configuration.nix
+      ../../common/user-facing.nix
+      ../../common/development-machine.nix
       ../../common/laptop-things.nix
       ../../common/exwm.nix
       # Include the results of the hardware scan.
@@ -47,7 +45,7 @@ in
 
   environment.systemPackages = with pkgs; [
 
-  ] ++ commonPackages;
+  ];
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions