remove some redundant shell profiles

flake.nix

@@ -260,7 +260,7 @@
       hidpi       = hw.common-hidpi;
       p1005       = ./hardware/printer/hp-laserjet-p1005.nix;
       au          = ./profiles/auto-upgrade.nix;
-      binfmt      = ./profiles/shell/binfmt-emu.nix;
+      binfmt      = ./profiles/binfmt-emu.nix;
       dns64       = { config, ... }: {
         networking.nameservers = [ "2001:700:1:11::2:51" ]; # dns64.uninett.no
         networking.networkmanager.enable = true;

hosts/bolle/default.nix

@@ -12,9 +12,7 @@
     ../../users/pbsds
     ../../users/daniel
 
-    ../../profiles/shell/base.nix
+    ../../profiles/shell.nix
-    ../../profiles/shell/archives.nix
-    ../../profiles/shell/nix-utils.nix
 
     ../../profiles/domeneshop-dyndns
     #../../profiles/code-remote

hosts/brumlebasse/default.nix

@@ -16,9 +16,7 @@
 
     ../../users/pbsds
 
-    ../../profiles/shell/base.nix
+    ../../profiles/shell.nix
-    ../../profiles/shell/archives.nix
-    ../../profiles/shell/nix-utils.nix
 
     #../../profiles/domeneshop-dyndns
   ];

hosts/eple/default.nix

@@ -13,9 +13,7 @@
 
     ../../profiles/mounts/panorama-zfs.nix
 
-    ../../profiles/shell/base.nix
+    ../../profiles/shell.nix
-    ../../profiles/shell/archives.nix
-    ../../profiles/shell/nix-utils.nix
 
     ../../profiles/domeneshop-dyndns
     #../../profiles/code-remote

hosts/garp/default.nix

@@ -29,9 +29,7 @@
 
     ../../users/pbsds
 
-    ../../profiles/shell/base.nix
+    ../../profiles/shell.nix
-    ../../profiles/shell/archives.nix
-    ../../profiles/shell/nix-utils.nix
 
     #../../profiles/desktop/base.nix
     #../../profiles/desktop/gnome # configures gdm

hosts/hasselknippe/default.nix

@@ -23,9 +23,7 @@
     #../../profiles/mounts/reidun-nfs.nix
     #../../profiles/mounts/meconium-nfs.nix
 
-    ../../profiles/shell/base.nix
+    ../../profiles/shell.nix
-    ../../profiles/shell/archives.nix
-    ../../profiles/shell/nix-utils.nix
 
     ../../profiles/desktop/base.nix
     ../../profiles/desktop/gnome # configures gdm

hosts/nord/default.nix

@@ -24,9 +24,7 @@
     ../../profiles/mounts/meconium-nfs.nix
     ../../profiles/mounts/fridge-nfs.nix
 
-    ../../profiles/shell/base.nix
+    ../../profiles/shell.nix
-    ../../profiles/shell/archives.nix
-    ../../profiles/shell/nix-utils.nix
 
     ../../profiles/desktop/base.nix
     ../../profiles/desktop/gnome # configures gdm

hosts/noximilien/default.nix

@@ -19,9 +19,7 @@
     ../../profiles/mounts/meconium-zfs.nix
     ../../profiles/mounts/fridge-nfs.nix
 
-    ../../profiles/shell/base.nix
+    ../../profiles/shell.nix
-    ../../profiles/shell/archives.nix
-    ../../profiles/shell/nix-utils.nix
 
     ../../profiles/services/tmate-server.nix # opens port 42244
 

hosts/sopp/default.nix

@@ -33,9 +33,7 @@
     ../../profiles/mounts/reidun-nfs.nix
     ../../profiles/mounts/meconium-nfs.nix
 
-    ../../profiles/shell/base.nix
+    ../../profiles/shell.nix
-    ../../profiles/shell/archives.nix
-    ../../profiles/shell/nix-utils.nix
 
     ../../profiles/desktop/base.nix
     ../../profiles/desktop/gnome # configures gdm

profiles/shell.nix

@@ -1,11 +1,11 @@
 { pkgs, ... }:
 {
   environment.systemPackages = with pkgs; [
+    # base utils
     lsof
     lshw
     file
     tmux
-    #parallel # already provided by moreutils
     pwgen
     git
     #gh
@@ -16,7 +16,7 @@
     gnused
     gnumake
     coreutils-full
-    moreutils
+    moreutils # includes 'parallel'
     binutils
     diffutils
     findutils
@@ -54,5 +54,22 @@
 
     visidata
     sqlite
+
+    # archive
+    zip
+    unrar
+    unzip
+    atool
+    p7zip
+    bzip2
+    gzip
+    atool
+
+    # nix utils
+    nix-output-monitor
+    nix-top
+    nix-search-cli # nix-search
+    nix-diff
+    comma
   ];
 }

profiles/shell/archives.nix

@@ -1,13 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    zip
-    unrar
-    unzip
-    atool
-    p7zip
-    bzip2
-    gzip
-    atool
-  ];
-}

profiles/shell/nix-utils.nix

@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    nix-output-monitor
-    nix-top
-    nix-search-cli # nix-search
-    nix-diff
-    comma
-  ];
-}