diff --git a/machines/laptop.nix b/machines/laptop.nix
index 3cfc060..af8175b 100644
--- a/machines/laptop.nix
+++ b/machines/laptop.nix
@@ -1,30 +1,41 @@
 { config, pkgs, lib, ... }:
 
-let
-  chromeArgs = lib.strings.concatStringsSep " " [
-    "--force-dark-mode"
-    "--enable-features=WebUIDarkMode"
-    "--enable-smooth-scrolling"
-    "--ozone-platform-hint=auto"
-    "--ignore-gpu-blocklist"
-    "--enable-gpu-rasterization"
-    "--enable-zero-copy"
-    "--force-device-scale-factor=1.0"
-  ];
-  nixGLWrap = import ./../utils/nixGLWrap.nix { inherit pkgs lib; };
-in {
+{
   imports = [
-    ./common.nix
+    ./../modules/machine.nix
   ];
 
-  targets.genericLinux.enable = true;
-  news.display = "silent";
+  machine = {
+      username = "thilo";
+      isGeneric = false;
+      nixPackage = pkgs.nixUnstable;
+      isGnome = false;
+      noiseSuppression.enable = true;
+      isGraphical = true;
+  };
 
-  gtk = {
+  wayland.windowManager.sway = {
     enable = true;
-    theme = {
-      name = "adw-gtk3-dark";
-      package = pkgs.adw-gtk3;
+    config = rec {
+      modifier = "Mod4";
+      # Use kitty as default terminal
+      terminal = "alacritty";
+      bars = [];
     };
   };
+
+
+  programs.obs-studio = {
+    enable = true;
+    plugins = with pkgs.obs-studio-plugins; [
+      obs-vaapi
+      obs-teleport
+      droidcam-obs
+      obs-gstreamer
+      obs-shaderfilter
+      obs-command-source
+      obs-move-transition
+      advanced-scene-switcher
+    ];
+  };
 }
diff --git a/modules/packages.nix b/modules/packages.nix
index 9fc9757..a3b1acc 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -68,6 +68,10 @@ in {
       ddev
       act
       mkcert
+      pulumi
+      dagger
+      kubectl
+      pulumiPackages.pulumi-language-nodejs
     ] ++ (if config.machine.isGraphical then [
       (pkgs.nerdfonts.override {
         fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ];
@@ -97,6 +101,7 @@ in {
       chromium
       quickemu
       quickgui
+      trilium-desktop
     ] else [ ]) ++ (if config.machine.isGnome then [
       gnomeExtensions.blur-my-shell
       gnomeExtensions.dash-to-panel