diff --git a/default.nix b/default.nix
index 778d8fd..55b03b9 100644
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,6 @@
 { flakes, flakeOutputs, ...}:
-  let
-    mkMachine = args:
+let
+  mkMachine = args:
     let
       name = if builtins.isString args then args else args.name;
       system = if args ? system then args.system else "x86_64-linux";
@@ -10,18 +10,18 @@
       pkgs = flakes.nixpkgs;
       configuration = if args ? configuration then args.configuration else import ./baseconfiguration.nix  {inherit extraOverlays system pkgs name type flakes flakeOutputs;} ;
     in
-    {
-      inherit name;
-      value = pkgs.lib.nixosSystem {
-        inherit system;
-        modules = [
-          configuration
-          { nix.package = pkgs.legacyPackages.${system}.nixUnstable; }
-        ] ++ extraModules
-        ++ flakes.nixpkgs.lib.mapAttrsToList (_: module: module)
-          flakeOutputs.nixosModules;
+      {
+        inherit name;
+        value = pkgs.lib.nixosSystem {
+          inherit system;
+          modules = [
+            configuration
+            { nix.package = pkgs.legacyPackages.${system}.nixUnstable; }
+          ] ++ extraModules
+          ++ flakes.nixpkgs.lib.mapAttrsToList (_: module: module)
+            flakeOutputs.nixosModules;
+        };
       };
-    };
 in
 flakes.nixpkgs.lib.listToAttrs (map mkMachine [
   {
@@ -33,7 +33,7 @@ flakes.nixpkgs.lib.listToAttrs (map mkMachine [
     extraModules = [ flakes.home-manager.nixosModules.home-manager ];
   }
   {
-    name = "ellmauthaler.net";
+    name = "ellmauthaler";
     extraModules = [ flakes.home-manager.nixosModules.home-manager ];
     type = [ ./layer/server.nix ];
   }
diff --git a/flake.lock b/flake.lock
index 2714313..b818053 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "emacs-overlay": {
       "locked": {
-        "lastModified": 1636450031,
-        "narHash": "sha256-20fe+sqam5FHDmaxKm4ix55/FPgkWV64V8WdL8DcMQM=",
+        "lastModified": 1636478422,
+        "narHash": "sha256-HvuQabo0MjPudk6Un73Fr49s42JIYaoptzsJ4pTmRBA=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "afd2e166179d8ba8c8eb6dc24e23fef8d10ce3ab",
+        "rev": "5dbb662e9ba260eb9c0d83b8dce11a2b6d8a4831",
         "type": "github"
       },
       "original": {
diff --git a/machine/ellmauthaler/default.nix b/machine/ellmauthaler/default.nix
new file mode 100644
index 0000000..98ddf4d
--- /dev/null
+++ b/machine/ellmauthaler/default.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ...}:
+{
+  networking ={
+    hostName = "ellmauthaler";
+    domain = "net";
+  };
+}
diff --git a/machine/ellmauthaler/hardware-configuration.nix b/machine/ellmauthaler/hardware-configuration.nix
new file mode 100644
index 0000000..43d6e91
--- /dev/null
+++ b/machine/ellmauthaler/hardware-configuration.nix
@@ -0,0 +1,38 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/da267a3c-34e3-4218-933f-10738ee61eb6";
+      fsType = "ext4";
+    };
+
+  fileSystems."/home" =
+    { device = "/dev/disk/by-uuid/9ebd7aff-629b-449b-83d8-6381a04eb708";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/DE6D-C383";
+      fsType = "vfat";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/0069f1fa-dd8e-4c0a-8f01-a576af29909e"; }
+    ];
+
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  # high-resolution display
+  hardware.video.hidpi.enable = lib.mkDefault true;
+}