refactor default packages to a module

2 files changed, 8 insertions, 15 deletions

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/modules/system/packages/default.nix
index e872679..49d7920 100644
--- a/hosts/common/system/software.nix
+++ b/modules/system/packages/default.nix
@@ -1,9 +1,12 @@
-{ pkgs, config, lib, ... }:
-
+# 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
@@ -40,7 +43,6 @@ in {
     vim
     wget
     wireguard
-    zsh
   ];
 
   programs.bcc.enable = true;