Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

m 1 wbob: use xfce instead of awesome

Browse Source
This commit is contained in:
makefu 2016-08-23 19:13:50 +02:00
parent d73d552096
commit 7110552e30
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
1 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
makefu/1systems/wbob.nix
View File

@ -1,32 +1,53 @@
{ config, pkgs, ... }: { config, pkgs, lib, ... }:
let rootdisk = "/dev/disk/by-id/ata-TS256GMTS800_C613840115"; let
rootdisk = "/dev/disk/by-id/ata-TS256GMTS800_C613840115";
datadisk = "/dev/disk/by-id/ata-HGST_HTS721010A9E630_JR10006PH3A02F";
in { in {
makefu.awesome = {
modkey = "Mod1";
#TODO: integrate kiosk config into full config by templating the autostart
baseConfig = pkgs.awesomecfg.kiosk;
};
imports = imports =
[ # Include the results of the hardware scan. [ # 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/virtualization.nix
../2configs/tinc/retiolum.nix ../2configs/tinc/retiolum.nix
]; ];
krebs = { krebs = {
enable = true; enable = true;
build.host = config.krebs.hosts.wbob; build.host = config.krebs.hosts.wbob;
}; };
networking.firewall.allowedUDPPorts = [ 1655 ];
networking.firewall.allowedTCPPorts = [ 1655 49152 ]; swapDevices = [ { device = "/var/swap"; } ];
services.tinc.networks.siem = {
name = "display"; services.xserver = {
extraConfig = '' layout = lib.mkForce "de";
ConnectTo = sjump
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 # rt2870.bin wifi card, part of linux-unfree
hardware.enableAllFirmware = true; hardware.enableAllFirmware = true;
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@ -41,20 +62,18 @@ in {
hardware.cpu.intel.updateMicrocode = true; hardware.cpu.intel.updateMicrocode = true;
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
fileSystems."/" = { fileSystems = {
"/" = {
device = rootdisk + "-part1"; device = rootdisk + "-part1";
fsType = "ext4"; fsType = "ext4";
}; };
"/data" = {
device = datadisk + "-part1";
fsType = "ext4";
};
};
# DualHead on NUC # 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: update synergy package with these extras (username)
# TODO: add crypto layer # TODO: add crypto layer
systemd.services."synergy-client" = { systemd.services."synergy-client" = {