diff --git a/README.md b/README.md
index f79a90c..de1996f 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@
 ## Steps to fully finish home-setup:
 
 * add home-manager channel to private channel-list (nix-channel add https://github.com/nix-community/home-manager/archive/release-21.05.tar.gz home-manager)
+* install home-manager (nix-shell '<home-manager>' -A install
 * generate home-instance
 * add unlock-secret to secret-store (secret-tool store --label='keepassxc' keepass unlock)
 * add certs and keyfiles
diff --git a/cp.sh b/cp.sh
index 6804721..fde3717 100755
--- a/cp.sh
+++ b/cp.sh
@@ -2,7 +2,7 @@
 #! nix-shell -i zsh -p zsh
 
 cp /etc/nixos/configuration.nix .
-cp /etc/nixos/hardware-configuration.nix .
+cp -r /etc/nixos/machine .
 cp -r /etc/nixos/programs .
 cp -r $HOME/.config/i3 ./home/config/.
 cp -r $HOME/.config/nixpkgs ./home/config/.
diff --git a/home/config/Nextcloud/nextcloud.cfg b/home/config/Nextcloud/nextcloud.cfg
index eb2bda5..36a7bb8 100644
--- a/home/config/Nextcloud/nextcloud.cfg
+++ b/home/config/Nextcloud/nextcloud.cfg
@@ -45,6 +45,7 @@ useNewBigFolderSizeLimit=true
 1\dav_user=ellmau
 1\serverVersion=20.0.9.1
 1\url=https://cloudstore.ellmauthaler.net
+1\user=@Invalid()
 1\version=1
 1\webflow_user=ellmau
 version=2
diff --git a/home/config/i3/config b/home/config/i3/config
index b4e1a4b..10c2013 100644
--- a/home/config/i3/config
+++ b/home/config/i3/config
@@ -27,7 +27,8 @@ set $mod Mod4
 
 # xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
 # screen before suspend. Use loginctl lock-session to lock your screen.
-exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
+set $i3lockwall i3lock --nofork -i ~/.background-image -f -e
+exec --no-startup-id xss-lock --transfer-sleep-lock -- $i3lockwall
 
 # NetworkManager is the most popular way to manage wireless networks on Linux,
 # and nm-applet is a desktop environment-independent system tray GUI for it.
@@ -208,9 +209,6 @@ bindsym $mod+r mode "resize"
 #exec_always --no-startup-id polybar
 exec_always --no-startup-id systemctl --user start polybar.service
 
-# lockscreen
-set $i3lockwall i3lock -f -t --nofork #-i ~/Pictures/matrix-manjaro.png --nofork
-
 # shutdown / restart / suspend...
 set $mode_system System (l) lock, (CTRL+e) logout, (CTRL+r) reboot, (CTRL+s) shutdown
 
diff --git a/home/config/nixpkgs/autorandr.nix b/home/config/nixpkgs/autorandr.nix
new file mode 100644
index 0000000..16437ce
--- /dev/null
+++ b/home/config/nixpkgs/autorandr.nix
@@ -0,0 +1,37 @@
+{ pkgs, lib, ...}:
+{
+  programs.autorandr = {
+    enable = true;
+    profiles = {
+      "home" = {
+        fingerprint = {
+          DP-1 = "00ffffffffffff0009d1507945540000221e0104b54627783f5995af4f42af260f5054a56b80d1c0b300a9c08180810081c0010101014dd000a0f0703e8030203500ba892100001a000000ff004e384c30323634373031390a20000000fd00283c87873c010a202020202020000000fc0042656e5120455733323730550a01bc02033af1515d5e5f6061101f222120051404131203012309070783010000e200c06d030c0020003878200060010203e305e001e6060501544c2ca36600a0f0701f8030203500ba892100001a565e00a0a0a029502f203500ba892100001abf650050a0402e6008200808ba892100001c000000000000000000000000000000bf";
+          eDP-1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
+        };
+        config = {
+          eDP-1.enable = false;
+          DP-1 = {
+            enable = true;
+            crtc = 1;
+            primary = true;
+            position = "0x0";
+            mode = "3840x2160";
+          };
+        };
+      };
+      "mobile" = {
+        fingerprint.eDP-1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
+        config = {
+          eDP-1 = {
+            enable = true;
+            primary = true;
+            mode = "3840x2160";
+          };
+        };
+      };
+    };
+    hooks.postswitch = {
+      "polybar" = "systemctl --user restart polybar.service";
+    };
+  };
+}
diff --git a/home/config/nixpkgs/common/wallpaper/nix-wallpaper-nineish-dark-gray.png b/home/config/nixpkgs/common/wallpaper/nix-wallpaper-nineish-dark-gray.png
new file mode 100644
index 0000000..879b65a
Binary files /dev/null and b/home/config/nixpkgs/common/wallpaper/nix-wallpaper-nineish-dark-gray.png differ
diff --git a/home/config/nixpkgs/common/wallpaper/nix-wallpaper-nineish.png b/home/config/nixpkgs/common/wallpaper/nix-wallpaper-nineish.png
new file mode 100644
index 0000000..3fff85b
Binary files /dev/null and b/home/config/nixpkgs/common/wallpaper/nix-wallpaper-nineish.png differ
diff --git a/home/config/nixpkgs/home.nix b/home/config/nixpkgs/home.nix
index 5cc9870..6e61f51 100644
--- a/home/config/nixpkgs/home.nix
+++ b/home/config/nixpkgs/home.nix
@@ -6,6 +6,7 @@
       ./dunst.nix
       ./zsh.nix
       ./nextcloud.nix
+      ./autorandr.nix
     ];
   home.packages = [
     pkgs.htop
@@ -14,6 +15,8 @@
     pkgs.jitsi-meet-electron
     pkgs.skypeforlinux
     pkgs.zoom-us
+    pkgs.element-desktop
+    pkgs.signal-desktop
   ];
 
   nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
@@ -39,9 +42,12 @@
 
   xdg = {
     enable = true;
-    
   };
 
+  home.file.".background-image".source = ./common/wallpaper/nix-wallpaper-nineish-dark-gray.png;
+  
+  
+
   programs.home-manager = {
     enable = true;
   };
diff --git a/home/config/nixpkgs/polybar.nix b/home/config/nixpkgs/polybar.nix
index a283ccf..02ee802 100644
--- a/home/config/nixpkgs/polybar.nix
+++ b/home/config/nixpkgs/polybar.nix
@@ -44,6 +44,33 @@
               background = foreground_col;
             };
           };
