Merge remote-tracking branch 'prism/master'

4 files changed, 86 insertions, 75 deletions

diff --git a/lass/1systems/xerxes/config.nix b/lass/1systems/xerxes/config.nix
index c120c17d7..2d25bc88a 100644
--- a/lass/1systems/xerxes/config.nix
+++ b/lass/1systems/xerxes/config.nix
@@ -22,16 +22,19 @@
 
   krebs.build.host = config.krebs.hosts.xerxes;
 
+  environment.shellAliases = {
+    deploy = pkgs.writeDash "deploy" ''
+      set -eu
+      export SYSTEM="$1"
+      $(nix-build $HOME/sync/stockholm/lass/krops.nix --no-out-link --argstr name "$SYSTEM" -A deploy)
+    '';
+  };
+
   services.xserver = {
     displayManager.lightdm.autoLogin.enable = true;
     displayManager.lightdm.autoLogin.user = "lass";
   };
 
-  boot.blacklistedKernelModules = [
-    "xpad"
-  ];
-
-  lass.screenlock.enable = lib.mkForce false;
   krebs.syncthing = {
     folders = {
       the_playlist = {
@@ -47,4 +50,70 @@
       umask = "0007";
     };
   };
+
+  boot.blacklistedKernelModules = [ "xpad" ];
+  systemd.services.xboxdrv = {
+    wantedBy = [ "multi-user.target" ];
+    script = ''
+      ${pkgs.xboxdrv.overrideAttrs(o: {
+        patches = [ (pkgs.fetchurl {
+          url = "https://patch-diff.githubusercontent.com/raw/xboxdrv/xboxdrv/pull/251.patch";
+          sha256 = "17784y20mxqrlhgvwvszh8lprxrvgmb7ah9dknmbhj5jhkjl8wq5";
+        }) ];
+      })}/bin/xboxdrv --type xbox360 --dbus disabled -D
+    '';
+  };
+
+  programs.adb.enable = true;
+
+  services.logind.lidSwitch = "ignore";
+  services.acpid = {
+    enable = true;
+    lidEventCommands = ''
+      export DISPLAY=:${toString config.services.xserver.display}
+      case "$1" in
+        "button/lid LID close")
+          ${pkgs.xorg.xinput}/bin/xinput disable 'pointer:  Mouse for Windows'
+          ${pkgs.xorg.xinput}/bin/xinput disable 'keyboard:  Mouse for Windows'
+          ${pkgs.acpilight}/bin/xbacklight -get > /tmp/pre_lid_brightness
+          ${pkgs.acpilight}/bin/xbacklight -set 0
+          ;;
+        "button/lid LID open")
+          ${pkgs.xorg.xinput}/bin/xinput enable 'pointer:  Mouse for Windows'
+          ${pkgs.xorg.xinput}/bin/xinput enable 'keyboard:  Mouse for Windows'
+          ${pkgs.acpilight}/bin/xbacklight -set $(cat /tmp/pre_lid_brightness)
+          ;;
+      esac
+    '';
+  };
+
+  systemd.services.suspend-again = {
+    after = [ "suspend.target" ];
+    requiredBy = [ "suspend.target" ];
+    # environment = {
+    #   DISPLAY = ":${toString config.services.xserver.display}";
+    # };
+    serviceConfig = {
+      ExecStart = pkgs.writeDash "suspend-again" ''
+        ${pkgs.gnugrep}/bin/grep -q closed /proc/acpi/button/lid/LID0/state
+        if [ "$?" -eq 0 ]; then
+          echo 'wakeup with closed lid'
+          ${pkgs.systemd}/bin/systemctl suspend
+        fi
+      '';
+      Type = "simple";
+    };
+  };
+
+  hardware.bluetooth.enable = true;
+  hardware.pulseaudio.package = pkgs.pulseaudioFull;
+  # hardware.pulseaudio.configFile = pkgs.writeText "default.pa" ''
+  #   load-module module-bluetooth-policy
+  #   load-module module-bluetooth-discover
+  #   ## module fails to load with
+  #   ##   module-bluez5-device.c: Failed to get device path from module arguments
+  #   ##   module.c: Failed to load module "module-bluez5-device" (argument: ""): initialization failed.
+  #   # load-module module-bluez5-device
+  #   # load-module module-bluez5-discover
+  # '';
 }
