SebastianStork/nixos-config
1
0
Fork 0
mirror of https://github.com/SebastianStork/nixos-config.git synced 2026-03-22 20:09:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

modules/home: Remove standalone hm compatibility layer

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

5
modules/home/de/hyprland/default.nix
View file

@ -1,12 +1,13 @@
{ {
config, config,
osConfig,
pkgs, pkgs,
lib, lib,
... ...
}@moduleArgs: }:
{ {
options.custom.de.hyprland.enable = lib.mkEnableOption "" // { 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 { config = lib.mkIf config.custom.de.hyprland.enable {

5
modules/home/programs/hyprlock.nix
View file

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

12
modules/home/programs/ssh.nix
View file

@ -1,22 +1,16 @@
{ {
config, config,
osConfig,
self, self,
lib, lib,
... ...
}@moduleArgs: }:
let
cfg = config.custom.programs.ssh;
in
{ {
options.custom.programs.ssh = { options.custom.programs.ssh = {
enable = lib.mkEnableOption ""; enable = lib.mkEnableOption "";
hostName = lib.mkOption {
type = lib.types.nonEmptyStr;
default = moduleArgs.osConfig.networking.hostName or "";
};
publicKeyPath = lib.mkOption { publicKeyPath = lib.mkOption {
type = lib.types.path; 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";
}; };
}; };

9
modules/home/services/syncthing.nix
View file

@ -1,7 +1,12 @@
{ config, lib, ... }@moduleArgs: {
config,
osConfig,
lib,
...
}:
{ {
options.custom.services.syncthing.enable = lib.mkEnableOption "" // { 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 { config = lib.mkIf config.custom.services.syncthing.enable {

13
modules/home/sops.nix
View file

@ -1,10 +1,11 @@
{ {
config, config,
osConfig,
inputs, inputs,
self, self,
lib, lib,
... ...
}@moduleArgs: }:
let let
cfg = config.custom.sops; cfg = config.custom.sops;
in in
@ -13,18 +14,16 @@ in
options.custom.sops = { options.custom.sops = {
enable = lib.mkEnableOption ""; enable = lib.mkEnableOption "";
hostName = lib.mkOption {
type = lib.types.nonEmptyStr;
default = moduleArgs.osConfig.networking.hostName or "";
};
agePublicKey = lib.mkOption { agePublicKey = lib.mkOption {
type = lib.types.nonEmptyStr; type = lib.types.nonEmptyStr;
default = 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 { secretsFile = lib.mkOption {
type = lib.types.path; 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 { secrets = lib.mkOption {
type = lib.types.anything; type = lib.types.anything;