diff --git a/hosts/chonk/authelia.nix b/hosts/chonk/authelia.nix
index 4932cfcb..86164a39 100644
--- a/hosts/chonk/authelia.nix
+++ b/hosts/chonk/authelia.nix
@@ -1,7 +1,7 @@
 {
   pkgs,
   config,
-  self,
+  flake,
   ...
 }: let
   containerStateDir = "/var/lib/authelia-gssws";
@@ -11,19 +11,19 @@
   servicePort = 9091;
 in {
   age.secrets.authelia_users = {
-    file = "${self}/secrets/chonk_authelia_users.age";
+    file = "${flake.self}/secrets/chonk_authelia_users.age";
     owner = "999";
     group = "999";
   };
 
   age.secrets.authelia_storage_encryption_key = {
-    file = "${self}/secrets/chonk_authelia_storage_encryption_key.age";
+    file = "${flake.self}/secrets/chonk_authelia_storage_encryption_key.age";
     owner = "999";
     group = "999";
   };
 
   age.secrets.authelia_jwt_secret = {
-    file = "${self}/secrets/chonk_authelia_jwt_secret.age";
+    file = "${flake.self}/secrets/chonk_authelia_jwt_secret.age";
     owner = "999";
     group = "999";
   };
diff --git a/hosts/chonk/backup.nix b/hosts/chonk/backup.nix
index 4eab175a..6f5b6f60 100644
--- a/hosts/chonk/backup.nix
+++ b/hosts/chonk/backup.nix
@@ -1,11 +1,11 @@
 {
   config,
   lib,
-  self,
+  flake,
   ...
 }: {
-  age.secrets.restic_repository_password.file = "${self}/secrets/chonk_restic_repository_password.age";
-  age.secrets.restic_nextcloud_password.file = "${self}/secrets/chonk_restic_nextcloud_password.age";
+  age.secrets.restic_repository_password.file = "${flake.self}/secrets/chonk_restic_repository_password.age";
+  age.secrets.restic_nextcloud_password.file = "${flake.self}/secrets/chonk_restic_nextcloud_password.age";
 
   programs.ssh.extraConfig = ''
     Host backup
diff --git a/hosts/chonk/builder.nix b/hosts/chonk/builder.nix
index f7013d1d..ae5e74da 100644
--- a/hosts/chonk/builder.nix
+++ b/hosts/chonk/builder.nix
@@ -1,8 +1,8 @@
 {
-  self,
   config,
   pkgs,
   lib,
+  flake,
   ...
 }: let
   psCfg = config.pub-solar;
@@ -10,7 +10,7 @@ in {
   age.secrets.nix-builder-private-key = {
     owner = "builder";
     group = "builder";
-    file = "${self}/secrets/chonk_nix_builder_private_key.age";
+    file = "${flake.self}/secrets/chonk_nix_builder_private_key.age";
   };
 
   nix = {
diff --git a/hosts/chonk/configuration.nix b/hosts/chonk/configuration.nix
index df06ef4e..11929ac9 100644
--- a/hosts/chonk/configuration.nix
+++ b/hosts/chonk/configuration.nix
@@ -4,29 +4,6 @@
   pkgs,
   ...
 }: {
-  imports = [
-    # Include the results of the hardware scan.
-    ./hardware-configuration.nix
-    ./acme.nix
-    ./backup.nix
-    ./drone.nix
-    ./home-assistant.nix
-    ./nextcloud.nix
-    ./wireguard.nix
-    ./builder.nix
-    ./invidious.nix
-    ./factorio.nix
-
-    ./invoiceplane.nix
-    #./tang.nix
-    #./whiteboard.nix
-
-    ./libvirt-container.nix
-    ./monitoring.nix
-
-    ./authelia.nix
-  ];
-
   boot.loader.systemd-boot.enable = lib.mkForce false;
 
   time.timeZone = "Europe/Berlin";
@@ -41,5 +18,8 @@
   networking.firewall.allowedTCPPorts = [80 443 2222];
   networking.firewall.allowedUDPPorts = [51899];
 
+  pub-solar.server.enable = true;
+  hardware.ksm.enable = true;
+
   system.stateVersion = "21.05"; # Did you read the comment?
 }
diff --git a/hosts/chonk/default.nix b/hosts/chonk/default.nix
index 3c4d411a..9a7977c7 100644
--- a/hosts/chonk/default.nix
+++ b/hosts/chonk/default.nix
@@ -2,5 +2,24 @@
   imports = [
     ./configuration.nix
     ./hardware-configuration.nix
+
+    ./acme.nix
+    ./backup.nix
+    ./drone.nix
+    ./home-assistant.nix
+    ./nextcloud.nix
+    ./wireguard.nix
+    ./builder.nix
+    ./invidious.nix
+    ./factorio.nix
+
+    ./invoiceplane.nix
+    #./tang.nix
+    #./whiteboard.nix
+
+    ./libvirt-container.nix
+    ./monitoring.nix
+
+    ./authelia.nix
   ];
 }
diff --git a/hosts/chonk/drone.nix b/hosts/chonk/drone.nix
index d2239123..9e893b1b 100644
--- a/hosts/chonk/drone.nix
+++ b/hosts/chonk/drone.nix
@@ -1,11 +1,11 @@
 {
-  self,
   config,
   pkgs,
+  flake,
   ...
 }: {
   age.secrets.drone_exec_runner_config = {
-    file = "${self}/secrets/chonk_drone_exec_runner_config.age";
+    file = "${flake.self}/secrets/chonk_drone_exec_runner_config.age";
     owner = "999";
   };
 
diff --git a/hosts/chonk/factorio.nix b/hosts/chonk/factorio.nix
index be3043a8..bce2b050 100644
--- a/hosts/chonk/factorio.nix
+++ b/hosts/chonk/factorio.nix
@@ -1,5 +1,4 @@
 {
-  self,
   lib,
   config,
   pkgs,
@@ -152,6 +151,10 @@ with pkgs; let
   };
 in rec
 {
+  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+    "factorio-headless"
+  ];
+
   services.factorio = {
     enable = true;
     package = pkgs.factorio-headless-experimental;
diff --git a/hosts/chonk/hardware-configuration.nix b/hosts/chonk/hardware-configuration.nix
index e4875956..7f933bf3 100644
--- a/hosts/chonk/hardware-configuration.nix
+++ b/hosts/chonk/hardware-configuration.nix
@@ -5,13 +5,8 @@
   config,
   lib,
   pkgs,
-  modulesPath,
   ...
 }: {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
   boot.initrd.availableKernelModules = ["ehci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
   boot.initrd.kernelModules = ["raid1"];
   boot.kernelModules = ["kvm-intel"];
diff --git a/hosts/chonk/home-assistant.nix b/hosts/chonk/home-assistant.nix
index 96fcc5b3..cba7334a 100644
--- a/hosts/chonk/home-assistant.nix
+++ b/hosts/chonk/home-assistant.nix
@@ -1,5 +1,4 @@
 {
-  self,
   pkgs,
   config,
   ...
diff --git a/hosts/chonk/invidious.nix b/hosts/chonk/invidious.nix
index 0335c140..97dcf31e 100644
--- a/hosts/chonk/invidious.nix
+++ b/hosts/chonk/invidious.nix
@@ -1,12 +1,12 @@
 {
-  self,
+  flake,
   config,
   pkgs,
   ...
 }: let
   domain = "yt.gssws.de";
 in {
-  age.secrets.invidious_db_password.file = "${self}/secrets/chonk_invidious_db_password.age";
+  age.secrets.invidious_db_password.file = "${flake.self}/secrets/chonk_invidious_db_password.age";
 
   services.invidious = {
     inherit domain;
diff --git a/hosts/chonk/invoiceplane.nix b/hosts/chonk/invoiceplane.nix
index 8477b298..5b8a6658 100644
--- a/hosts/chonk/invoiceplane.nix
+++ b/hosts/chonk/invoiceplane.nix
@@ -1,5 +1,4 @@
 {
-  self,
   config,
   pkgs,
   ...
diff --git a/hosts/chonk/monitoring.nix b/hosts/chonk/monitoring.nix
index 6ea036eb..c826ef94 100644
--- a/hosts/chonk/monitoring.nix
+++ b/hosts/chonk/monitoring.nix
@@ -1,7 +1,7 @@
 {
   config,
   lib,
-  self,
+  flake,
   ...
 }: {
   pub-solar.monitoring-server = {
diff --git a/hosts/chonk/nextcloud-apps.nix b/hosts/chonk/nextcloud-apps.nix
index 686e39a4..d5c443ad 100644
--- a/hosts/chonk/nextcloud-apps.nix
+++ b/hosts/chonk/nextcloud-apps.nix
@@ -1,5 +1,4 @@
 {
-  self,
   pkgs,
   config,
   lib,
diff --git a/hosts/chonk/nextcloud.nix b/hosts/chonk/nextcloud.nix
index cbd7e75d..e25940ab 100644
--- a/hosts/chonk/nextcloud.nix
+++ b/hosts/chonk/nextcloud.nix
@@ -1,5 +1,5 @@
 {
-  self,
+  flake,
   pkgs,
   config,
   lib,
@@ -15,13 +15,13 @@ in {
   age.secrets.nextcloud_db_pass = {
     owner = "nextcloud";
     group = "nextcloud";
-    file = "${self}/secrets/chonk_nextcloud_db_pass.age";
+    file = "${flake.self}/secrets/chonk_nextcloud_db_pass.age";
   };
 
   age.secrets.nextcloud_admin_pass = {
     owner = "nextcloud";
     group = "nextcloud";
-    file = "${self}/secrets/chonk_nextcloud_admin_pass.age";
+    file = "${flake.self}/secrets/chonk_nextcloud_admin_pass.age";
   };
 
   # HTTP
diff --git a/hosts/chonk/tang.nix b/hosts/chonk/tang.nix
index b0ace79c..ea33e6aa 100644
--- a/hosts/chonk/tang.nix
+++ b/hosts/chonk/tang.nix
@@ -1,5 +1,4 @@
 {
-  self,
   config,
   pkgs,
   ...
diff --git a/hosts/chonk/wireguard.nix b/hosts/chonk/wireguard.nix
index 96952ca2..de5a9d68 100644
--- a/hosts/chonk/wireguard.nix
+++ b/hosts/chonk/wireguard.nix
@@ -1,10 +1,10 @@
 {
-  self,
+  flake,
   config,
   pkgs,
   ...
 }: {
-  age.secrets.home_controller_wireguard.file = "${self}/secrets/chonk_wireguard_key.age";
+  age.secrets.home_controller_wireguard.file = "${flake.self}/secrets/chonk_wireguard_key.age";
 
   systemd.services.wireguard-wg0.serviceConfig.Restart = "on-failure";
   systemd.services.wireguard-wg0.serviceConfig.RestartSec = "5s";
diff --git a/hosts/companion/configuration.nix b/hosts/companion/configuration.nix
index ec1c1641..24772a1b 100644
--- a/hosts/companion/configuration.nix
+++ b/hosts/companion/configuration.nix
@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 {
-  inputs,
+  flake,
   pkgs,
   builtins,
   config,
@@ -10,11 +10,12 @@
   ...
 }: {
   imports = [
-    ./hardware-configuration.nix
     ./home-controller.nix
     ./home-assistant.nix
   ];
 
+  pub-solar.server.enable = true;
+  hardware.ksm.enable = true;
   boot.loader.timeout = lib.mkForce 0;
 
   boot.loader.generic-extlinux-compatible.enable = lib.mkForce false;
@@ -26,7 +27,7 @@
     device = "nodev";
 
     extraInstallCommands = ''
-      cp -r ${inputs.nixpkgs-hensoko.packages.aarch64-linux.raspberrypi4_firmware_uefi}/share/raspberrypi4-firmware-uefi/* /boot/
+      cp -r ${flake.inputs.nixpkgs-hensoko.packages.aarch64-linux.raspberrypi4_firmware_uefi}/share/raspberrypi4-firmware-uefi/* /boot/
     '';
   };
 
diff --git a/hosts/companion/hardware-configuration.nix b/hosts/companion/hardware-configuration.nix
index 665e079e..afdd61f9 100644
--- a/hosts/companion/hardware-configuration.nix
+++ b/hosts/companion/hardware-configuration.nix
@@ -8,10 +8,6 @@
   modulesPath,
   ...
 }: {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
   boot.initrd.availableKernelModules = ["xhci_pci" "usbhid" "usb_storage" "uas"];
 
   #boot.kernelParams = [ "usb-storage.quirks=2109:0716:u,174c:55aa:u" ];
diff --git a/hosts/companion/home-assistant.nix b/hosts/companion/home-assistant.nix
index d5946764..5ef6c4ae 100644
--- a/hosts/companion/home-assistant.nix
+++ b/hosts/companion/home-assistant.nix
@@ -1,5 +1,5 @@
 {
-  self,
+  flake,
   config,
   pkgs,
   ...
diff --git a/hosts/companion/home-controller.nix b/hosts/companion/home-controller.nix
index f49c3e9f..ab1e206c 100644
--- a/hosts/companion/home-controller.nix
+++ b/hosts/companion/home-controller.nix
@@ -1,11 +1,11 @@
 {
-  self,
+  flake,
   config,
   pkgs,
   ...
 }: {
   config = {
-    age.secrets.home_controller_wireguard.file = "${self}/secrets/home_controller_companion_wireguard_key.age";
+    age.secrets.home_controller_wireguard.file = "${flake.self}/secrets/home_controller_companion_wireguard_key.age";
 
     pub-solar.home-controller = {
       enable = true;
diff --git a/hosts/cox/backup.nix b/hosts/cox/backup.nix
index 7d0504b2..ea157d82 100644
--- a/hosts/cox/backup.nix
+++ b/hosts/cox/backup.nix
@@ -1,5 +1,5 @@
 {
-  self,
+  flake,
   config,
   pkgs,
   ...
@@ -10,7 +10,7 @@ let
 in
 {
   age.secrets.backup_restic_htpasswd = {
-    file = "${self}/secrets/cox_backup_restic_htpasswd.age";
+    file = "${flake.self}/secrets/cox_backup_restic_htpasswd.age";
     owner = "${toString config.ids.uids.restic}";
   };
 
diff --git a/hosts/cox/configuration.nix b/hosts/cox/configuration.nix
index 7bd9c212..54ec3779 100644
--- a/hosts/cox/configuration.nix
+++ b/hosts/cox/configuration.nix
@@ -9,7 +9,6 @@
 }: {
   imports = [
     ./backup.nix
-    ./hardware-configuration.nix
     ./home-controller.nix
     ./paperless.nix
   ];
diff --git a/hosts/cox/home-controller.nix b/hosts/cox/home-controller.nix
index c6b22bd7..f970ee90 100644
--- a/hosts/cox/home-controller.nix
+++ b/hosts/cox/home-controller.nix
@@ -1,11 +1,11 @@
 {
-  self,
+  flake,
   config,
   pkgs,
   ...
 }: {
   config = {
-    age.secrets.home_controller_wireguard.file = "${self}/secrets/home_controller_cox_wireguard_key.age";
+    age.secrets.home_controller_wireguard.file = "${flake.self}/secrets/home_controller_cox_wireguard_key.age";
 
     pub-solar.home-controller = {
       enable = true;
diff --git a/hosts/cube/configuration.nix b/hosts/cube/configuration.nix
index 95f8b9ca..cae558f1 100644
--- a/hosts/cube/configuration.nix
+++ b/hosts/cube/configuration.nix
@@ -4,12 +4,8 @@
   pkgs,
   ...
 }: {
-  imports = [
-    # Include the results of the hardware scan.
-    ./hardware-configuration.nix
-    ./home-controller.nix
-  ];
-
+  pub-solar.server.enable = true;
+  hardware.ksm.enable = true;
   pub-solar.core.disk-encryption-active = false;
 
   networking.networkmanager.enable = lib.mkForce false;
diff --git a/hosts/default.nix b/hosts/default.nix
index 5a015c4f..b6bd5066 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -21,10 +21,10 @@ in
       (mkNixosConfig "cube" "x86_64-linux" "iot") //
       (mkNixosConfig "falcone" "aarch64-linux" "iot") //
       (mkNixosConfig "giggles" "aarch64-linux" "iot") //
-      (mkNixosConfig "harrison" "x86_64-linux" "iot") //
-      (mkNixosConfig "norman" "x86_64-linux" "iot") //
-      (mkNixosConfig "redpanda" "x86_64-linux" "iot") //
-      (mkNixosConfig "ringo" "x86_64-linux" "iot") //
-      (mkNixosConfig "surfplace" "x86_64-linux" "iot");
-  };
+      (mkNixosConfig "harrison" "x86_64-linux" "hensoko") //
+      (mkNixosConfig "norman" "x86_64-linux" "hensoko") //
+      (mkNixosConfig "redpanda" "x86_64-linux" "hensoko") //
+      (mkNixosConfig "ringo" "x86_64-linux" "hensoko") //
+      (mkNixosConfig "surfplace" "x86_64-linux" "hensoko");
+    };
 }
diff --git a/hosts/falcone/configuration.nix b/hosts/falcone/configuration.nix
index 002e1599..7b380f66 100644
--- a/hosts/falcone/configuration.nix
+++ b/hosts/falcone/configuration.nix
@@ -5,11 +5,6 @@
 { inputs, pkgs, builtins, config, lib, ... }:
 
 {
-  imports =
-    [
-      ./hardware-configuration.nix
-    ];
-
   boot.plymouth.enable = lib.mkForce false;
   pub-solar.nextcloud.enable = lib.mkForce false;
   pub-solar.core.disk-encryption-active = false;
diff --git a/hosts/falcone/hardware-configuration.nix b/hosts/falcone/hardware-configuration.nix
index f19e768c..8c0056eb 100644
--- a/hosts/falcone/hardware-configuration.nix
+++ b/hosts/falcone/hardware-configuration.nix
@@ -16,7 +16,7 @@
   #boot.initrd.supportedFilesystems = [ "zfs" ];
   #boot.supportedFilesystems = [ "zfs" ];
 
-  boot.kernelPackages = lib.mkForce pkgs.linuxPackages_5_19;
+  boot.kernelPackages = lib.mkForce pkgs.linuxPackages;
 
   fileSystems."/" =
     {
diff --git a/hosts/giggles/configuration.nix b/hosts/giggles/configuration.nix
index 767968a0..c2f6353a 100644
--- a/hosts/giggles/configuration.nix
+++ b/hosts/giggles/configuration.nix
@@ -5,7 +5,6 @@
   ...
 }: {
   imports = [
-    ./hardware-configuration.nix
     ./network.nix
     ./network-dhcp.nix
     ./avahi-reflector.nix
@@ -19,6 +18,8 @@
     # ./tang-container.nix
   ];
 
+  pub-solar.server.enable = true;
+  hardware.ksm.enable = true;
   boot.loader.timeout = 0;
   boot.loader.systemd-boot.enable = lib.mkForce false;
   boot.loader.generic-extlinux-compatible.enable = lib.mkForce false;
diff --git a/hosts/giggles/home-assistant.nix b/hosts/giggles/home-assistant.nix
index 04c3e459..2e9a3777 100644
--- a/hosts/giggles/home-assistant.nix
+++ b/hosts/giggles/home-assistant.nix
@@ -1,5 +1,5 @@
 {
-  self,
+  flake,
   config,
   pkgs,
   python3Packages,
@@ -9,7 +9,7 @@
 
 {
   age.secrets.home-assistant_giggles_secrets = {
-    file = "${self}/secrets/home-assistant_giggles_secrets.age";
+    file = "${flake.self}/secrets/home-assistant_giggles_secrets.age";
     path = "${config.services.home-assistant.configDir}/secrets.yaml";
     owner = config.systemd.services.home-assistant.serviceConfig.User;
     group = config.systemd.services.home-assistant.serviceConfig.Group;
diff --git a/hosts/giggles/home-controller.nix b/hosts/giggles/home-controller.nix
index ee7dd2c7..690d6e74 100644
--- a/hosts/giggles/home-controller.nix
+++ b/hosts/giggles/home-controller.nix
@@ -1,11 +1,11 @@
 {
-  self,
+  flake,
   config,
   pkgs,
   ...
 }: {
   config = {
-    age.secrets.home_controller_wireguard.file = "${self}/secrets/home_controller_giggles_wireguard_key.age";
+    age.secrets.home_controller_wireguard.file = "${flake.self}/secrets/home_controller_giggles_wireguard_key.age";
 
     pub-solar.home-controller = {
       enable = true;
diff --git a/hosts/giggles/unifi.nix b/hosts/giggles/unifi.nix
index b2136ff7..5cabe99e 100644
--- a/hosts/giggles/unifi.nix
+++ b/hosts/giggles/unifi.nix
@@ -1,6 +1,8 @@
-{pkgs, ...}:
+{ pkgs, lib, ...}:
 
 {
+  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "mongodb" "unifi-controller" ];
+
   networking.firewall.allowedTCPPorts = [8443]; # open unifi web interface port
 
   services.unifi = {
diff --git a/hosts/harrison/configuration.nix b/hosts/harrison/configuration.nix
index 24d8c436..24cf89d4 100644
--- a/hosts/harrison/configuration.nix
+++ b/hosts/harrison/configuration.nix
@@ -8,12 +8,48 @@ let
   psCfg = config.pub-solar;
 in
 {
-  imports =
-    [
-      # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
+  # work
+  pub-solar.docker.enable = true;
+  pub-solar.nextcloud.enable = true;
+  pub-solar.social.enable = true;
+  pub-solar.office.enable = true;
 
+  systemd.enableUnifiedCgroupHierarchy = true;
+
+  environment.systemPackages = with pkgs; [
+    jetbrains.goland
+    minicom
+    openjdk11
+    putty
+    remmina
+    thunderbird
+    vscode
+    vscode-extensions.golang.go
+    vscode-extensions.ms-python.python
+    wireshark
+    go_1_20
+    meld
+
+    ardour
+    helm
+  ];
+
+  # unfree
+  hardware.enableRedistributableFirmware = true;
+
+  # graphical
+  pub-solar.graphical.enable = true;
+  pub-solar.sway.enable = true;
+
+  # daw
+  pub-solar.audio.enable = lib.mkForce true;
+  musnix.enable = true;
+  services.pipewire.jack.enable = true;
+
+  # gaming
+  pub-solar.gaming.enable = true;
+
+  # emulated building for raspi
   boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
 
   home-manager.users."${psCfg.user.name}".xdg.configFile = lib.mkIf psCfg.sway.enable {
@@ -21,7 +57,6 @@ in
   };
 
   pub-solar.paranoia.enable = true;
-  pub-solar.nextcloud.enable = true;
 
   programs.ausweisapp.enable = true;
   services.pcscd = {
diff --git a/hosts/harrison/default.nix b/hosts/harrison/default.nix
index a1d958f0..3c4d411a 100644
--- a/hosts/harrison/default.nix
+++ b/hosts/harrison/default.nix
@@ -1,6 +1,6 @@
-{ suites, ... }:
-{
+{ ... }: {
   imports = [
-    ./harrison.nix
-  ] ++ suites.harrison;
+    ./configuration.nix
+    ./hardware-configuration.nix
+  ];
 }
diff --git a/hosts/harrison/harrison.nix b/hosts/harrison/harrison.nix
deleted file mode 100644
index e1caa704..00000000
--- a/hosts/harrison/harrison.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ config, pkgs, lib, ... }:
-with lib;
-with pkgs;
-let
-  psCfg = config.pub-solar;
-in
-{
-  imports = [
-    ./configuration.nix
-  ];
-
-  config = {
-    boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
-
-    home-manager.users."${psCfg.user.name}".xdg.configFile = mkIf psCfg.sway.enable {
-      "sway/config.d/10-screens.conf".source = ./.config/sway/config.d/screens.conf;
-    };
-
-    pub-solar.paranoia.enable = true;
-    pub-solar.nextcloud.enable = true;
-
-    programs.ausweisapp.enable = true;
-    services.pcscd = {
-      enable = true;
-      plugins = [ pkgs.pcsc-cyberjack ];
-    };
-  };
-}
diff --git a/hosts/norman/configuration.nix b/hosts/norman/configuration.nix
index 68936f30..cd4ea2f5 100644
--- a/hosts/norman/configuration.nix
+++ b/hosts/norman/configuration.nix
@@ -12,15 +12,43 @@ let
 in
 {
   imports = [
-    # Include the results of the hardware scan.
-    ./hardware-configuration.nix
     ./wireguard.nix
     ./builder.nix
   ];
 
+  pub-solar.docker.enable = true;
+  pub-solar.nextcloud.enable = true;
+  pub-solar.social.enable = true;
+  pub-solar.office.enable = true;
+
+  systemd.enableUnifiedCgroupHierarchy = true;
+
+  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+    "goland"
+  ];
+
+  environment.systemPackages = with pkgs; [
+    jetbrains.goland
+    minicom
+    openjdk11
+    putty
+    remmina
+    thunderbird
+    vscode
+    vscode-extensions.golang.go
+    vscode-extensions.ms-python.python
+    wireshark
+    go_1_20
+    meld
+
+    factorio-experimental
+  ];
+  hardware.enableRedistributableFirmware = true;
+  pub-solar.graphical.enable = true;
+  pub-solar.sway.enable = true;
+
   boot.binfmt.emulatedSystems = ["aarch64-linux"];
 
-  environment.systemPackages = [pkgs.factorio-experimental];
 
   pub-solar.audio.bluetooth.enable = false;
 
diff --git a/hosts/redpanda/configuration.nix b/hosts/redpanda/configuration.nix
index 70365b99..b7bd6289 100644
--- a/hosts/redpanda/configuration.nix
+++ b/hosts/redpanda/configuration.nix
@@ -5,12 +5,6 @@
 { config, pkgs, lib, ... }:
 
 {
-  imports =
-    [
-      # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
-
   boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
   boot.loader.systemd-boot.enable = lib.mkForce false;
 
diff --git a/hosts/ringo/configuration.nix b/hosts/ringo/configuration.nix
index ce5e41cf..bc85fcf5 100644
--- a/hosts/ringo/configuration.nix
+++ b/hosts/ringo/configuration.nix
@@ -5,12 +5,6 @@
 { config, pkgs, ... }:
 
 {
-  imports =
-    [
-      ./hardware-configuration.nix
-      ./home-controller.nix
-    ];
-
   pub-solar.core.lite = true;
 
   # Use the systemd-boot EFI boot loader.
diff --git a/hosts/ringo/hardware-configuration.nix b/hosts/ringo/hardware-configuration.nix
index d16bc928..0c6f019f 100644
--- a/hosts/ringo/hardware-configuration.nix
+++ b/hosts/ringo/hardware-configuration.nix
@@ -4,8 +4,6 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [ ];
-
   boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
diff --git a/hosts/surfplace/configuration.nix b/hosts/surfplace/configuration.nix
index a1557124..ed4f54bd 100644
--- a/hosts/surfplace/configuration.nix
+++ b/hosts/surfplace/configuration.nix
@@ -5,13 +5,13 @@
 { inputs, pkgs, builtins, config, lib, ... }:
 
 {
-  imports =
-    [
-      ./hardware-configuration.nix
-    ];
-
   time.timeZone = "Europe/Berlin";
 
+  pub-solar.social.enable = true;
+  hardware.enableRedistributableFirmware = true;
+  pub-solar.graphical.enable = true;
+  pub-solar.sway.enable = true;
+
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
diff --git a/hosts/surfplace/hardware-configuration.nix b/hosts/surfplace/hardware-configuration.nix
index 97ca35f5..7092de24 100644
--- a/hosts/surfplace/hardware-configuration.nix
+++ b/hosts/surfplace/hardware-configuration.nix
@@ -2,6 +2,7 @@
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
 {
+  inputs,
   config,
   lib,
   pkgs,
@@ -9,13 +10,14 @@
   ...
 }: {
   imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
+    #(modulesPath + "/installer/scan/not-detected.nix")
+    #inputs.nixos-hardware.nixosModules.raspberry-pi-4
   ];
 
   boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod"];
   boot.extraModulePackages = [config.boot.kernelPackages.rtl88x2bu];
 
-  microsoft-surface.kernelVersion = "6.5.5";
+  #microsoft-surface.kernelVersion = "6.5.5";
 
   fileSystems."/" = {
     device = "/dev/disk/by-label/root";