glotzbert: update

This commit is contained in:
Astro 2019-09-07 17:38:31 +02:00
parent df1dd36eb7
commit 7201a221ec
3 changed files with 29 additions and 6 deletions

View File

@ -16,7 +16,6 @@ in
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
../../lib/admins.nix
]; ];
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
@ -94,10 +93,10 @@ in
anonymousClients.allowAll = true; anonymousClients.allowAll = true;
}; };
extraConfig = '' extraConfig = ''
load-module module-tunnel-sink server=cibert.hq.c3d2.de load-module module-tunnel-sink server=pulsebert.hq.c3d2.de
''; '';
extraClientConf = '' extraClientConf = ''
default-server = cibert.hq.c3d2.de default-server = pulsebert.hq.c3d2.de
''; '';
}; };
@ -117,8 +116,8 @@ in
}; };
services.xserver.desktopManager = { services.xserver.desktopManager = {
gnome3.enable = true; gnome3.enable = true;
kodi.enable = false; kodi.enable = true;
default = "gnome"; default = "kodi";
}; };
security.sudo = { security.sudo = {

View File

@ -11,7 +11,7 @@
boot.initrd.availableKernelModules = [ "ohci_pci" "ehci_pci" "ahci" "firewire_ohci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; boot.initrd.availableKernelModules = [ "ohci_pci" "ehci_pci" "ahci" "firewire_ohci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
boot.kernelModules = [ "kvm-intel" "wl" "forcedeth" "b43" ]; boot.kernelModules = [ "kvm-intel" "wl" "forcedeth" "b43" ];
boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
boot.kernelParams = [ "irqpoll" ]; # noapic seems to improve things boot.kernelParams = [ "irqpoll" "hpet=off" ]; # noapic seems to improve things
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/4568bf11-6e40-4514-9bc9-3194a299c45f"; { device = "/dev/disk/by-uuid/4568bf11-6e40-4514-9bc9-3194a299c45f";

View File

@ -0,0 +1,24 @@
{ stdenv, pkgs, ... }:
with pkgs;
stdenv.mkDerivation rec {
name = "x11vnc-service";
version = "0.0.0";
src = ./.;
buildInputs = [ x11vnc ];
dontBuild = true;
installPhase = ''
cat > $out/lib/systemd/user/x11vnc.service <<_EOF_
[Unit]
Description=VNC server
[Service]
Type=simple
ExecStart=${x11vnc}/bin/x11vnc -shared -forever -passwd k-ot
Restart=on-failure
_EOF_
'';
}