diff --git a/my/gnome.nix b/my/gnome.nix
index 5acffeb..07c8d1a 100644
--- a/my/gnome.nix
+++ b/my/gnome.nix
@@ -3,8 +3,7 @@
   pkgs,
   lib,
   ...
-}:
-let
+}: let
   cfg = config.my.gnome;
 in {
   options.my.gnome = {
@@ -42,7 +41,7 @@ in {
     ];
 
     home-manager.users = {
-      vinzenz = {pkgs, ...}: {
+      vinzenz = lib.mkIf config.my.users.vinzenz.enable {
         home.packages = with pkgs; [
           gnome.gpaste
           amberol
diff --git a/my/home-vinzenz.nix b/my/home-vinzenz.nix
index ceed7ff..21a70b7 100644
--- a/my/home-vinzenz.nix
+++ b/my/home-vinzenz.nix
@@ -3,8 +3,7 @@
   pkgs,
   lib,
   ...
-}:
-let
+}: let
   cfg = config.my.users.vinzenz;
 in {
   options.my.users.vinzenz = {
diff --git a/my/kde.nix b/my/kde.nix
index 26e65f8..e874c50 100644
--- a/my/kde.nix
+++ b/my/kde.nix
@@ -3,8 +3,7 @@
   pkgs,
   lib,
   ...
-}:
-let
+}: let
   cfg = config.my.kde;
 in {
   options.my.kde = {
diff --git a/vinzenz-lpt.nix b/vinzenz-lpt.nix
index ccc550e..2b2da57 100644
--- a/vinzenz-lpt.nix
+++ b/vinzenz-lpt.nix
@@ -4,49 +4,51 @@
   pkgs,
   ...
 }: {
-  networking.hostName = "vinzenz-lpt";
-
-  my.gnome.enable = true;
-  my.users.vinzenz.enable = true;
-
   imports = [./my/default.nix];
 
-  services.flatpak.enable = true;
+  config = {
+    networking.hostName = "vinzenz-lpt";
 
-  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";
-  };
+    my.gnome.enable = true;
+    my.users.vinzenz.enable = true;
 
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-uuid/34cb86c4-8823-4785-9672-92ef0bcd5eaf";
-      fsType = "btrfs";
-      options = ["subvol=@"];
+    services.flatpak.enable = true;
+
+    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";
     };
 
-    "/boot/efi" = {
-      device = "/dev/disk/by-uuid/2381-1CD2";
-      fsType = "vfat";
+    fileSystems = {
+      "/" = {
+        device = "/dev/disk/by-uuid/34cb86c4-8823-4785-9672-92ef0bcd5eaf";
+        fsType = "btrfs";
+        options = ["subvol=@"];
+      };
+
+      "/boot/efi" = {
+        device = "/dev/disk/by-uuid/2381-1CD2";
+        fsType = "vfat";
+      };
     };
+
+    swapDevices = [
+      {device = "/dev/disk/by-uuid/f5932f70-60e4-4abe-b23d-2cab3c095c7d";}
+    ];
+
+    # 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.wlp3s0.useDHCP = lib.mkDefault true;
+
+    nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+    hardware.enableRedistributableFirmware = true;
+    hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   };
-
-  swapDevices = [
-    {device = "/dev/disk/by-uuid/f5932f70-60e4-4abe-b23d-2cab3c095c7d";}
-  ];
-
-  # 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.wlp3s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.enableRedistributableFirmware = true;
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/vinzenz-pc3.nix b/vinzenz-pc3.nix
index afa0528..2b961db 100644
--- a/vinzenz-pc3.nix
+++ b/vinzenz-pc3.nix
@@ -4,80 +4,82 @@
   pkgs,
   ...
 }: {
-  networking.hostName = "vinzenz-pc3";
-
-  my.kde.enable = true;
-  my.users = {
-    vinzenz.enable = true;
-    ronja.enable = true;
-  };
-
   imports = [./my/default.nix];
 
-  users.groups."games" = {
-    members = ["vinzenz" "ronja"];
+  config = {
+    networking.hostName = "vinzenz-pc3";
+
+    my.kde.enable = true;
+    my.users = {
+      vinzenz.enable = true;
+      ronja.enable = true;
+    };
+
+    users.groups."games" = {
+      members = ["vinzenz" "ronja"];
+    };
+
+    users.users.vinzenz.openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINrY6tcgnoC/xbgL7vxSjddEY9MBxRXe9n2cAHt88/TT home roaming"
+    ];
+
+    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=@"];
+      };
+
+      "/home" = {
+        device = "/dev/disk/by-uuid/0e9c983a-e733-447e-8181-f41d6670c4b8";
+        fsType = "btrfs";
+        options = ["subvol=@home"];
+      };
+
+      "/games" = {
+        device = "/dev/disk/by-uuid/0e9c983a-e733-447e-8181-f41d6670c4b8";
+        fsType = "btrfs";
+        options = ["subvol=@games"];
+      };
+
+      "/boot" = {
+        device = "/dev/disk/by-uuid/AF67-8F16";
+        fsType = "vfat";
+      };
+
+      "/mnt/nixos_btrfs_root" = {
+        # subvolume with id 5 is always the root volume
+        # this is convenient for managing the flat subvolume hierarchy
+        device = "/dev/disk/by-uuid/0e9c983a-e733-447e-8181-f41d6670c4b8";
+        fsType = "btrfs";
+        options = ["subvolid=5"];
+      };
+
+      "/mnt/ssd2" = {
+        device = "/dev/disk/by-uuid/6b2a647d-c68e-4c07-85bf-c9bfc5db7e8a";
+        fsType = "ext4";
+      };
+    };
+
+    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;
   };
-
-  users.users.vinzenz.openssh.authorizedKeys.keys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINrY6tcgnoC/xbgL7vxSjddEY9MBxRXe9n2cAHt88/TT home roaming"
-  ];
-
-  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=@"];
-    };
-
-    "/home" = {
-      device = "/dev/disk/by-uuid/0e9c983a-e733-447e-8181-f41d6670c4b8";
-      fsType = "btrfs";
-      options = ["subvol=@home"];
-    };
-
-    "/games" = {
-      device = "/dev/disk/by-uuid/0e9c983a-e733-447e-8181-f41d6670c4b8";
-      fsType = "btrfs";
-      options = ["subvol=@games"];
-    };
-
-    "/boot" = {
-      device = "/dev/disk/by-uuid/AF67-8F16";
-      fsType = "vfat";
-    };
-
-    "/mnt/nixos_btrfs_root" = {
-      # subvolume with id 5 is always the root volume
-      # this is convenient for managing the flat subvolume hierarchy
-      device = "/dev/disk/by-uuid/0e9c983a-e733-447e-8181-f41d6670c4b8";
-      fsType = "btrfs";
-      options = ["subvolid=5"];
-    };
-
-    "/mnt/ssd2" = {
-      device = "/dev/disk/by-uuid/6b2a647d-c68e-4c07-85bf-c9bfc5db7e8a";
-      fsType = "ext4";
-    };
-  };
-
-  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;
 }