diff --git a/lass/1systems/xerxes/icarus/config.nix b/lass/1systems/xerxes/icarus/config.nix
deleted file mode 100644
index dada4949e..000000000
--- a/lass/1systems/xerxes/icarus/config.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  imports = [
-    <stockholm/lass>
-
-    <stockholm/lass/2configs/mouse.nix>
-    <stockholm/lass/2configs/retiolum.nix>
-    <stockholm/lass/2configs/git.nix>
-    <stockholm/lass/2configs/exim-retiolum.nix>
-    <stockholm/lass/2configs/baseX.nix>
-    #<stockholm/lass/2configs/browsers.nix>
-    <stockholm/lass/2configs/programs.nix>
-    <stockholm/lass/2configs/fetchWallpaper.nix>
-    <stockholm/lass/2configs/games.nix>
-    <stockholm/lass/2configs/bitcoin.nix>
-    <stockholm/lass/2configs/wine.nix>
-    #<stockholm/lass/2configs/blue-host.nix>
-    #<stockholm/lass/2configs/xtreemfs.nix>
-    <stockholm/lass/2configs/syncthing.nix>
-    <stockholm/lass/2configs/nfs-dl.nix>
-    #<stockholm/lass/2configs/prism-share.nix>
-    <stockholm/lass/2configs/ssh-cryptsetup.nix>
-  ];
-
-  krebs.build.host = config.krebs.hosts.icarus;
-
-  environment.systemPackages = with pkgs; [
-    macchanger
-    nix-review
-  ];
-  programs.adb.enable = true;
-}
diff --git a/lass/1systems/xerxes/icarus/physical.nix b/lass/1systems/xerxes/icarus/physical.nix
deleted file mode 100644
index e9e09bc05..000000000
--- a/lass/1systems/xerxes/icarus/physical.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  imports = [
-    ./config.nix
-    <stockholm/lass/2configs/hw/x220.nix>
-    <stockholm/lass/2configs/boot/coreboot.nix>
-  ];
-
-  fileSystems = {
-    "/bku" = {
-      device = "/dev/mapper/pool-bku";
-      fsType = "btrfs";
-      options = ["defaults" "noatime" "ssd" "compress=lzo"];
-    };
-  };
-
-  services.udev.extraRules = ''
-    SUBSYSTEM=="net", ATTR{address}=="00:24:d7:f0:a0:0c", NAME="wl0"
-    SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:71:cb:35", NAME="et0"
-  '';
-
-  services.thinkfan.enable = true;
-  services.tlp.extraConfig = ''
-    START_CHARGE_THRESH_BAT0=80
-  '';
-}
diff --git a/lass/1systems/xerxes/physical.nix b/lass/1systems/xerxes/physical.nix
index f88578e19..5d60dfc45 100644
--- a/lass/1systems/xerxes/physical.nix
+++ b/lass/1systems/xerxes/physical.nix
@@ -17,6 +17,7 @@
   boot.blacklistedKernelModules = [
     "goodix"
   ];
+
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.initrd.luks.devices.crypted.device = "/dev/sda3";
@@ -27,11 +28,6 @@
     "boot.shell_on_fail"
   ];
 
-  services.xserver.displayManager.sessionCommands = ''
-    (sleep 2 && ${pkgs.xorg.xrandr}/bin/xrandr --output eDP-1 --rotate right)
-    (sleep 2 && ${pkgs.xorg.xinput}/bin/xinput set-prop 'Goodix Capacitive TouchScreen' 'Coordinate Transformation Matrix' 0 1 0 -1 0 1 0 0 1)
-  '';
-
   fileSystems."/" = {
     device = "rpool/root";
     fsType = "zfs";
@@ -76,11 +72,15 @@
     IdleActionSec=300
   '';
 
-  services.xserver.extraConfig = ''
-    Section "Device"
-    Identifier "Intel Graphics"
-    Driver "Intel"
-    Option "TearFree" "true"
-    EndSection
-  '';
+  services.xserver = {
+    videoDrivers = [ "intel" ];
+    deviceSection = ''
+      Option "TearFree" "true"
+    '';
+    displayManager.sessionCommands = ''
+      echo nonono > /tmp/xxyy
+      (sleep 2 && ${pkgs.xorg.xrandr}/bin/xrandr --output eDP1 --rotate right)
+      (sleep 2 && ${pkgs.xorg.xinput}/bin/xinput set-prop 'Goodix Capacitive TouchScreen' 'Coordinate Transformation Matrix' 0 1 0 -1 0 1 0 0 1)
+    '';
+  };
 }