diff --git a/configs/default.nix b/configs/default.nix
index 6c392c8..b3c2945 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -91,13 +91,6 @@ in {
       boot.loader.timeout = 1;
       boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
     }
-    {
-      time.timeZone = "Europe/Berlin";
-      location = {
-        latitude = 52.517;
-        longitude = 13.3872;
-      };
-    }
     {
       home-manager.users.me = {
         programs.zathura = {
@@ -305,14 +298,13 @@ in {
     ./neovim.nix
     ./newsboat.nix
     ./flameshot-once.nix
-    ./nixpkgs-unstable.nix
     ./packages
     ./printing.nix
     ./wallpaper.nix
     ./redshift.nix
     ./retiolum.nix
     ./rofi.nix
-    ./spotify.nix
+    ./spacetime.nix
     ./ssh.nix
     ./sudo.nix
     ./sxiv.nix
diff --git a/configs/spacetime.nix b/configs/spacetime.nix
new file mode 100644
index 0000000..37c8daf
--- /dev/null
+++ b/configs/spacetime.nix
@@ -0,0 +1,7 @@
+{
+  time.timeZone = "Europe/Berlin";
+  location = {
+    latitude = 52.517;
+    longitude = 13.3872;
+  };
+}
diff --git a/systems/toum/configuration.nix b/systems/toum/configuration.nix
index 720f211..b2dbb29 100644
--- a/systems/toum/configuration.nix
+++ b/systems/toum/configuration.nix
@@ -10,8 +10,8 @@ in {
     ./hass
     ./telegram-bots
     <niveum/configs/distrobump.nix>
-    <niveum/configs/nixpkgs-unstable.nix>
     <niveum/configs/nextcloud.nix>
+    <niveum/configs/spacetime.nix>
     <niveum/configs/save-space.nix>
     <niveum/configs/tmux.nix>
     <niveum/configs/version.nix>
diff --git a/systems/toum/hass/default.nix b/systems/toum/hass/default.nix
index 60362f5..924158b 100644
--- a/systems/toum/hass/default.nix
+++ b/systems/toum/hass/default.nix
@@ -17,8 +17,8 @@ in
     config = {
       homeassistant = {
         name = "Toum";
-        latitude = 52.461;
-        longitude = 13.378;
+        latitude = config.location.latitude;
+        longitude = config.location.longitude;
         elevation = 90; # TODO find out how high I live
         unit_system = "metric";
         time_zone = config.time.timeZone;