Reorganized desktop, simplified systemwide setup

user-modules/systemwide/default.nix

@@ -1,13 +1,10 @@
-{ ... }:
+{ lib, ... }:
 
+with lib;
 {
-  imports = [
-    # Import systemwide configuration files.
-    ./docker.nix
-    ./i3.nix
-    ./keyring.nix
-    ./river.nix
-    ./steam.nix
-    ./waylock.nix
-  ];
+  options.systemwide = mkOption {
+    type = types.attrsOf types.anything;
+    default = { };
+    description = "Systemwide configuration required for user-specific settings.";
+  };
 }

user-modules/systemwide/docker.nix

@@ -1,17 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  enabled = any (user: user.modules.docker.enable) (attrValues config.home-manager.users);
-in
-{
-  config = mkIf enabled {
-    virtualisation.docker.enable = true;
-    machine.sudo-groups = [ "docker" ];
-  };
-}

user-modules/systemwide/i3.nix

@@ -1,30 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  enabled = any (user: user.modules.i3.enable) (attrValues config.home-manager.users);
-in
-{
-  config = mkIf enabled {
-    modules.tuigreet.enable = mkForce false;
-    services.xserver = {
-      layout = "us";
-      xkbVariant = "";
-      enable = true;
-      windowManager.i3.enable = true;
-      desktopManager = {
-        xterm.enable = true;
-        xfce = {
-          enable = true;
-          # noDesktop = false;
-          # enableXfwm = false;
-        };
-      };
-    };
-  };
-}

user-modules/systemwide/keyring.nix

@@ -1,18 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  enabled = any (user: user.modules.keyring.enable) (attrValues config.home-manager.users);
-in
-{
-  config = mkIf enabled {
-    services.gnome.gnome-keyring = {
-      enable = true;
-    };
-  };
-}

user-modules/systemwide/river.nix

@@ -1,14 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  enabled = any (user: user.modules.river.enable) (attrValues config.home-manager.users);
-in
-{
-  config = mkIf enabled { programs.river.enable = true; };
-}

user-modules/systemwide/steam.nix

@@ -1,29 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  enabled = any (user: user.modules.steam.enable) (attrValues config.home-manager.users);
-in
-{
-  config = mkIf enabled {
-    modules.unfree.allowedPackages = [
-      "steam"
-      "steam-original"
-      "steam-unwrapped"
-    ];
-
-    programs.steam.enable = true;
-
-    # Make steam create desktop entries in a subfolder
-    programs.steam.package = pkgs.steam.override {
-      extraBwrapArgs = [
-        "--bind $HOME/.local/share/applications/Steam $HOME/.local/share/applications"
-      ];
-    };
-  };
-}

user-modules/systemwide/waylock.nix

@@ -1,14 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  enabled = any (user: user.modules.waylock.enable) (attrValues config.home-manager.users);
-in
-{
-  config = mkIf enabled { security.pam.services.waylock = { }; };
-}