Remove docker containers and upgrade hplip
This commit is contained in:
parent
6c3bf4d637
commit
36e4f679cd
|
@ -102,7 +102,6 @@
|
|||
./modules/hardware-configuration.nix
|
||||
./modules/webstack.nix
|
||||
./modules/devops.nix
|
||||
./modules/containers.nix
|
||||
];
|
||||
|
||||
}
|
||||
|
|
|
@ -1,36 +0,0 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
# Enable Docker
|
||||
virtualisation.docker = {
|
||||
enable = true;
|
||||
storageDriver = "overlay2";
|
||||
};
|
||||
|
||||
# Container setup
|
||||
docker-containers = {
|
||||
pihole = {
|
||||
image = "pihole/pihole:latest";
|
||||
ports = [
|
||||
"53:53/tcp"
|
||||
"53:53/udp"
|
||||
"3080:80"
|
||||
"30443:443"
|
||||
];
|
||||
volumes = [
|
||||
"/var/lib/pihole/:/etc/pihole/"
|
||||
"/var/lib/dnsmasq/.d:/etc/dnsmasq.d/"
|
||||
];
|
||||
environment = {
|
||||
ServerIP = "192.168.1.2";
|
||||
};
|
||||
extraDockerOptions = [
|
||||
"--cap-add=NET_ADMIN"
|
||||
"--dns=127.0.0.1"
|
||||
"--dns=1.1.1.1"
|
||||
];
|
||||
workdir = "/var/lib/pihole/";
|
||||
};
|
||||
};
|
||||
|
||||
}
|
|
@ -10,7 +10,7 @@
|
|||
# Enable CUPS with Zeroconf
|
||||
services.printing = {
|
||||
enable = true;
|
||||
drivers = with pkgs; [ hplip_3_18_5 ];
|
||||
drivers = with pkgs; [ hplip ];
|
||||
browsing = true;
|
||||
listenAddresses = [ "0.0.0.0:631" ];
|
||||
defaultShared = true;
|
||||
|
@ -19,7 +19,7 @@
|
|||
# Enable SANE
|
||||
hardware.sane = {
|
||||
enable = true;
|
||||
extraBackends = with pkgs; [ hplip_3_18_5 ];
|
||||
extraBackends = with pkgs; [ hplip ];
|
||||
};
|
||||
|
||||
services.saned = {
|
||||
|
|
Loading…
Reference in New Issue