summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--makefu/1systems/omo.nix6
-rw-r--r--makefu/2configs/printer-shared.nix38
2 files changed, 4 insertions, 40 deletions
diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix
index 5241b0b8e..422fe7c48 100644
--- a/makefu/1systems/omo.nix
+++ b/makefu/1systems/omo.nix
@@ -53,17 +53,19 @@ in {
#../2configs/share-user-sftp.nix
../2configs/omo-share.nix
../2configs/tinc/retiolum.nix
+ ../2configs/logging/central-stats-server.nix
+ ../2configs/logging/central-stats-client.nix
# ../2configs/torrent.nix
# ../2configs/elchos/search.nix
# ../2configs/elchos/log.nix
# ../2configs/elchos/irc-token.nix
- ../2configs/printer-shared.nix
## as long as pyload is not in nixpkgs:
# docker run -d -v /var/lib/pyload:/opt/pyload/pyload-config -v /media/crypt0/pyload:/opt/pyload/Downloads --name pyload --restart=always -p 8112:8000 -P writl/pyload
];
makefu.full-populate = true;
+ makefu.server.primary-itf = primaryInterface;
krebs.rtorrent = {
downloadDir = lib.mkForce "/media/crypt0/torrent";
extraConfig = ''
@@ -112,7 +114,7 @@ in {
(d: "install -m 755 -d " + (toMapper d) )
[ 0 1 2 "X" ]}
'';
- environment.systemPackages = with pkgs;[
+ environment.systemPackages = with pkgs;[
mergerfs # hard requirement for mount
wol # wake up filepimp
f3
diff --git a/makefu/2configs/printer-shared.nix b/makefu/2configs/printer-shared.nix
deleted file mode 100644
index 2a9e6724d..000000000
--- a/makefu/2configs/printer-shared.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ pkgs, config, ... }:
-
-{
- nixpkgs.config.allowUnfree = true;
- services.avahi.enable = true;
- services.avahi.publish.enable = true;
- services.avahi.publish.userServices = true;
- services.avahi.interfaces = [ config.makefu.server.primary-itf ];
- services.avahi.ipv6 = false;
- services.avahi.nssmdns = true;
- # via https://github.com/tjfontaine/airprint-generate/
- # environment.etc."avahi/services/samsung_scx2300.service".text
- nixpkgs.config.packageOverrides = pkgs: rec {
- avahi = pkgs.stdenv.lib.overrideDerivation pkgs.avahi (oldAttrs: {
- postFixup = let
- cfg = pkgs.writeText "airprint-scx3200.service" ''<?xml version="1.0" ?><!DOCTYPE service-group SYSTEM 'avahi-service.dtd'><service-group><name replace-wildcards="yes">AirPrint Samsung_SCX-3200_Series @ %h</name><service><type>_ipp._tcp</type><subtype>_universal._sub._ipp._tcp</subtype><port>631</port><txt-record>txtvers=1</txt-record><txt-record>qtotal=1</txt-record><txt-record>Transparent=T</txt-record><txt-record>URF=none</txt-record><txt-record>rp=printers/Samsung_SCX-3200_Series</txt-record><txt-record>note=Samsung SCX-3200 Series</txt-record><txt-record>product=(GPL Ghostscript)</txt-record><txt-record>printer-state=3</txt-record><txt-record>printer-type=0x801044</txt-record><txt-record>pdl=application/octet-stream,application/pdf,application/postscript,application/vnd.cups-raster,image/gif,image/jpeg,image/png,image/tiff,image/urf,text/html,text/plain,application/vnd.adobe-reader-postscript,application/vnd.cups-command</txt-record></service></service-group>'';
- in ''
- cp ${cfg} $out/etc/avahi/services/airprint-scx3200.service
- '';
- });
- };
-
- # only allowed in local network
- services.printing = {
- enable = true;
- browsing = true;
- #avahiEnabled = true;
- defaultShared = true;
- listenAddresses = [ "*:631" ];
- drivers = [
- pkgs.samsungUnifiedLinuxDriver
- ];
- };
-
- # scanners are printers just in reverse anyway
- hardware.sane.enable = true;
- hardware.sane.extraBackends = [ pkgs.samsungUnifiedLinuxDriver ];
-}