+          "bar/aux" = {
+            font = [
+              "Hasklig:style=Regular"
+              "all-the-icons:style=Regular"
+              "Webdings:style=Regular"
+              "Noto Emoji:scale=10"
+              "Unifont:style=Regular"
+              "Material Icons:size=12;0"
+              "Weather Icons:size=12;0"
+              "Hasklug Nerd Font,Hasklig Medium:style=Medium,Regular"
+            ];
+            modules = {
+              left = "i3";
+              center = "";
+              right = " xbacklight xkeyboard eth wlan battery date powermenu volume ";
+            };
+
+            background = background_col;
+            foreground = foreground_col;
+
+            monitor = ''
+          ''${env:MONITOR:}
+        '';
+            width = "100%";
+            module-margin = 1;
+          };
+          
           "module/volume" = {
             type = "internal/pulseaudio";
             format.volume = "<ramp-volume> <label-volume>";
@@ -142,7 +169,7 @@
             format-connected = " <label-connected>";
             format-connected-prefix-foreground = foreground_altcol;
             label-connected = "%local_ip%";
-                    
+            
             format-disconnected = "";
             format-disconnected-background = "#5479b7";
             #;format-disconnected = <label-disconnected>
@@ -257,9 +284,12 @@
           };
         };
     script = ''
-    for m in $(polybar --list-monitors | ${pkgs.coreutils}/bin/cut -d":" -f1); do
-            MONITOR=$m polybar --reload main &
-          done;
+    for m in $(polybar --list-monitors | ${pkgs.gnugrep}/bin/grep '(primary)' | ${pkgs.coreutils}/bin/cut -d":" -f1); do
+      MONITOR=$m polybar --reload main &
+    done;
+    for m in $(polybar --list-monitors | ${pkgs.gnugrep}/bin/grep -v '(primary)' | ${pkgs.coreutils}/bin/cut -d":" -f1); do
+      MONITOR=$m polybar --reload aux &
+    done;
     '';
   };
 }
diff --git a/machine/current b/machine/current
index fab995a..73eff5b 120000
--- a/machine/current
+++ b/machine/current
@@ -1 +1 @@
-nucturne/
\ No newline at end of file
+stel-xps/
\ No newline at end of file
diff --git a/machine/stel-xps/default.nix b/machine/stel-xps/default.nix
new file mode 100644
index 0000000..92ff5ed
--- /dev/null
+++ b/machine/stel-xps/default.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ...}:
+{
+  networking.hostName = "stel-xps"; # define the hostname
+
+  services.autorandr.enable = true;
+  services.xserver.desktopManager.wallpaper.mode = "fill";
+}
diff --git a/machine/stel-xps/hardware-configuration.nix b/machine/stel-xps/hardware-configuration.nix
new file mode 100644
index 0000000..f56c48a
--- /dev/null
+++ b/machine/stel-xps/hardware-configuration.nix
@@ -0,0 +1,35 @@
+# 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" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/6b7f9f80-af34-4317-b017-f883a2316674";
+      fsType = "ext4";
+    };
+
+  boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/9c84f143-023d-4fcb-a49c-ca78ce69e0e0";
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/4824-2CFD";
+      fsType = "vfat";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/93381a25-6704-408e-b091-cfda6cddbda0"; }
+    ];
+
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  # high-resolution display
+  hardware.video.hidpi.enable = lib.mkDefault true;
+}
diff --git a/programs/emacs/default.el b/programs/emacs/default.el
index b2b00c5..d9d5fe3 100644
--- a/programs/emacs/default.el
+++ b/programs/emacs/default.el
@@ -148,13 +148,13 @@
   (require 'org-roam-protocol)
   :config
   (org-roam-db-autosync-mode))
-;; (use-package org-roam-ui
-;;   :after org-roam
-;;   :custom
-;;   (org-roam-ui-sync-theme t)
-;;   (org-roam-ui-follow)
-;;   (org-roam-ui-update-on-save t)
-;;   (org-roam-ui-open-on-start t))
+ (use-package org-roam-ui
+   :after org-roam
+   :custom
+   (org-roam-ui-sync-theme t)
+   (org-roam-ui-follow)
+   (org-roam-ui-update-on-save t)
+   (org-roam-ui-open-on-start t))
 (define-key org-roam-mode-map [mouse-1] #'org-roam-visit-thing)
 
 ;; tally-list