From 36931f80b2c5b78898e84758e2b4da84dcc0ca97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 2 Oct 2021 19:31:56 +0200 Subject: [PATCH] Cleanup systemPackages --- hosts/containers/deployer/configuration.nix | 3 --- hosts/containers/dn42/default.nix | 2 -- hosts/containers/elastic/configuration.nix | 2 -- hosts/containers/freifunk/default.nix | 2 +- hosts/containers/hydra/default.nix | 1 - hosts/containers/kibana/default.nix | 1 - hosts/containers/ledstripes/configuration.nix | 1 - hosts/containers/logging/configuration.nix | 2 -- hosts/containers/lxc-template.nix | 4 ---- hosts/containers/mongo/configuration.nix | 2 +- hosts/containers/prometheus/configuration.nix | 2 -- hosts/containers/registry/configuration.nix | 4 ---- hosts/containers/scrape/default.nix | 1 - hosts/containers/ticker/default.nix | 1 - hosts/dacbert/default.nix | 6 ------ hosts/glotzbert/default.nix | 4 ---- hosts/pulsebert/default.nix | 6 ------ hosts/radiobert/default.nix | 5 ----- hosts/storage-ng/configuration.nix | 8 +------- lib/default.nix | 8 ++++++-- 20 files changed, 9 insertions(+), 56 deletions(-) diff --git a/hosts/containers/deployer/configuration.nix b/hosts/containers/deployer/configuration.nix index 760a3274..813fb89c 100644 --- a/hosts/containers/deployer/configuration.nix +++ b/hosts/containers/deployer/configuration.nix @@ -19,10 +19,7 @@ manpages man zsh - vim screen - tmux - htop ]; networking.interfaces.eth0.ipv4.addresses = [{ diff --git a/hosts/containers/dn42/default.nix b/hosts/containers/dn42/default.nix index 27f3c201..fe803c3f 100644 --- a/hosts/containers/dn42/default.nix +++ b/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"; diff --git a/hosts/containers/elastic/configuration.nix b/hosts/containers/elastic/configuration.nix index 6b1195a0..040fd224 100644 --- a/hosts/containers/elastic/configuration.nix +++ b/hosts/containers/elastic/configuration.nix @@ -11,8 +11,6 @@ ../../../lib/admins.nix ]; - environment.systemPackages = with pkgs; [ vim ]; - networking = { hostName = "elastic1"; interfaces.eth0.ipv4.addresses = [{ diff --git a/hosts/containers/freifunk/default.nix b/hosts/containers/freifunk/default.nix index 8bbe9b9a..4618192f 100644 --- a/hosts/containers/freifunk/default.nix +++ b/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 = { diff --git a/hosts/containers/hydra/default.nix b/hosts/containers/hydra/default.nix index ea930cd8..88b50b68 100644 --- a/hosts/containers/hydra/default.nix +++ b/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 diff --git a/hosts/containers/kibana/default.nix b/hosts/containers/kibana/default.nix index 3e1c6a92..e30dc808 100644 --- a/hosts/containers/kibana/default.nix +++ b/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; diff --git a/hosts/containers/ledstripes/configuration.nix b/hosts/containers/ledstripes/configuration.nix index 6167b102..35380b18 100644 --- a/hosts/containers/ledstripes/configuration.nix +++ b/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; }; diff --git a/hosts/containers/logging/configuration.nix b/hosts/containers/logging/configuration.nix index 3ba5599a..b308123c 100644 --- a/hosts/containers/logging/configuration.nix +++ b/hosts/containers/logging/configuration.nix @@ -11,8 +11,6 @@ ../../../lib/admins.nix ]; - environment.systemPackages = with pkgs; [ vim ]; - networking = { hostName = "logging"; interfaces.eth0.ipv4.addresses = [{ diff --git a/hosts/containers/lxc-template.nix b/hosts/containers/lxc-template.nix index e1c9f070..953d8d08 100644 --- a/hosts/containers/lxc-template.nix +++ b/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 diff --git a/hosts/containers/mongo/configuration.nix b/hosts/containers/mongo/configuration.nix index 1e69833e..9cbb4d6d 100644 --- a/hosts/containers/mongo/configuration.nix +++ b/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"; diff --git a/hosts/containers/prometheus/configuration.nix b/hosts/containers/prometheus/configuration.nix index fd1f0068..627bf1b8 100644 --- a/hosts/containers/prometheus/configuration.nix +++ b/hosts/containers/prometheus/configuration.nix @@ -11,8 +11,6 @@ ../../../lib/admins.nix ]; - environment.systemPackages = with pkgs; [ vim ]; - networking = { hostName = "prometheus"; firewall = { diff --git a/hosts/containers/registry/configuration.nix b/hosts/containers/registry/configuration.nix index 13eca507..cfdb3250 100644 --- a/hosts/containers/registry/configuration.nix +++ b/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"; diff --git a/hosts/containers/scrape/default.nix b/hosts/containers/scrape/default.nix index ee737163..acd830e7 100644 --- a/hosts/containers/scrape/default.nix +++ b/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 = { diff --git a/hosts/containers/ticker/default.nix b/hosts/containers/ticker/default.nix index 9acd1b06..03158cac 100644 --- a/hosts/containers/ticker/default.nix +++ b/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; diff --git a/hosts/dacbert/default.nix b/hosts/dacbert/default.nix index eb4489d0..ee6bb6a0 100644 --- a/hosts/dacbert/default.nix +++ b/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 diff --git a/hosts/glotzbert/default.nix b/hosts/glotzbert/default.nix index 82c8dd81..8c2d62a6 100644 --- a/hosts/glotzbert/default.nix +++ b/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 diff --git a/hosts/pulsebert/default.nix b/hosts/pulsebert/default.nix index 9076f6d0..01a5d52c 100644 --- a/hosts/pulsebert/default.nix +++ b/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; diff --git a/hosts/radiobert/default.nix b/hosts/radiobert/default.nix index 8d7f1a88..52b7b923 100644 --- a/hosts/radiobert/default.nix +++ b/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 ]; diff --git a/hosts/storage-ng/configuration.nix b/hosts/storage-ng/configuration.nix index 1ad42042..3d34c560 100644 --- a/hosts/storage-ng/configuration.nix +++ b/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 - gitAndTools.git - tmux + git-annex mpv iotop diff --git a/lib/default.nix b/lib/default.nix index 57a9e31d..4d1b7bac 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -239,8 +239,12 @@ in { permitRootLogin = "yes"; }; environment.systemPackages = with pkgs; [ - git vim - wget curl + curl + git + htop + tmux + vim + wget ]; programs.ssh.knownHosts = with builtins;