Cleanup systemPackages

hosts/containers/deployer/configuration.nix

@@ -19,10 +19,7 @@
     manpages
     man
     zsh
-    vim
     screen
-    tmux
-    htop
   ];
 
   networking.interfaces.eth0.ipv4.addresses = [{

hosts/containers/dn42/default.nix

@@ -38,8 +38,6 @@ in {
       Exec "collectd" "${routecount}"
     '';
 
-  environment.systemPackages = with pkgs; [ vim ];
-
   # SSH for nixops
   services.openssh.enable = true;
   services.openssh.permitRootLogin = "yes";

hosts/containers/elastic/configuration.nix

@@ -11,8 +11,6 @@
     ../../../lib/admins.nix
   ];
 
-  environment.systemPackages = with pkgs; [ vim ];
-
   networking = {
     hostName = "elastic1";
     interfaces.eth0.ipv4.addresses = [{

hosts/containers/freifunk/default.nix

@@ -76,7 +76,7 @@ in {
 
   # Required for krops: ssh git
   services.openssh.enable = true;
-  environment.systemPackages = with pkgs; [ git tcpdump ];
+  environment.systemPackages = with pkgs; [ tcpdump ];
 
   systemd.network = {
     netdevs = {

hosts/containers/hydra/default.nix

@@ -56,7 +56,6 @@
     }];
   };
 
-  environment.systemPackages = with pkgs; [ tmux htop vim gitMinimal nixFlakes ];
   # This value determines the NixOS release with which your system is to be
   # compatible, in order to avoid breaking some software such as database
   # servers. You should change this only after NixOS release notes say you

hosts/containers/kibana/default.nix

@@ -11,7 +11,6 @@
 
   # Required for deployment
   services.openssh.enable = true;
-  environment.systemPackages = [ pkgs.git ];
 
   # noXlibs breaks cairo:
   environment.noXlibs = false;

hosts/containers/ledstripes/configuration.nix

@@ -18,7 +18,6 @@
 
   # Required for krops
   services.openssh.enable = true;
-  environment.systemPackages = [ pkgs.git ];
 
   systemd.services.ledball =
     let pile = import ../../../lib/pkgs/pile.nix { inherit pkgs; };

hosts/containers/logging/configuration.nix

@@ -11,8 +11,6 @@
     ../../../lib/admins.nix
   ];
 
-  environment.systemPackages = with pkgs; [ vim ];
-
   networking = {
     hostName = "logging";
     interfaces.eth0.ipv4.addresses = [{

hosts/containers/lxc-template.nix

@@ -20,10 +20,6 @@
     permitRootLogin = "yes";
   };
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [ wget vim ];
-
   # This value determines the NixOS release with which your system is to be
   # compatible, in order to avoid breaking some software such as database
   # servers. You should change this only after NixOS release notes say you

hosts/containers/mongo/configuration.nix

@@ -11,7 +11,7 @@
     ../../../lib/admins.nix
   ];
 
-  environment.systemPackages = with pkgs; [ vim mongodb-tools ];
+  environment.systemPackages = with pkgs; [ mongodb-tools ];
 
   networking = {
     hostName = "mongo";

hosts/containers/prometheus/configuration.nix

@@ -11,8 +11,6 @@
     ../../../lib/admins.nix
   ];
 
-  environment.systemPackages = with pkgs; [ vim ];
-
   networking = {
     hostName = "prometheus";
     firewall = {

hosts/containers/registry/configuration.nix

@@ -39,10 +39,6 @@
   # Open ports in the firewall.
   networking.firewall.allowedTCPPorts = [ 22 80 443 5000 ];
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [ wget vim ];
-
   services.dockerRegistry = {
     enable = true;
     storagePath = "/srv/docker-registry";

hosts/containers/scrape/default.nix

@@ -20,7 +20,6 @@ in {
   networking.defaultGateway = "172.20.73.1";
   # Required for deployment
   services.openssh.enable = true;
-  environment.systemPackages = [ pkgs.git ];
 
   users.groups.scrape = {};
   users.users.scrape = {

hosts/containers/ticker/default.nix

@@ -12,7 +12,6 @@ with lib;
   networking.useDHCP = false;
   networking.firewall.allowedTCPPorts = [ 22 80 443 ];
   nix.useSandbox = false;
-  environment.systemPackages = with pkgs; [ vim git ];
   time.timeZone = "Europe/Berlin";
   services.openssh.enable = true;
   c3d2.hq.statistics.enable = true;

hosts/dacbert/default.nix

@@ -79,14 +79,8 @@
     firewall.enable = false;
   };
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
   environment.systemPackages = with pkgs; [
-    git
     libraspberrypi
-    vim
-    wget
-
     mpv
     youtube-dl
     ncpamixer

hosts/glotzbert/default.nix

@@ -33,10 +33,6 @@
   i18n.defaultLocale = "en_US.UTF-8";
 
   environment.systemPackages = with pkgs; [
-    wget
-    vim
-    git
-    tmux
     screen
     chromium
     firefox

hosts/pulsebert/default.nix

@@ -51,19 +51,13 @@ in
     firewall.enable = false;
   };
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
   environment.systemPackages = with pkgs; [
-    git
-    htop
     libraspberrypi
     mpd
     mpv
     ncmpcpp
     ncpamixer
     pulseaudio # required for pactl
-    vim
-    wget
   ];
 
   programs.tmux.enable = true;

hosts/radiobert/default.nix

@@ -103,13 +103,8 @@
     '';
   };
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
   environment.systemPackages = with pkgs; [
-    git
     libraspberrypi
-    vim
-    wget
     dump1090_sdrplus
   ];
 

hosts/storage-ng/configuration.nix

@@ -46,19 +46,13 @@ in {
 
   };
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
   environment.systemPackages = with pkgs; [
-    wget
-    vim
     screen
     zsh
     lftp
     lsof
     psmisc
-    gitAndTools.git-annex
+    git-annex
-    gitAndTools.git
-    tmux
 
     mpv
     iotop

lib/default.nix

@@ -239,8 +239,12 @@ in {
       permitRootLogin = "yes";
     };
     environment.systemPackages = with pkgs; [
-      git vim
+      curl
-      wget curl
+      git
+      htop
+      tmux
+      vim
+      wget
     ];
 
     programs.ssh.knownHosts = with builtins;