Merge remote-tracking branch 'lassul.us/master'

2 files changed, 3 insertions, 42 deletions

diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix
index eb87f26d1..58dffe6a6 100644
--- a/tv/2configs/gitrepos.nix
+++ b/tv/2configs/gitrepos.nix
@@ -96,6 +96,9 @@ with import ./lib;
     nix-writers = {
       cgit.desc = "collection of package builders";
     };
+    nixpkgs = {
+      cgit.desc = "Nix Packages collection";
+    };
     pager = {
     };
     populate = {
diff --git a/tv/2configs/xp-332.nix b/tv/2configs/xp-332.nix
deleted file mode 100644
index 51fd1ae8c..000000000
--- a/tv/2configs/xp-332.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-with import ./lib;
-{ config, pkgs, ... }: {
-
-  environment.etc."utsushi.conf".text = ''
-    [devices]
-    dev1.udi = esci:networkscan://ep.hkw:1865
-    dev1.model = XP-332
-    dev1.vendor = EPSON
-  '';
-
-  hardware.sane = {
-    enable = true;
-    extraBackends = [
-      pkgs.utsushi-customized
-    ];
-  };
-
-  krebs.nixpkgs.allowUnfreePredicate = pkg:
-    packageName pkg == "imagescan-plugin-networkscan";
-
-  nixpkgs.overlays = singleton (self: super: {
-    utsushi-customized = self.utsushi.overrideAttrs (old: {
-      postInstall = ''
-        ${old.postInstall or ""}
-        ln -s /etc/utsushi.conf $out/etc/utsushi/utsushi.conf
-        ln -s ${pkgs.imagescan-plugin-networkscan}/lib/utsushi/networkscan \
-          $out/libexec/utsushi/
-      '';
-    });
-  });
-
-  services = {
-    printing = {
-      drivers = [
-        pkgs.epson-escpr
-      ];
-      enable = true;
-    };
-    saned.enable = true;
-  };
-
-}