diff --git a/flake.lock b/flake.lock
index 935044a..8026258 100644
--- a/flake.lock
+++ b/flake.lock
@@ -201,11 +201,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700847865,
-        "narHash": "sha256-uWaOIemGl9LF813MW0AEgCBpKwFo2t1Wv3BZc6e5Frw=",
+        "lastModified": 1700900274,
+        "narHash": "sha256-KWoKDP5I1viHR4bG3ENnJ7H1DD16tXWH4ROvS0IfXw8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8cedd63eede4c22deb192f1721dd67e7460e1ebe",
+        "rev": "a462e7315deaa8194b0821f726709bb7e51a850c",
         "type": "github"
       },
       "original": {
@@ -250,11 +250,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700363379,
-        "narHash": "sha256-fBEVPFwSZ6AmBE1s1oT7E9WVuqRghruxTnSQ8UUlMkw=",
+        "lastModified": 1700968077,
+        "narHash": "sha256-Lax+2g7G3Fe+ckMrHLYTl+97unbmNDmN1qS9MLBkxr4=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "27920146e671a0d565aaa7452907383be14d8d82",
+        "rev": "bd3aec0ecb0fdde863a7ed2c6caa220c47e22c07",
         "type": "github"
       },
       "original": {
@@ -280,11 +280,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1700612854,
-        "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=",
+        "lastModified": 1700794826,
+        "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614",
+        "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
         "type": "github"
       },
       "original": {
@@ -436,11 +436,11 @@
     },
     "private": {
       "locked": {
-        "lastModified": 1700250258,
-        "narHash": "sha256-5RE41KPIh85LRSwWP0CHBv2L5Gl1Qnl42268JE9fFWI=",
+        "lastModified": 1700983091,
+        "narHash": "sha256-qQt4Je2KsLVKAjZ2A6I/WAFf27d3iLORmf7/h47huJ0=",
         "ref": "unified",
-        "rev": "061bc7e341df4629220e215c6caad77684c18513",
-        "revCount": 38,
+        "rev": "cea5114a42b231b8e3d1dd6158ad6f1f98756135",
+        "revCount": 39,
         "type": "git",
         "url": "ssh://gitea@git.mildlyfunctional.gay/artemist/nixos-config-private"
       },
diff --git a/flake.nix b/flake.nix
index c05975d..3561343 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,7 +41,6 @@
         nixpkgs.lib.nixosSystem (nixpkgs.lib.recursiveUpdate conf rec {
           specialArgs = { inherit inputs; };
           modules = [
-            private.nixosModules.base
             home-manager.nixosModules.home-manager
             { home-manager.extraSpecialArgs = specialArgs; }
           ] ++ (conf.modules or [ ]);
@@ -49,7 +48,7 @@
     in {
       nixosConfigurations.starlight = makeSystem {
         system = "x86_64-linux";
-        modules = [ ./system/starlight private.nixosModules.starlight ];
+        modules = [ ./system/starlight ];
       };
 
       nixosConfigurations.rainbowdash = makeSystem {
diff --git a/sets/base.nix b/sets/base.nix
index 6c7f86e..7a83c0e 100644
--- a/sets/base.nix
+++ b/sets/base.nix
@@ -1,6 +1,8 @@
 { config, pkgs, lib, inputs, ... }:
 
 {
+  imports = [ inputs.private.nixosModules.base ];
+
   systemd.tmpfiles.rules = lib.mapAttrsToList
     (key: value: "L+ /etc/channels/${key} - - - - ${value.outPath}") inputs;
 
@@ -13,7 +15,7 @@
     '';
     gc = {
       automatic = true;
-      dates = "00:00";
+      dates = "8:00";
       options = "--delete-older-than 14d";
     };
     settings.trusted-users = [ "artemis" ];
@@ -25,15 +27,9 @@
   };
 
   nixpkgs.config.allowUnfree = true;
-
   time.timeZone = "Etc/UTC";
-
   environment.shellAliases.cp = "cp --reflink=auto --sparse=always";
-
-  services.resolved.extraConfig = "MulticastDNS=true";
-
   networking.firewall.enable = false;
-
   programs.fish.enable = true;
 
   users = {
diff --git a/sets/sway.nix b/sets/sway.nix
index 91b4ef0..0a910c8 100644
--- a/sets/sway.nix
+++ b/sets/sway.nix
@@ -1,5 +1,5 @@
-{ config, pkgs, ... }: {
-  imports = [ ./fonts.nix ];
+{ pkgs, inputs, ... }: {
+  imports = [ ./fonts.nix inputs.private.nixosModules.sway ];
   security.polkit.enable = true;
   services = {
     accounts-daemon.enable = true;
diff --git a/sets/workstation.nix b/sets/workstation.nix
index fe2a84b..0df12c5 100644
--- a/sets/workstation.nix
+++ b/sets/workstation.nix
@@ -11,6 +11,7 @@
     ./swap.nix
     ./sway.nix
     inputs.nixvim.nixosModules.nixvim
+    inputs.private.nixosModules.taskwarrior
   ];
 
   i18n.defaultLocale = "de_DE.UTF-8";
diff --git a/system/starlight/default.nix b/system/starlight/default.nix
index d96c2ee..6649cfb 100644
--- a/system/starlight/default.nix
+++ b/system/starlight/default.nix
@@ -18,6 +18,7 @@
     ../../sets/workstation.nix
     inputs.nixos-hardware.nixosModules.common-cpu-amd
     inputs.nixos-hardware.nixosModules.common-gpu-amd
+    inputs.private.nixosModules.starlight
   ];
 
   # Network