Rewrote systemwide system, fixed broken build

user-modules/desktop/custom/default.nix

@@ -12,7 +12,6 @@ in
 {
   imports = [
     # Import desktop environment modules
-    ./background/glpaper/default.nix
     ./bar/waybar.nix
     ./lock-screen/waylock.nix
     ./window-manager/i3.nix
@@ -83,13 +82,14 @@ in
       }
       (
         # TODO: Move to dedicated module within desktop or maybe theming?
-        if cfg.decorations == null then
-          { }
-        else
-          {
-            csd = { };
-            ssd = { };
-          }
-          ."${cfg.decorations}"
+        # if cfg.decorations == null then
+        #   { }
+        # else
+        #   {
+        #     csd = { };
+        #     ssd = { };
+        #   }
+        #   ."${cfg.decorations}"
+        { }
       );
 }

user-modules/desktop/custom/lock-screen/waylock.nix

@@ -16,10 +16,5 @@ in
 
   config = mkIf cfg.enable {
     home.packages = (with pkgs; [ waylock ]);
-
-    # Systemwide configuration
-    systemwide = {
-      security.pam.services.waylock = { };
-    };
   };
 }

user-modules/desktop/custom/window-manager/i3.nix

@@ -23,23 +23,5 @@ in
     xsession.windowManager.i3 = {
       enable = true;
     };
-
-    # Systemwide configuration
-    systemwide = {
-      services.xserver = {
-        layout = "us";
-        xkbVariant = "";
-        enable = true;
-        windowManager.i3.enable = true;
-        desktopManager = {
-          xterm.enable = true;
-          xfce = {
-            enable = true;
-            # noDesktop = false;
-            # enableXfwm = false;
-          };
-        };
-      };
-    };
   };
 }

user-modules/desktop/custom/window-manager/river.nix

@@ -36,11 +36,6 @@ in
       river
     '';
 
-    # Systemwide configuration
-    systemwide = {
-      programs.river.enable = true;
-    };
-
     # TODO: Fix this
     # modules.desktop.reloadScript = ''
     #   ${pkgs.river}/bin/riverctl background-color 0x${config.theming.colors.bg}
@@ -118,7 +113,8 @@ in
           spawn = [
             "\"${layout} ${layoutOptions}\""
             "waybar" # TODO: Decouple
-            "\"glpaper eDP-1 ${toString config.modules.glpaper.shader}\""
+            # TODO: Generic background options
+            # "\"glpaper eDP-1 ${toString config.modules.glpaper.shader}\""
             "udiskie"
           ];
           map = (