diff --git a/flake.nix b/flake.nix
index 4bcfe36..089732e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -128,9 +128,9 @@
               ];
             }
 
-            ./hosts/${device}/hardware.nix
-            ./hosts/${device}/imports.nix
-            ./hosts/${device}/configuration.nix
+            ./nixosConfigurations/${device}/hardware.nix
+            ./nixosConfigurations/${device}/imports.nix
+            ./nixosConfigurations/${device}/configuration.nix
 
             self.nixosModules.lix-is-nix
             self.nixosModules.globalinstalls
@@ -150,7 +150,7 @@
               time.timeZone = "Europe/Berlin";
 
               home-manager.sharedModules = [
-                self.homeManagerModules.adwaita
+                self.homeModules.adwaita
               ];
             }
 
diff --git a/modules/desktop-environment.nix b/modules/desktop-environment.nix
index 1f1efe0..e0334cc 100644
--- a/modules/desktop-environment.nix
+++ b/modules/desktop-environment.nix
@@ -73,10 +73,10 @@
       lm_sensors
 
       # office
-      libreoffice-qt
-      hunspell
-      hunspellDicts.de-de
-      hunspellDicts.en-us-large
+      #libreoffice-qt
+      #hunspell
+      #hunspellDicts.de-de
+      #hunspellDicts.en-us-large
     ];
 
     fonts = {
diff --git a/hosts/forgejo-runner-1/configuration.nix b/nixosConfigurations/forgejo-runner-1/configuration.nix
similarity index 100%
rename from hosts/forgejo-runner-1/configuration.nix
rename to nixosConfigurations/forgejo-runner-1/configuration.nix
diff --git a/hosts/forgejo-runner-1/forgejo-runner.nix b/nixosConfigurations/forgejo-runner-1/forgejo-runner.nix
similarity index 100%
rename from hosts/forgejo-runner-1/forgejo-runner.nix
rename to nixosConfigurations/forgejo-runner-1/forgejo-runner.nix
diff --git a/hosts/forgejo-runner-1/hardware.nix b/nixosConfigurations/forgejo-runner-1/hardware.nix
similarity index 100%
rename from hosts/forgejo-runner-1/hardware.nix
rename to nixosConfigurations/forgejo-runner-1/hardware.nix
diff --git a/hosts/forgejo-runner-1/imports.nix b/nixosConfigurations/forgejo-runner-1/imports.nix
similarity index 100%
rename from hosts/forgejo-runner-1/imports.nix
rename to nixosConfigurations/forgejo-runner-1/imports.nix
diff --git a/hosts/hetzner-vpn2/configuration.nix b/nixosConfigurations/hetzner-vpn2/configuration.nix
similarity index 100%
rename from hosts/hetzner-vpn2/configuration.nix
rename to nixosConfigurations/hetzner-vpn2/configuration.nix
diff --git a/hosts/hetzner-vpn2/hardware.nix b/nixosConfigurations/hetzner-vpn2/hardware.nix
similarity index 100%
rename from hosts/hetzner-vpn2/hardware.nix
rename to nixosConfigurations/hetzner-vpn2/hardware.nix
diff --git a/hosts/hetzner-vpn2/imports.nix b/nixosConfigurations/hetzner-vpn2/imports.nix
similarity index 100%
rename from hosts/hetzner-vpn2/imports.nix
rename to nixosConfigurations/hetzner-vpn2/imports.nix
diff --git a/hosts/hetzner-vpn2/nginx.nix b/nixosConfigurations/hetzner-vpn2/nginx.nix
similarity index 100%
rename from hosts/hetzner-vpn2/nginx.nix
rename to nixosConfigurations/hetzner-vpn2/nginx.nix
diff --git a/hosts/ronja-pc/configuration.nix b/nixosConfigurations/ronja-pc/configuration.nix
similarity index 100%
rename from hosts/ronja-pc/configuration.nix
rename to nixosConfigurations/ronja-pc/configuration.nix
diff --git a/hosts/ronja-pc/hardware.nix b/nixosConfigurations/ronja-pc/hardware.nix
similarity index 100%
rename from hosts/ronja-pc/hardware.nix
rename to nixosConfigurations/ronja-pc/hardware.nix
diff --git a/hosts/ronja-pc/imports.nix b/nixosConfigurations/ronja-pc/imports.nix
similarity index 100%
rename from hosts/ronja-pc/imports.nix
rename to nixosConfigurations/ronja-pc/imports.nix
diff --git a/hosts/vinzenz-lpt2/configuration.nix b/nixosConfigurations/vinzenz-lpt2/configuration.nix
similarity index 100%
rename from hosts/vinzenz-lpt2/configuration.nix
rename to nixosConfigurations/vinzenz-lpt2/configuration.nix
diff --git a/hosts/vinzenz-lpt2/hardware.nix b/nixosConfigurations/vinzenz-lpt2/hardware.nix
similarity index 100%
rename from hosts/vinzenz-lpt2/hardware.nix
rename to nixosConfigurations/vinzenz-lpt2/hardware.nix
diff --git a/hosts/vinzenz-lpt2/imports.nix b/nixosConfigurations/vinzenz-lpt2/imports.nix
similarity index 100%
rename from hosts/vinzenz-lpt2/imports.nix
rename to nixosConfigurations/vinzenz-lpt2/imports.nix
diff --git a/hosts/vinzenz-lpt2/nginx.nix b/nixosConfigurations/vinzenz-lpt2/nginx.nix
similarity index 100%
rename from hosts/vinzenz-lpt2/nginx.nix
rename to nixosConfigurations/vinzenz-lpt2/nginx.nix
diff --git a/hosts/vinzenz-lpt2/zerforschen-plus.nix b/nixosConfigurations/vinzenz-lpt2/zerforschen-plus.nix
similarity index 100%
rename from hosts/vinzenz-lpt2/zerforschen-plus.nix
rename to nixosConfigurations/vinzenz-lpt2/zerforschen-plus.nix
diff --git a/hosts/vinzenz-pc2/configuration.nix b/nixosConfigurations/vinzenz-pc2/configuration.nix
similarity index 100%
rename from hosts/vinzenz-pc2/configuration.nix
rename to nixosConfigurations/vinzenz-pc2/configuration.nix
diff --git a/hosts/vinzenz-pc2/fstab.nix b/nixosConfigurations/vinzenz-pc2/fstab.nix
similarity index 100%
rename from hosts/vinzenz-pc2/fstab.nix
rename to nixosConfigurations/vinzenz-pc2/fstab.nix
diff --git a/hosts/vinzenz-pc2/hardware.nix b/nixosConfigurations/vinzenz-pc2/hardware.nix
similarity index 100%
rename from hosts/vinzenz-pc2/hardware.nix
rename to nixosConfigurations/vinzenz-pc2/hardware.nix
diff --git a/hosts/vinzenz-pc2/hass.nix b/nixosConfigurations/vinzenz-pc2/hass.nix
similarity index 100%
rename from hosts/vinzenz-pc2/hass.nix
rename to nixosConfigurations/vinzenz-pc2/hass.nix
diff --git a/hosts/vinzenz-pc2/imports.nix b/nixosConfigurations/vinzenz-pc2/imports.nix
similarity index 100%
rename from hosts/vinzenz-pc2/imports.nix
rename to nixosConfigurations/vinzenz-pc2/imports.nix
diff --git a/hosts/vinzenz-pc2/vscode-server.nix b/nixosConfigurations/vinzenz-pc2/vscode-server.nix
similarity index 100%
rename from hosts/vinzenz-pc2/vscode-server.nix
rename to nixosConfigurations/vinzenz-pc2/vscode-server.nix