profiles/default: move default packages there

3 files changed, 45 insertions, 55 deletions

diff --git a/modules/system/default.nix b/modules/system/default.nix
index b2f6a19..0082c1b 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -4,7 +4,6 @@
   imports = [
     ./boot
     ./btrfs
-    ./packages
     ./users
   ];
 }
diff --git a/modules/system/packages/default.nix b/modules/system/packages/default.nix
deleted file mode 100644
index 3e65990..0000000
--- a/modules/system/packages/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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
-    linuxPackages.cpupower
-    linuxpkgs.perf
-    lm_sensors
-    lsb-release
-    lsof
-    man-pages
-    mg
-    mtr
-    numactl
-    parted
-    pciutils
-    perf-tools
-    powertop
-    rsync
-    sqlite
-    strace
-    tcpdump
-    tmux
-    traceroute
-    unzip
-    usbutils
-    vim
-    wget
-    wireguard-tools
-
-    # my custom tools
-    tools.perf-flamegraph-pid
-  ];
-
-  programs.bcc.enable = true;
-}
diff --git a/profiles/default.nix b/profiles/default.nix
index 7421144..7a2e6af 100644
--- a/profiles/default.nix
+++ b/profiles/default.nix
@@ -57,4 +57,49 @@
       options = "--delete-older-than 14d";
     };
   };
+
+  environment.shells = with pkgs; [ bashInteractive ];
+
+  environment.systemPackages = with pkgs; [
+    binutils
+    cacert
+    curl
+    dmidecode
+    ethtool
+    flamegraph
+    git
+    htop
+    hwdata
+    iftop
+    iptraf-ng
+    linuxPackages.cpupower
+    config.boot.kernelPackages.perf
+    lm_sensors
+    lsb-release
+    lsof
+    man-pages
+    mg
+    mtr
+    numactl
+    parted
+    pciutils
+    perf-tools
+    powertop
+    rsync
+    sqlite
+    strace
+    tcpdump
+    tmux
+    traceroute
+    unzip
+    usbutils
+    vim
+    wget
+    wireguard-tools
+
+    # my custom tools
+    tools.perf-flamegraph-pid
+  ];
+
+  programs.bcc.enable = true;
 }