From 36e4f679cdb253013e04cb4af2d941a9bbc033cd Mon Sep 17 00:00:00 2001
From: coolneng <akasroua@gmail.com>
Date: Tue, 28 Apr 2020 20:02:04 +0200
Subject: [PATCH] Remove docker containers and upgrade hplip

---
 configuration.nix      |  1 -
 modules/containers.nix | 36 ------------------------------------
 modules/printing.nix   |  4 ++--
 3 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 modules/containers.nix

diff --git a/configuration.nix b/configuration.nix
index 3199c27..a05aa7c 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -102,7 +102,6 @@
     ./modules/hardware-configuration.nix
     ./modules/webstack.nix
     ./modules/devops.nix
-    ./modules/containers.nix
   ];
 
 }
diff --git a/modules/containers.nix b/modules/containers.nix
deleted file mode 100644
index 5457251..0000000
--- a/modules/containers.nix
+++ /dev/null
@@ -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/";
-    };
-  };
-
-}
diff --git a/modules/printing.nix b/modules/printing.nix
index a85d082..efa5a67 100644
--- a/modules/printing.nix
+++ b/modules/printing.nix
@@ -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 = {