modules/home: Remove standalone hm compatibility layer

This commit is contained in:
SebastianStork 2026-02-06 15:09:08 +01:00
parent e0c8bb401b
commit d54e079db8
Signed by: SebastianStork
SSH key fingerprint: SHA256:iEM011ogNMG1q8+U500adGu/9rpPuZ2KnFtbdLeqTiI
5 changed files with 22 additions and 22 deletions

View file

@ -1,12 +1,13 @@
{
config,
osConfig,
pkgs,
lib,
...
}@moduleArgs:
}:
{
options.custom.de.hyprland.enable = lib.mkEnableOption "" // {
default = moduleArgs.osConfig.custom.de.hyprland.enable or false;
default = osConfig.custom.de.hyprland.enable;
};
config = lib.mkIf config.custom.de.hyprland.enable {

View file

@ -1,9 +1,10 @@
{
config,
osConfig,
pkgs-unstable,
lib,
...
}@moduleArgs:
}:
let
cfg = config.custom.programs.hyprlock;
in
@ -11,7 +12,7 @@ in
options.custom.programs.hyprlock = {
enable = lib.mkEnableOption "";
fprintAuth = lib.mkEnableOption "" // {
default = moduleArgs.osConfig.services.fprintd.enable or false;
default = osConfig.services.fprintd.enable;
};
};

View file

@ -1,22 +1,16 @@
{
config,
osConfig,
self,
lib,
...
}@moduleArgs:
let
cfg = config.custom.programs.ssh;
in
}:
{
options.custom.programs.ssh = {
enable = lib.mkEnableOption "";
hostName = lib.mkOption {
type = lib.types.nonEmptyStr;
default = moduleArgs.osConfig.networking.hostName or "";
};
publicKeyPath = lib.mkOption {
type = lib.types.path;
default = "${self}/users/${config.home.username}/@${cfg.hostName}/keys/ssh.pub";
default = "${self}/users/${config.home.username}/@${osConfig.networking.hostName}/keys/ssh.pub";
};
};

View file

@ -1,7 +1,12 @@
{ config, lib, ... }@moduleArgs:
{
config,
osConfig,
lib,
...
}:
{
options.custom.services.syncthing.enable = lib.mkEnableOption "" // {
default = moduleArgs.osConfig.custom.services.syncthing.enable or false;
default = osConfig.custom.services.syncthing.enable;
};
config = lib.mkIf config.custom.services.syncthing.enable {

View file

@ -1,10 +1,11 @@
{
config,
osConfig,
inputs,
self,
lib,
...
}@moduleArgs:
}:
let
cfg = config.custom.sops;
in
@ -13,18 +14,16 @@ in
options.custom.sops = {
enable = lib.mkEnableOption "";
hostName = lib.mkOption {
type = lib.types.nonEmptyStr;
default = moduleArgs.osConfig.networking.hostName or "";
};
agePublicKey = lib.mkOption {
type = lib.types.nonEmptyStr;
default =
"${self}/users/${config.home.username}/@${cfg.hostName}/keys/age.pub" |> lib.readFile |> lib.trim;
"${self}/users/${config.home.username}/@${osConfig.networking.hostName}/keys/age.pub"
|> lib.readFile
|> lib.trim;
};
secretsFile = lib.mkOption {
type = lib.types.path;
default = "${self}/users/${config.home.username}/@${cfg.hostName}/secrets.json";
default = "${self}/users/${config.home.username}/@${osConfig.networking.hostName}/secrets.json";
};
secrets = lib.mkOption {
type = lib.types.anything;