diff options
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/1systems/wbob.nix | 65 |
1 files changed, 42 insertions, 23 deletions
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" = { |