Merge remote-tracking branch 'prism/master'

5 files changed, 197 insertions, 3 deletions

diff --git a/lass/1systems/blue/source.nix b/lass/1systems/blue/source.nix
index 21f3a8bd5..1a98fc058 100644
--- a/lass/1systems/blue/source.nix
+++ b/lass/1systems/blue/source.nix
@@ -1,6 +1,6 @@
-{ lib, pkgs, ... }:
+{ lib, pkgs, test, ... }:
 {
-  nixpkgs = lib.mkForce {
+  nixpkgs = lib.mkIf (! test) (lib.mkForce {
     file = {
       path = toString (pkgs.fetchFromGitHub {
         owner = "nixos";
@@ -10,5 +10,5 @@
       });
       useChecksum = true;
     };
-  };
+  });
 }
diff --git a/lass/1systems/xerxes/config.nix b/lass/1systems/xerxes/config.nix
new file mode 100644
index 000000000..c120c17d7
--- /dev/null
+++ b/lass/1systems/xerxes/config.nix
@@ -0,0 +1,50 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    <stockholm/lass>
+
+    <stockholm/lass/2configs/retiolum.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/network-manager.nix>
+    <stockholm/lass/2configs/syncthing.nix>
+    <stockholm/lass/2configs/games.nix>
+    <stockholm/lass/2configs/steam.nix>
+    <stockholm/lass/2configs/wine.nix>
+    <stockholm/lass/2configs/fetchWallpaper.nix>
+    <stockholm/lass/2configs/nfs-dl.nix>
+    <stockholm/lass/2configs/pass.nix>
+    <stockholm/lass/2configs/mail.nix>
+  ];
+
+  krebs.build.host = config.krebs.hosts.xerxes;
+
+  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 = {
+        path = "/home/lass/tmp/the_playlist";
+        peers = [ "mors" "phone" "prism" "xerxes" ];
+      };
+    };
+  };
+  krebs.permown = {
+    "/home/lass/tmp/the_playlist" = {
+      owner = "lass";
+      group = "syncthing";
+      umask = "0007";
+    };
+  };
+}
diff --git a/lass/1systems/xerxes/icarus/config.nix b/lass/1systems/xerxes/icarus/config.nix
new file mode 100644
index 000000000..dada4949e
--- /dev/null
+++ b/lass/1systems/xerxes/icarus/config.nix
@@ -0,0 +1,33 @@
+{ 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
new file mode 100644
index 000000000..e9e09bc05
--- /dev/null
+++ b/lass/1systems/xerxes/icarus/physical.nix
@@ -0,0 +1,25 @@
+{
+  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
new file mode 100644
index 000000000..f88578e19
--- /dev/null
+++ b/lass/1systems/xerxes/physical.nix
@@ -0,0 +1,86 @@
+{ pkgs, lib, ... }:
+{
+  imports = [
+    ./config.nix
+    <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
+  ];
+
+  boot.zfs.enableUnstable = true;
+  boot.loader.grub = {
+    enable = true;
+    device = "/dev/sda";
+    efiSupport = true;
+  };
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  # TODO fix touchscreen
+  boot.blacklistedKernelModules = [
+    "goodix"
+  ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.initrd.luks.devices.crypted.device = "/dev/sda3";
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+  boot.kernelParams = [
+    "fbcon=rotate:1"
+    "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";
+  };
+
+  fileSystems."/home" = {
+    device = "rpool/home";
+    fsType = "zfs";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/E749-784C";
+    fsType = "vfat";
+  };
+
+  swapDevices = [ ];
+
+  boot.extraModprobeConfig = ''
+    options zfs zfs_arc_max=1073741824
+  '';
+
+  nix.maxJobs = lib.mkDefault 4;
+
+  networking.hostId = "9b0a74ac";
+  networking.networkmanager.enable = true;
+
+  hardware.opengl.enable = true;
+
+  services.tlp.enable = true;
+  services.tlp.extraConfig = ''
+    CPU_SCALING_GOVERNOR_ON_AC=ondemand
+    CPU_SCALING_GOVERNOR_ON_BAT=powersave
+    CPU_MIN_PERF_ON_AC=0
+    CPU_MAX_PERF_ON_AC=100
+    CPU_MIN_PERF_ON_BAT=0
+    CPU_MAX_PERF_ON_BAT=30
+  '';
+
+  services.logind.extraConfig = ''
+    HandlePowerKey=suspend
+    IdleAction=suspend
+    IdleActionSec=300
+  '';
+
+  services.xserver.extraConfig = ''
+    Section "Device"
+    Identifier "Intel Graphics"
+    Driver "Intel"
+    Option "TearFree" "true"
+    EndSection
+  '';
+}