5 files changed, 55 insertions, 15 deletions
diff --git a/systems/alnus/config.nix b/systems/alnus/config.nix
index f8dd0b8..8af12fe 100644
--- a/systems/alnus/config.nix
+++ b/systems/alnus/config.nix
@@ -13,11 +13,9 @@
   };
 
   environment.systemPackages = [
+    pkgs.element-desktop
     pkgs.firefox
     pkgs.networkmanagerapplet
-    (pkgs.pidgin.override {
-      plugins = [ pkgs.pidgin-otr ];
-    })
   ];
 
   fileSystems = {
@@ -56,20 +54,21 @@
     "--prefer '^(Web Content|Privileged Cont)$'" # firefox tabs
   ];
 
+  services.libinput.enable = false;
+
   services.xserver = {
     enable = true;
-    layout = "de";
-    xkbOptions = "eurosign:e";
+    xkb.layout = "de";
+    xkb.options = "eurosign:e";
 
-    libinput.enable = false;
     synaptics = {
       enable = true;
       twoFingerScroll = true;
     };
   };
   services.xserver.desktopManager.plasma5.enable = true;
-  services.xserver.displayManager.autoLogin.enable = true;
-  services.xserver.displayManager.autoLogin.user = "dv";
+  services.displayManager.autoLogin.enable = true;
+  services.displayManager.autoLogin.user = "dv";
 
   system.stateVersion = "22.05";
 
diff --git a/systems/mu/config.nix b/systems/mu/config.nix
index 4c5e19e..b3d3e99 100644
--- a/systems/mu/config.nix
+++ b/systems/mu/config.nix
@@ -3,6 +3,7 @@
     ../../configs/br.nix
     ../../configs/exim-retiolum.nix
     ../../configs/hw/x220.nix
+    ../../configs/initrd/sshd.nix
     ../../configs/retiolum.nix
   ];
 
@@ -98,11 +99,11 @@
   ];
 
   services.xserver.enable = true;
-  services.xserver.layout = "de";
-  services.xserver.xkbOptions = "eurosign:e";
+  services.xserver.xkb.layout = "de";
+  services.xserver.xkb.options = "eurosign:e";
 
   # TODO this is host specific
-  services.xserver.libinput.enable = false;
+  services.libinput.enable = false;
   services.xserver.synaptics = {
     enable = true;
     twoFingerScroll = true;
@@ -110,8 +111,8 @@
 
   services.xserver.desktopManager.plasma5.enable = true;
 
-  services.xserver.displayManager.autoLogin.enable = true;
-  services.xserver.displayManager.autoLogin.user = "vv";
+  services.displayManager.autoLogin.enable = true;
+  services.displayManager.autoLogin.user = "vv";
 
   system.stateVersion = "23.05";
 
diff --git a/systems/nomic/config.nix b/systems/nomic/config.nix
index e8a5f9c..f8e5a38 100644
--- a/systems/nomic/config.nix
+++ b/systems/nomic/config.nix
@@ -53,7 +53,6 @@
       esac
     '')
     gnupg
-    tmux
   ];
 
   networking.wireless.enable = true;
diff --git a/systems/oai/config.nix b/systems/oai/config.nix
new file mode 100644
index 0000000..b802c7e
--- /dev/null
+++ b/systems/oai/config.nix
@@ -0,0 +1,42 @@
+{ modulesPath, pkgs, ... }: {
+	imports = [
+		(modulesPath + "/profiles/qemu-guest.nix")
+	];
+
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  networking.hostName = "oai";
+
+  boot.kernelParams = [
+    "console=ttyS0"
+    "console=tty1"
+    "nvme.shutdown_timeout=10"
+    "libiscsi.debug_libiscsi_eh=1"
+    "net.ifnames=0"
+  ];
+
+  boot.initrd.kernelModules = [
+    "nvme"
+  ];
+
+  networking.useDHCP = false;
+  networking.interfaces.eth0.useDHCP = true;
+
+  environment.systemPackages = [
+    pkgs.vim
+  ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-label/root";
+    fsType = "ext4";
+  };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-label/boot";
+    fsType = "vfat";
+  };
+
+  services.openssh.enable = true;
+
+  system.stateVersion = "23.05";
+}
diff --git a/systems/xu/config.nix b/systems/xu/config.nix
index 761a018..ee7ae46 100644
--- a/systems/xu/config.nix
+++ b/systems/xu/config.nix
@@ -46,7 +46,6 @@
         q
         qrencode
         texlive.combined.scheme-full
-        tmux
 
         #ack
         #apache-httpd