diff --git a/machines/nucturne/default.nix b/machines/nucturne/default.nix
new file mode 100644
index 0000000..4794dda
--- /dev/null
+++ b/machines/nucturne/default.nix
@@ -0,0 +1,58 @@
+{ config, pkgs, inputs, nixos-hardware, ...}:
+{
+  imports = [
+    ../../common/users.nix
+    ./hardware-configuration.nix
+    ./software.nix
+  ];
+
+  
+  elss = {
+    # base system
+    base.enable = true;
+    # setup locale and font settings
+    locale.enable = true;
+    # setup sshd
+    sshd.enable = true;
+    # configure zsh
+    zsh.enable = true;
+    # enable X11 with lightdm and i3
+    graphical = {
+      enable = true;
+      # set dpi if used in mobile applications
+#      dpi = 180;
+    };
+
+    # enable deamon to generate nix-index-db
+    nix-index-db-update.enable = true;
+
+    # add TUD vpn
+    openvpn.enable = true;
+
+    # enable sops
+    sops = {
+      enable = true;
+    };
+    
+    # user setup
+    users = {
+      enable = true;
+      admins = [ "ellmau" ];
+      users = [ ];
+
+      meta = {
+        ellmau.git = {
+          signDefault = true;
+        };
+      };
+    };
+  };
+
+  boot.extraModulePackages = [
+    config.boot.kernelPackages.v4l2loopback
+  ];
+
+  boot.kernelModules = [
+      "v4l2loopback"
+  ];
+}
diff --git a/machines/nucturne/hardware-configuration.nix b/machines/nucturne/hardware-configuration.nix
new file mode 100644
index 0000000..43d6e91
--- /dev/null
+++ b/machines/nucturne/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;
+}
diff --git a/machines/nucturne/software.nix b/machines/nucturne/software.nix
new file mode 100644
index 0000000..0d382b4
--- /dev/null
+++ b/machines/nucturne/software.nix
@@ -0,0 +1,28 @@
+{ config, pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    libreoffice-fresh
+  ];
+
+  programs = {
+    java.enable = true;
+  };
+
+  services = {
+    autorandr.enable = false;
+  };
+
+  elss = {
+    programs = {
+      aspell.enable = true;
+      # Enable communication programs
+      communication.enable = true;
+      emacs.enable = true;
+      obsstudio.enable = true;
+      python.enable = true;
+    };
+
+    texlive.enable = true;
+    steam-run.enable = true;
+  };
+}