diff --git a/flake.nix b/flake.nix
index fca4c17..7ffd40a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,27 +53,21 @@
     nixosConfigurations.lillypc = nixpkgs.lib.nixosSystem {
       inherit system;
       specialArgs = {
-        inherit inputs;
-        inherit host;
-        inherit username;
-        inherit prettyUsername;
+        inherit inputs host username prettyUsername;
       };
       modules = [
         ./configuration.nix
         nix-flatpak.nixosModules.nix-flatpak
         catppuccin.nixosModules.catppuccin
         home-manager.nixosModules.home-manager
-        {
+        ({ config, ... }:{
           home-manager = {
             useUserPackages = true;
             useGlobalPkgs = false;
             backupFileExtension = "backup";
             extraSpecialArgs = {
-              inherit inputs;
-              inherit host;
-              inherit username;
-              inherit prettyUsername;
-              inherit email;
+              inherit inputs host username prettyUsername email;
+              nixosConfig = config;
             };
             users.${username} = {
               imports = [
@@ -87,7 +81,7 @@
               };
             };
           };
-        }
+        })
       ];
     };
   };
diff --git a/home/default.nix b/home/default.nix
index cefb09e..18ed1e6 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -15,6 +15,6 @@ let
     b.map (f: ./${f});
 in
 {
-  imports = module_files ++ [./hyprland];
+  imports = module_files;
   nixpkgs.config.allowUnfree = true;
 }
\ No newline at end of file
diff --git a/home/easyeffects.nix b/home/easyeffects.nix
deleted file mode 100644
index 86c4100..0000000
--- a/home/easyeffects.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  services.easyeffects = {
-    enable = true;
-  };
-}
\ No newline at end of file
diff --git a/home/gnome-keyring.nix b/home/general.nix
similarity index 72%
rename from home/gnome-keyring.nix
rename to home/general.nix
index 44c0513..5f6c8d3 100644
--- a/home/gnome-keyring.nix
+++ b/home/general.nix
@@ -1,5 +1,8 @@
 { pkgs, ...}:
 {
   services.gnome-keyring.enable = true;
+  services.easyeffects = {
+    enable = true;
+  };
   home.packages = [ pkgs.gcr ]; # Provides org.gnome.keyring.SystemPrompter
 }
diff --git a/home/hyprland.nix b/home/hyprland.nix
index 005087b..f11589a 100644
--- a/home/hyprland.nix
+++ b/home/hyprland.nix
@@ -1,10 +1,10 @@
-{ inputs, pkgs, lib, config, ... }:
+{ inputs, pkgs, lib, nixosConfig, ... }:
 let
-  cfg = config.my.desktop.hyprland;
+  cfg = nixosConfig.my.desktop;
 in
 {
-  programs.kitty.enable = config.my.desktop.enable; # required for the default Hyprland config
-  wayland.windowManager.hyprland = lib.mkIf cfg.enable {
+  programs.kitty.enable = cfg.enable; # required for the default Hyprland config
+  wayland.windowManager.hyprland = lib.mkIf cfg.hyprland.enable {
     enable = true;
     # set the flake package
     package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
diff --git a/home/hyprland/execs.nix b/home/hyprland/execs.nix
index f39eec5..9ecaed1 100644
--- a/home/hyprland/execs.nix
+++ b/home/hyprland/execs.nix
@@ -5,7 +5,7 @@
         "sleep 2; uwsm-app -- vesktop-portable"
         # todo openrgb
         "sleep 5; uwsm-app -- spotify"
-        "uwsm-app -- dms run"
+        # "uwsm-app -- dms run"
         "sleep 5; uwsm-app -- Artemis.UI.Linux --minimized"
         "sleep 10; bash /home/lilly/Scripts/rgb-on.sh"
         # todo sunshine
diff --git a/hosts/lillypc/gitwatch.nix b/hosts/lillypc/gitwatch.nix
new file mode 100644
index 0000000..7ad9035
--- /dev/null
+++ b/hosts/lillypc/gitwatch.nix
@@ -0,0 +1,85 @@
+# Auto-generated by compose2nix.
+
+{ pkgs, lib, ... }:
+
+{
+  # Runtime
+  virtualisation.docker = {
+    enable = true;
+    autoPrune.enable = true;
+  };
+  virtualisation.oci-containers.backend = "docker";
+
+  # Containers
+  virtualisation.oci-containers.containers."gitwatch-LillyOS" = {
+    image = "ghcr.io/gitwatch/gitwatch:latest";
+    environment = {
+      "COMMIT_MSG" = "Auto-commit: %d";
+      "COMMIT_ON_START" = "false";
+      "DATE_FMT" = "+%Y-%m-%d %H:%M:%S";
+      "EXCLUDE_PATTERN" = "";
+      "GIT_BRANCH" = "main";
+      "GIT_REMOTE" = "origin";
+      "GIT_WATCH_DIR" = "/app/LillyOS";
+      "PULL_BEFORE_PUSH" = "true";
+      "SKIP_IF_MERGING" = "false";
+      "SLEEP_TIME" = "10";
+      "VERBOSE" = "false";
+    };
+    volumes = [
+      "${/home/lilly/.config/git/config}:/root/.gitconfig:ro"
+      "/home/lilly/.ssh/id_ed25519:/root/.ssh/id_ed25519:ro"
+      "/home/lilly/LillyOS:/app/LillyOS:rw"
+    ];
+    log-driver = "journald";
+    extraOptions = [
+      "--network-alias=gitwatch"
+      "--network=gitwatch_default"
+    ];
+  };
+  systemd.services."docker-gitwatch-LillyOS" = {
+    serviceConfig = {
+      Restart = lib.mkOverride 90 "always";
+      RestartMaxDelaySec = lib.mkOverride 90 "1m";
+      RestartSec = lib.mkOverride 90 "100ms";
+      RestartSteps = lib.mkOverride 90 9;
+    };
+    after = [
+      "docker-network-gitwatch_default.service"
+    ];
+    requires = [
+      "docker-network-gitwatch_default.service"
+    ];
+    partOf = [
+      "docker-compose-gitwatch-root.target"
+    ];
+    wantedBy = [
+      "docker-compose-gitwatch-root.target"
+    ];
+  };
+
+  # Networks
+  systemd.services."docker-network-gitwatch_default" = {
+    path = [ pkgs.docker ];
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+      ExecStop = "docker network rm -f gitwatch_default";
+    };
+    script = ''
+      docker network inspect gitwatch_default || docker network create gitwatch_default
+    '';
+    partOf = [ "docker-compose-gitwatch-root.target" ];
+    wantedBy = [ "docker-compose-gitwatch-root.target" ];
+  };
+
+  # Root service
+  # When started, this will automatically create all resources and start
+  # the containers. When stopped, this will teardown all resources.
+  systemd.targets."docker-compose-gitwatch-root" = {
+    unitConfig = {
+      Description = "Root target generated by compose2nix.";
+    };
+    wantedBy = [ "multi-user.target" ];
+  };
+}
\ No newline at end of file
diff --git a/modules/desktop/dms.nix b/modules/desktop/dms.nix
index c898373..f7c3ba0 100644
--- a/modules/desktop/dms.nix
+++ b/modules/desktop/dms.nix
@@ -11,7 +11,7 @@ in
     enable = true;
 
     systemd = {
-      enable = false;             # Systemd service for auto-start
+      enable = true;             # Systemd service for auto-start
       restartIfChanged = false;   # Auto-restart dms.service when dankMaterialShell changes
     };