diff --git a/README.md b/README.md
index 61c5a70..3195c03 100644
--- a/README.md
+++ b/README.md
@@ -6,5 +6,6 @@ When adding a new host:
 3. copy an existing devicename.nix
 5. change import to `new-devicename-hardware-configuration.nix`
 6. set the hostname and optional imports in `new-devicename.nix`
-7. `ln -s ./new-devicename.nix /etc/nixos/configuration`
-8. apply
+7. `ln -s ./new-devicename.nix /etc/nixos/configuration.nix`
+8. `sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz home-manager`
+9. apply
diff --git a/common.nix b/common.nix
index 524f108..6f36d02 100644
--- a/common.nix
+++ b/common.nix
@@ -18,10 +18,7 @@
 
   boot.loader = {
     systemd-boot.enable = true;
-    efi = {
-      canTouchEfiVariables = true;
-      efiSysMountPoint = "/boot/efi";
-    };
+    efi.canTouchEfiVariables = true;
   };
 
   networking = {
diff --git a/gnome.nix b/gnome.nix
index 8e1a5c3..f68a1b5 100644
--- a/gnome.nix
+++ b/gnome.nix
@@ -31,4 +31,15 @@
     gnome-music
     pkgs.gnome-connections
   ];
+
+  home-manager.users.vinzenz = {
+    config,
+    pkgs,
+    ...
+  }: {
+    home.packages = with pkgs; [
+        gnome.gpaste
+        amberol
+    ];
+  };
 }
diff --git a/home.nix b/home.nix
index 1fab343..c8d92c6 100644
--- a/home.nix
+++ b/home.nix
@@ -38,9 +38,7 @@
         # gnome-secrets
         tdesktop
         lutris
-        amberol
         simple-scan
-        gnome.gpaste
         wireguard-tools
         # steamlink
         element-desktop
diff --git a/kde.nix b/kde.nix
new file mode 100644
index 0000000..8094976
--- /dev/null
+++ b/kde.nix
@@ -0,0 +1,29 @@
+{ config, pkgs, ... }:
+{
+
+  services = {
+    # Enable the KDE Plasma Desktop Environment.
+    xserver = {
+      displayManager.sddm.enable = true;
+      desktopManager.plasma5.enable = true;
+    };
+  };
+
+
+
+    home-manager.users.vinzenz = {
+      config,
+      pkgs,
+      ...
+    }: {
+      home = {
+        packages = with pkgs; [
+        ];
+      };
+       services.kdeconnect = {
+      enable = true;
+      indicator = true;
+    };
+  };
+
+}
diff --git a/vinzenz-lpt-hardware-configuration.nix b/vinzenz-lpt-hardware-configuration.nix
index 0aa8477..096c2f2 100644
--- a/vinzenz-lpt-hardware-configuration.nix
+++ b/vinzenz-lpt-hardware-configuration.nix
@@ -1,6 +1,3 @@
-# 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,
@@ -12,10 +9,13 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = ["kvm-intel"];
-  boot.extraModulePackages = [];
+  boot = {
+    initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci"];
+    initrd.kernelModules = [];
+    kernelModules = ["kvm-intel"];
+    extraModulePackages = [];
+    loader.efi.efiSysMountPoint = "/boot/efi";
+  };
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/34cb86c4-8823-4785-9672-92ef0bcd5eaf";
diff --git a/vinzenz-pc2.nix b/vinzenz-pc2.nix
deleted file mode 100644
index daa9fec..0000000
--- a/vinzenz-pc2.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{...}: {
-  networking.hostName = "vinzenz-pc2";
-
-  imports = [
-    ./vinzenz-pc2-hardware-configuration.nix
-    ./common.nix
-    ./kde.nix
-  ];
-}
diff --git a/vinzenz-pc3-hardware-configuration.nix b/vinzenz-pc3-hardware-configuration.nix
new file mode 100644
index 0000000..5603aa8
--- /dev/null
+++ b/vinzenz-pc3-hardware-configuration.nix
@@ -0,0 +1,46 @@
+{ config, lib, pkgs, modulesPath, ... }:
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot = {
+    initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" ]; # "usb_storage"
+    initrd.kernelModules = [ ];
+    kernelModules = [ "kvm-amd" ];
+    extraModulePackages = [ ];
+    loader.efi.efiSysMountPoint = "/boot";
+  };
+
+  fileSystems = {
+    "/" =
+    { device = "/dev/disk/by-uuid/0e9c983a-e733-447e-8181-f41d6670c4b8";
+      fsType = "btrfs";
+      options = [ "subvol=@" ];
+    };
+
+    "/boot" =
+    { device = "/dev/disk/by-uuid/AF67-8F16";
+      fsType = "vfat";
+    };
+  };
+
+  fileSystems."/sdmanjaro" =
+    { device = "/dev/disk/by-uuid/b6b4c0b8-4b16-4a72-a18d-d7923a2bb532";
+      fsType = "btrfs";
+      options = [ "subvol=@" ];
+    };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/vinzenz-pc3.nix b/vinzenz-pc3.nix
new file mode 100644
index 0000000..458a499
--- /dev/null
+++ b/vinzenz-pc3.nix
@@ -0,0 +1,9 @@
+{...}: {
+  networking.hostName = "vinzenz-pc3";
+
+  imports = [
+    ./vinzenz-pc3-hardware-configuration.nix
+    ./common.nix
+    ./kde.nix
+  ];
+}