Merge remote-tracking branch 'prism/master'

5 files changed, 94 insertions, 19 deletions

diff --git a/lass/1systems/coaxmetal/physical.nix b/lass/1systems/coaxmetal/physical.nix
index 3632ffd3e..b033477fe 100644
--- a/lass/1systems/coaxmetal/physical.nix
+++ b/lass/1systems/coaxmetal/physical.nix
@@ -22,8 +22,6 @@
   ];
 
   hardware.opengl.extraPackages = [ pkgs.amdvlk ];
-  # is required for amd graphics support ( xorg wont boot otherwise )
-  boot.kernelPackages = pkgs.linuxPackages_latest;
   environment.variables.VK_ICD_FILENAMES =
     "/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json";
 
@@ -47,7 +45,25 @@
 
   services.logind.lidSwitch = "ignore";
   services.logind.lidSwitchDocked = "ignore";
-  boot.extraModprobeConfig = ''
-    options psmouse proto=imps
+
+  # Mouse stuff
+  services.xserver.libinput.enable = lib.mkForce false;
+  services.xserver.synaptics.enable = true;
+
+  services.xserver.displayManager.sessionCommands = ''
+    xinput disable 'ETPS/2 Elantech Touchpad'
+    xinput set-prop 'ETPS/2 Elantech TrackPoint' 'Evdev Wheel Emulation' 1
+    xinput set-prop 'ETPS/2 Elantech TrackPoint' 'Evdev Wheel Emulation Button' 2
+    xinput set-prop 'ETPS/2 Elantech TrackPoint' 'Evdev Wheel Emulation Axes' 6 7 4 5
   '';
+
+  # https://forums.lenovo.com/t5/Fedora/T14s-AMD-Trackpoint-almost-unusable/m-p/5064952?page=4
+  # https://bugzilla.kernel.org/show_bug.cgi?id=209167#c1
+  boot.kernelPatches = [{
+    name = "fix-trackpoint-jumping";
+    patch = pkgs.fetchurl {
+      url = "https://patchwork.kernel.org/project/linux-input/patch/20210729010940.5752-1-phoenix@emc.com.tw/raw/";
+      sha256 = "0apbf7c8w830dbdsrmxpip90d5zbg74a939x89jfgpvm5gbdqdjg";
+    };
+  }];
 }
diff --git a/lass/1systems/lasspi/config.nix b/lass/1systems/lasspi/config.nix
new file mode 100644
index 000000000..9f823dfc8
--- /dev/null
+++ b/lass/1systems/lasspi/config.nix
@@ -0,0 +1,26 @@
+with import <stockholm/lib>;
+{ config, lib, pkgs, ... }:
+let
+in
+{
+  imports = [
+    <stockholm/lass>
+    <stockholm/lass/2configs>
+    <stockholm/lass/2configs/retiolum.nix>
+  ];
+
+  krebs.build.host = config.krebs.hosts.lasspi;
+
+  networking = {
+    networkmanager = {
+      enable = true;
+    };
+  };
+  environment.systemPackages = with pkgs; [
+    vim
+    rxvt_unicode.terminfo
+  ];
+  services.openssh.enable = true;
+
+  system.stateVersion = "21.05";
+}
diff --git a/lass/1systems/lasspi/physical.nix b/lass/1systems/lasspi/physical.nix
new file mode 100644
index 000000000..80c459a95
--- /dev/null
+++ b/lass/1systems/lasspi/physical.nix
@@ -0,0 +1,43 @@
+{ config, lib, pkgs, ... }:
+{
+ # This configuration worked on 09-03-2021 nixos-unstable @ commit 102eb68ceec
+ # The image used https://hydra.nixos.org/build/134720986
+  imports = [
+    ./config.nix
+  ];
+
+  boot = {
+    # kernelPackages = pkgs.linuxPackages_rpi4;
+    tmpOnTmpfs = true;
+    initrd.availableKernelModules = [ "usbhid" "usb_storage" ];
+    # ttyAMA0 is the serial console broken out to the GPIO
+    kernelParams = [
+        "8250.nr_uarts=1"
+        "console=ttyAMA0,115200"
+        "console=tty1"
+        # Some gui programs need this
+        "cma=128M"
+    ];
+  };
+
+  boot.loader.raspberryPi = {
+    enable = true;
+    version = 4;
+  };
+  boot.loader.grub.enable = false;
+  boot.loader.generic-extlinux-compatible.enable = true;
+
+  # Required for the Wireless firmware
+  hardware.enableRedistributableFirmware = true;
+
+  # Assuming this is installed on top of the disk image.
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-label/NIXOS_SD";
+      fsType = "ext4";
+      options = [ "noatime" ];
+    };
+  };
+
+  powerManagement.cpuFreqGovernor = "ondemand";
+}
diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index 421afab2a..d43fb804a 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -7,11 +7,12 @@ with import <stockholm/lib>;
     <stockholm/lass/2configs/retiolum.nix>
     <stockholm/lass/2configs/libvirt.nix>
     <stockholm/lass/2configs/tv.nix>
+    <stockholm/lass/2configs/websites/lassulus.nix>
+    <stockholm/lass/2configs/telegraf.nix>
     {
       services.nginx.enable = true;
       imports = [
         <stockholm/lass/2configs/websites/domsen.nix>
-        <stockholm/lass/2configs/websites/lassulus.nix>
       ];
       # needed by domsen.nix ^^
       lass.usershadow = {
@@ -275,19 +276,8 @@ with import <stockholm/lib>;
         { predicate = "-p udp --dport 60000:61000"; target = "ACCEPT";}
       ];
     }
-    {
-      services.murmur = {
-        enable = true;
-        bandwidth = 10000000;
-        registerName = "lassul.us";
-        autobanTime = 30;
-      };
-      krebs.iptables.tables.filter.INPUT.rules = [
-        { predicate = "-p tcp --dport 64738"; target = "ACCEPT";}
-        { predicate = "-p udp --dport 64738"; target = "ACCEPT";}
-      ];
-
-    }
+    <stockholm/lass/2configs/murmur.nix>
+    <stockholm/lass/2configs/docker.nix>
     {
       systemd.services."container@yellow".reloadIfChanged = mkForce false;
       containers.yellow = {
diff --git a/lass/1systems/wizard/config.nix b/lass/1systems/wizard/config.nix
index 8f9db7d3c..e158fa728 100644
--- a/lass/1systems/wizard/config.nix
+++ b/lass/1systems/wizard/config.nix
@@ -271,7 +271,7 @@ in {
     message = "lassulus: torify sshn root@";
   };
   systemd.services.hidden-ssh-announce.wantedBy = mkForce [];
-  services.mingetty.autologinUser = lib.mkForce "root";
+  services.getty.autologinUser = lib.mkForce "root";
 
   nixpkgs.config.packageOverrides = super: {
     dmenu = pkgs.writeDashBin "dmenu" ''