obliterate home-manager, rename some elements

graphical/shell.nix

@@ -3,13 +3,11 @@
   lib,
   inputs,
   mainUser,
-  config,
   getPkgs,
   ...
 }:
 let
   inherit (lib) getExe getExe';
-  inherit (config) rice;
 in
 {
   # quickshell stuff
@@ -25,14 +23,20 @@ in
       })
     ];
 
-  hm.systemd.user.services.quickshell = {
-    Unit.PartOf = [ "graphical-session.target" ];
-    Unit.After = [
-      "graphical-session.target"
-      "niri.service"
-    ];
-    Install.WantedBy = [ "graphical-session.target" ];
-    Service = {
+  systemd.user.services.quickshell = {
+    unitConfig = {
+      PartOf = [
+
+        "graphical-session.target"
+        "sysinit-reactivation.target"
+      ];
+      After = [
+        "graphical-session.target"
+        "niri.service"
+      ];
+    };
+    wantedBy = [ "graphical-session.target" ];
+    serviceConfig = {
       ExecStart = "${getExe' (inputs.quickshell.packages.${pkgs.system}.default.override {
         withHyprland = false;
         withI3 = false;
@@ -40,7 +44,7 @@ in
     };
   };
 
-  hm.quickServices = {
+  quick.services = {
     "swaync" = "${getExe pkgs.swaynotificationcenter}";
     "swayidle" =
       let
@@ -54,23 +58,9 @@ in
       '';
   };
 
-  hm.systemd.user.targets.tray = {
-    Unit = {
-      Description = "Home Manager System Tray";
-      Requires = [ "graphical-session.target" ];
-    };
-  };
-
-  imports = [ inputs.arbys.nixosModules.arbys ];
-  environment = {
-    arbys = {
-      enable = true;
-      clobber = true;
-    };
-    files."/home/${mainUser}/.config/quickshell" = {
-      source = "/home/${mainUser}/.nix/graphical/shell/quickshell";
-      uid = 1000;
-      gid = 100;
-    };
+  environment.files."/home/${mainUser}/.config/quickshell" = {
+    source = "/home/${mainUser}/.nix/graphical/desktop/quickshell";
+    uid = 1000;
+    gid = 100;
   };
 }