modules: remove usrEnv

modules/services/kmscon.nix

@@ -1,25 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (lib) mkIf;
-  cfg = config.modules.usrEnv.services.kmscon;
-in {
-  services.kmscon = mkIf cfg.enable {
-    enable = false;
-    hwRender = true;
-    fonts = [
-      {
-        name = "Iosevka";
-        package = pkgs.iosevka;
-      }
-    ];
-    extraOptions = "--term xterm-256color";
-    extraConfig = ''
-      font-size=18
-      xkb-layout=${config.console.keyMap}
-    '';
-  };
-}

modules/services/locate.nix

@@ -4,9 +4,11 @@
   pkgs,
   ...
 }: let
-  cfg = config.modules.usrEnv.services.locate;
-  inherit (lib) mkIf;
+  cfg = config.modules.services.locate;
+  inherit (lib.modules) mkIf;
+  inherit (lib.options) mkEnableOption;
 in {
+  options.modules.services.locate.enable = mkEnableOption "Locate service";
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [plocate];
     services.locate = {

modules/services/module.nix

@@ -7,6 +7,5 @@ _: {
     ./mako.nix
     ./mpd.nix
     ./firewall.nix
-    ./kmscon.nix
   ];
 }

modules/services/mpd.nix

@@ -4,12 +4,28 @@
   pkgs,
   ...
 }: let
-  cfg = config.modules.usrEnv.services.media.mpd;
-  inherit (config.modules.other.system) username;
-  inherit (lib) mkIf;
+  cfg = config.modules.services.media.mpd;
+  inherit (config.meta.mainUser) username;
+  inherit (lib.modules) mkIf;
+  inherit (lib.types) str;
+  inherit (lib.options) mkOption mkEnableOption;
 in {
+  options.modules.services = {
+    media = {
+      mpd = {
+        enable = mkEnableOption "mpd service";
+        musicDirectory = mkOption {
+          description = "music directory for mpd";
+          type = str;
+          default = "/home/${username}/cloud/media/Music";
+        };
+      };
+    };
+  };
   config = mkIf cfg.enable {
+    # command line interface to mpd
     environment.systemPackages = [pkgs.mpc];
+
     systemd.services.mpd.environment = {
       # https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/609
       XDG_RUNTIME_DIR = "/run/user/1000";

modules/services/tuigreet.nix

@@ -1,26 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (lib) mkIf getExe;
-  cfg = config.modules.usrEnv.services.greetd;
-in {
-  services.greetd = mkIf cfg.enable {
-    enable = true;
-    restart = true;
-    vt = 2;
-    settings = {
-      default_session = {
-        command = ''
-          ${getExe pkgs.greetd.tuigreet} \
-            -c \"Hyprland\" \
-            -r
-            -t --time-format "DD.MM.YYYY"
-            --asteriks
-        '';
-      };
-    };
-  };
-}