summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-08-24 08:49:16 +0200
committerlassulus <lass@aidsballs.de>2016-08-24 08:49:16 +0200
commit662222f8c422ac8fa3daba8bc26ab5d5cd37fda1 (patch)
tree93d5629203803e06b6f9a60219ac7b0ce315399c /makefu/1systems
parenta545159c08c6a748299111184ba5a34b40d7af67 (diff)
parent56e8681fd2d5a77fe539e5506b4b8f23bc0f4261 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems')
-rw-r--r--makefu/1systems/gum.nix1
-rw-r--r--makefu/1systems/omo.nix13
-rw-r--r--makefu/1systems/wbob.nix65
3 files changed, 56 insertions, 23 deletions
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";} ];
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
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" = {