From 7201a221ec1bfe356cfc56cd3bbf42eaac47dc4f Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sat, 7 Sep 2019 17:38:31 +0200
Subject: [PATCH] glotzbert: update

---
 hosts/glotzbert/configuration.nix          |  9 ++++----
 hosts/glotzbert/hardware-configuration.nix |  2 +-
 hosts/glotzbert/x11vnc-service.nix         | 24 ++++++++++++++++++++++
 3 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 hosts/glotzbert/x11vnc-service.nix

diff --git a/hosts/glotzbert/configuration.nix b/hosts/glotzbert/configuration.nix
index 1d378827..2898f45f 100644
--- a/hosts/glotzbert/configuration.nix
+++ b/hosts/glotzbert/configuration.nix
@@ -16,7 +16,6 @@ in
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ../../lib/admins.nix
     ];
 
   # Use the systemd-boot EFI boot loader.
@@ -94,10 +93,10 @@ in
       anonymousClients.allowAll = true;
     };
     extraConfig = ''
-      load-module module-tunnel-sink server=cibert.hq.c3d2.de
+      load-module module-tunnel-sink server=pulsebert.hq.c3d2.de
     '';
     extraClientConf = ''
-      default-server = cibert.hq.c3d2.de
+      default-server = pulsebert.hq.c3d2.de
     '';
   };
 
@@ -117,8 +116,8 @@ in
   };
   services.xserver.desktopManager = {
     gnome3.enable = true;
-    kodi.enable = false;
-    default = "gnome";
+    kodi.enable = true;
+    default = "kodi";
   };
 
   security.sudo = {
diff --git a/hosts/glotzbert/hardware-configuration.nix b/hosts/glotzbert/hardware-configuration.nix
index 9533311f..533703d9 100644
--- a/hosts/glotzbert/hardware-configuration.nix
+++ b/hosts/glotzbert/hardware-configuration.nix
@@ -11,7 +11,7 @@
   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.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."/" =
     { device = "/dev/disk/by-uuid/4568bf11-6e40-4514-9bc9-3194a299c45f";
diff --git a/hosts/glotzbert/x11vnc-service.nix b/hosts/glotzbert/x11vnc-service.nix
new file mode 100644
index 00000000..fbd18c24
--- /dev/null
+++ b/hosts/glotzbert/x11vnc-service.nix
@@ -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_
+  '';
+}