From 4f5ccfb7924820cf0bb51a1f5f6a8697cebd58da Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Tue, 5 Apr 2022 19:31:27 -0700
Subject: refactor default packages to a module

---
 hosts/common/system/default.nix     | 13 ++--------
 hosts/common/system/software.nix    | 47 -----------------------------------
 modules/system/packages/default.nix | 49 +++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 58 deletions(-)
 delete mode 100644 hosts/common/system/software.nix
 create mode 100644 modules/system/packages/default.nix

diff --git a/hosts/common/system/default.nix b/hosts/common/system/default.nix
index fda467f..2b48e4e 100644
--- a/hosts/common/system/default.nix
+++ b/hosts/common/system/default.nix
@@ -1,15 +1,6 @@
 { pkgs, ... }:
 
 {
-  imports = [
-    ./boot.nix
-    ./hardware.nix
-    ./network.nix
-    ./security.nix
-    ./software.nix
-    ./users.nix
-  ];
-
-  # It's always useful to have bash around
-  environment.shells = [ pkgs.bashInteractive pkgs.zsh pkgs.fish ];
+  imports =
+    [ ./boot.nix ./hardware.nix ./network.nix ./security.nix ./users.nix ];
 }
diff --git a/hosts/common/system/software.nix b/hosts/common/system/software.nix
deleted file mode 100644
index e872679..0000000
--- a/hosts/common/system/software.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ pkgs, config, lib, ... }:
-
-with lib;
-
-let linuxpkgs = config.boot.kernelPackages;
-in {
-  environment.systemPackages = with pkgs; [
-    binutils
-    cacert
-    curl
-    dmidecode
-    ethtool
-    flameGraph
-    git
-    htop
-    hwdata
-    iftop
-    iptraf-ng
-    linuxpkgs.perf
-    lm_sensors
-    lsb-release
-    lsof
-    man-pages
-    mg
-    mtr
-    openssl
-    openssl
-    parted
-    pciutils
-    perf-tools
-    powertop
-    rsync
-    sqlite
-    strace
-    tcpdump
-    tmux
-    traceroute
-    unzip
-    usbutils
-    vim
-    wget
-    wireguard
-    zsh
-  ];
-
-  programs.bcc.enable = true;
-}
diff --git a/modules/system/packages/default.nix b/modules/system/packages/default.nix
new file mode 100644
index 0000000..49d7920
--- /dev/null
+++ b/modules/system/packages/default.nix
@@ -0,0 +1,49 @@
+# Common packages
+{ config, lib, pkgs, ... }:
+with lib;
+let linuxpkgs = config.boot.kernelPackages;
+in {
+
+  # It's always useful to have bash around
+  environment.shells = with pkgs; [ bashInteractive ];
+
+  environment.systemPackages = with pkgs; [
+    binutils
+    cacert
+    curl
+    dmidecode
+    ethtool
+    flameGraph
+    git
+    htop
+    hwdata
+    iftop
+    iptraf-ng
+    linuxpkgs.perf
+    lm_sensors
+    lsb-release
+    lsof
+    man-pages
+    mg
+    mtr
+    openssl
+    openssl
+    parted
+    pciutils
+    perf-tools
+    powertop
+    rsync
+    sqlite
+    strace
+    tcpdump
+    tmux
+    traceroute
+    unzip
+    usbutils
+    vim
+    wget
+    wireguard
+  ];
+
+  programs.bcc.enable = true;
+}
-- 
cgit 1.4.1