From 6c487331532019db5c3382edc0b18ab4fe892609 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 22 Aug 2016 18:43:38 +0200 Subject: m 1 omo: configure deluge --- makefu/1systems/omo.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'makefu/1systems') diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix index 3aa5e943e..96f7be9fc 100644 --- a/makefu/1systems/omo.nix +++ b/makefu/1systems/omo.nix @@ -50,11 +50,24 @@ in { #../2configs/share-user-sftp.nix ../2configs/omo-share.nix ../2configs/tinc/retiolum.nix + ../2configs/torrent.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.deluge.cfg = { + max_active_seeding = 1; + stop_seed_ratio = 1; + natpmp = true; + upnp = true; + max_upload_speed = 200; + }; + users.groups.share = { + gid = config.krebs.lib.genid "share"; + members = [ "makefu" "misa" ]; + }; networking.firewall.trustedInterfaces = [ primaryInterface ]; # udp:137 udp:138 tcp:445 tcp:139 - samba, allowed in local net # tcp:80 - nginx for sharing files -- cgit v1.2.3 From c8f2a171eb0335847bb4574c76a2c0a448272d09 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 22 Aug 2016 18:44:12 +0200 Subject: m 1 gum: enable opentracker --- makefu/1systems/gum.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'makefu/1systems') diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix index 0d8ac0053..ab369d192 100644 --- a/makefu/1systems/gum.nix +++ b/makefu/1systems/gum.nix @@ -22,6 +22,7 @@ in { ../2configs/tinc/retiolum.nix ../2configs/urlwatch.nix ../2configs/torrent.nix + ../2configs/opentracker.nix ]; services.smartd.devices = [ { device = "/dev/sda";} ]; -- cgit v1.2.3 From 7110552e30785daa4d3ff393614793de0fe4ef27 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 23 Aug 2016 19:13:50 +0200 Subject: m 1 wbob: use xfce instead of awesome --- makefu/1systems/wbob.nix | 65 +++++++++++++++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 23 deletions(-) (limited to 'makefu/1systems') diff --git a/makefu/1systems/wbob.nix b/makefu/1systems/wbob.nix index ff593ab35..ff176edd9 100644 --- a/makefu/1systems/wbob.nix +++ b/makefu/1systems/wbob.nix @@ -1,32 +1,53 @@ -{ config, pkgs, ... }: -let rootdisk = "/dev/disk/by-id/ata-TS256GMTS800_C613840115"; +{ config, pkgs, lib, ... }: +let + rootdisk = "/dev/disk/by-id/ata-TS256GMTS800_C613840115"; + datadisk = "/dev/disk/by-id/ata-HGST_HTS721010A9E630_JR10006PH3A02F"; in { - makefu.awesome = { - modkey = "Mod1"; - #TODO: integrate kiosk config into full config by templating the autostart - baseConfig = pkgs.awesomecfg.kiosk; - }; imports = [ # Include the results of the hardware scan. ../. - ../2configs/main-laptop.nix + ../2configs/zsh-user.nix + ../2configs/base-gui.nix + ../2configs/laptop-utils.nix ../2configs/virtualization.nix ../2configs/tinc/retiolum.nix ]; + krebs = { enable = true; build.host = config.krebs.hosts.wbob; }; - networking.firewall.allowedUDPPorts = [ 1655 ]; - networking.firewall.allowedTCPPorts = [ 1655 49152 ]; - services.tinc.networks.siem = { - name = "display"; - extraConfig = '' - ConnectTo = sjump + + swapDevices = [ { device = "/var/swap"; } ]; + + services.xserver = { + layout = lib.mkForce "de"; + + windowManager = lib.mkForce { + awesome.enable = false; + default = "none"; + }; + desktopManager.xfce.enable = true; + + # xrandrHeads = [ "HDMI1" "HDMI2" ]; + # prevent screen from turning off, disable dpms + displayManager.sessionCommands = '' + xset s off -dpms + xrandr --output HDMI2 --right-of HDMI1 ''; }; + networking.firewall.allowedUDPPorts = [ 655 ]; + networking.firewall.allowedTCPPorts = [ 655 49152 ]; + #services.tinc.networks.siem = { + # name = "display"; + # extraConfig = '' + # ConnectTo = sjump + # Port = 1655 + # ''; + #}; + # rt2870.bin wifi card, part of linux-unfree hardware.enableAllFirmware = true; nixpkgs.config.allowUnfree = true; @@ -41,20 +62,18 @@ in { hardware.cpu.intel.updateMicrocode = true; boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.kernelModules = [ "kvm-intel" ]; - fileSystems."/" = { + fileSystems = { + "/" = { device = rootdisk + "-part1"; fsType = "ext4"; + }; + "/data" = { + device = datadisk + "-part1"; + fsType = "ext4"; + }; }; # DualHead on NUC - services.xserver = { - # xrandrHeads = [ "HDMI1" "HDMI2" ]; - # prevent screen from turning off, disable dpms - displayManager.sessionCommands = '' - xset s off -dpms - xrandr --output HDMI2 --right-of HDMI1 - ''; - }; # TODO: update synergy package with these extras (username) # TODO: add crypto layer systemd.services."synergy-client" = { -- cgit v1.2.3