From 6bdb0123d1d796c237588d340ed0241987b968b8 Mon Sep 17 00:00:00 2001 From: coolneng Date: Wed, 2 Sep 2020 18:44:31 +0200 Subject: [PATCH] Clean up redundant packages --- modules/datasync.nix | 3 --- modules/devops.nix | 3 --- modules/networking.nix | 2 +- modules/printing.nix | 5 ++--- modules/webstack.nix | 7 +------ 5 files changed, 4 insertions(+), 16 deletions(-) diff --git a/modules/datasync.nix b/modules/datasync.nix index bc62e60..31bc51e 100644 --- a/modules/datasync.nix +++ b/modules/datasync.nix @@ -1,8 +1,5 @@ # Syncthing and Radicale configuration { config, pkgs, lib, ... }: { - - environment.systemPackages = with pkgs; [ syncthing radicale ]; - # Enable syncthing services.syncthing = { enable = true; diff --git a/modules/devops.nix b/modules/devops.nix index 155b11e..e1a6021 100644 --- a/modules/devops.nix +++ b/modules/devops.nix @@ -1,8 +1,5 @@ # Software development configuration { config, pkgs, lib, ... }: { - - environment.systemPackages = with pkgs; [ gitea ]; - # Gitea setup with daily backup services.gitea = { enable = true; diff --git a/modules/networking.nix b/modules/networking.nix index 11b04ae..e0e31a3 100644 --- a/modules/networking.nix +++ b/modules/networking.nix @@ -4,7 +4,7 @@ let password = builtins.readFile /var/lib/ddclient/token; in { - environment.systemPackages = with pkgs; [ avahi ddclient wireguard mbuffer ]; + environment.systemPackages = with pkgs; [ mbuffer ]; # Enable zeroconf services.avahi = { diff --git a/modules/printing.nix b/modules/printing.nix index 1cad746..8cd5c5f 100644 --- a/modules/printing.nix +++ b/modules/printing.nix @@ -1,8 +1,5 @@ # CUPS and SANE configuration { config, pkgs, lib, ... }: { - - environment.systemPackages = with pkgs; [ cups sane-backends ]; - # Enable CUPS with Zeroconf services.printing = { enable = true; @@ -18,6 +15,7 @@ extraBackends = with pkgs; [ hplip ]; }; + # Allow scanning over LAN and VPN services.saned = { enable = true; extraConfig = '' @@ -26,6 +24,7 @@ ''; }; + # Give SANE access to the printer users.users.scanner = { extraGroups = [ "lp" ]; }; } diff --git a/modules/webstack.nix b/modules/webstack.nix index 7d41746..a2c645a 100644 --- a/modules/webstack.nix +++ b/modules/webstack.nix @@ -1,12 +1,7 @@ # Web services configuration { config, pkgs, lib, ... }: { - environment.systemPackages = with pkgs; [ - nginx - postgresql_11 - libressl - miniflux - ]; + environment.systemPackages = with pkgs; [ libressl ]; services.nginx = { enable = true;