Remove the deUtils namespace

This commit is contained in:
SebastianStork 2025-05-28 10:30:35 +02:00
parent f0df314f21
commit 2ff87c8404
15 changed files with 33 additions and 33 deletions

View file

@ -0,0 +1,13 @@
{
config,
pkgs,
lib,
...
}:
{
options.custom.programs.brightnessctl.enable = lib.mkEnableOption "";
config = lib.mkIf config.custom.programs.brightnessctl.enable {
home.packages = [ pkgs.brightnessctl ];
};
}

View file

@ -5,12 +5,12 @@
... ...
}: }:
{ {
options.custom.deUtils.services.cliphist.enable = lib.mkEnableOption ""; options.custom.services.cliphist.enable = lib.mkEnableOption "";
config = lib.mkIf config.custom.deUtils.services.cliphist.enable { config = lib.mkIf config.custom.services.cliphist.enable {
assertions = [ assertions = [
{ {
assertion = config.custom.deUtils.programs.rofi.enable; assertion = config.custom.programs.rofi.enable;
message = "cliphist requires rofi"; message = "cliphist requires rofi";
} }
]; ];

View file

@ -1,13 +0,0 @@
{
config,
pkgs,
lib,
...
}:
{
options.custom.deUtils.programs.brightnessctl.enable = lib.mkEnableOption "";
config = lib.mkIf config.custom.deUtils.programs.brightnessctl.enable {
home.packages = [ pkgs.brightnessctl ];
};
}

View file

@ -21,7 +21,7 @@
pkgs.grimblast pkgs.grimblast
]; ];
custom.deUtils = { custom = {
services = { services = {
hyprpaper.enable = true; hyprpaper.enable = true;
hypridle.enable = true; hypridle.enable = true;

View file

@ -83,7 +83,7 @@
bindel = SUPER ALT, down, exec, $volume-down bindel = SUPER ALT, down, exec, $volume-down
bindl = SUPER ALT, M, exec, $mute-mic bindl = SUPER ALT, M, exec, $mute-mic
${lib.optionalString config.custom.deUtils.programs.brightnessctl.enable '' ${lib.optionalString config.custom.programs.brightnessctl.enable ''
# Adjust brightness # Adjust brightness
bindel = , XF86MonBrightnessUp, exec, brightnessctl --exponent set +2% bindel = , XF86MonBrightnessUp, exec, brightnessctl --exponent set +2%
bindel = , XF86MonBrightnessDown, exec, brightnessctl --exponent set 2%- bindel = , XF86MonBrightnessDown, exec, brightnessctl --exponent set 2%-

View file

@ -1,8 +1,8 @@
{ config, lib, ... }@moduleArgs: { config, lib, ... }@moduleArgs:
{ {
options.custom.deUtils.services.gammastep.enable = lib.mkEnableOption ""; options.custom.services.gammastep.enable = lib.mkEnableOption "";
config = lib.mkIf config.custom.deUtils.services.gammastep.enable { config = lib.mkIf config.custom.services.gammastep.enable {
assertions = [ assertions = [
{ {
assertion = assertion =

View file

@ -4,21 +4,21 @@
... ...
}: }:
{ {
options.custom.deUtils.services.hypridle.enable = lib.mkEnableOption ""; options.custom.services.hypridle.enable = lib.mkEnableOption "";
config = lib.mkIf config.custom.deUtils.services.hypridle.enable { config = lib.mkIf config.custom.services.hypridle.enable {
services.hypridle = { services.hypridle = {
enable = true; enable = true;
settings = { settings = {
general = { general = {
lock_cmd = lib.mkIf config.custom.deUtils.programs.hyprlock.enable "pidof hyprlock || hyprlock"; lock_cmd = lib.mkIf config.custom.programs.hyprlock.enable "pidof hyprlock || hyprlock";
before_sleep_cmd = "loginctl lock-session"; before_sleep_cmd = "loginctl lock-session";
after_sleep_cmd = "hyprctl dispatch dpms on"; after_sleep_cmd = "hyprctl dispatch dpms on";
}; };
listener = [ listener = [
(lib.mkIf config.custom.deUtils.programs.brightnessctl.enable { (lib.mkIf config.custom.programs.brightnessctl.enable {
timeout = 5 * 60; timeout = 5 * 60;
on-timeout = "brightnessctl --save --exponent set 10%"; on-timeout = "brightnessctl --save --exponent set 10%";
on-resume = "brightnessctl --restore"; on-resume = "brightnessctl --restore";

View file

@ -4,10 +4,10 @@
... ...
}@moduleArgs: }@moduleArgs:
let let
cfg = config.custom.deUtils.programs.hyprlock; cfg = config.custom.programs.hyprlock;
in in
{ {
options.custom.deUtils.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 = moduleArgs.osConfig.services.fprintd.enable or false;

View file

@ -1,8 +1,8 @@
{ config, lib, ... }: { config, lib, ... }:
{ {
options.custom.deUtils.services.hyprpaper.enable = lib.mkEnableOption ""; options.custom.services.hyprpaper.enable = lib.mkEnableOption "";
config = lib.mkIf config.custom.deUtils.services.hyprpaper.enable { config = lib.mkIf config.custom.services.hyprpaper.enable {
services.hyprpaper = { services.hyprpaper = {
enable = true; enable = true;
settings = { settings = {

View file

@ -5,9 +5,9 @@
... ...
}: }:
{ {
options.custom.deUtils.programs.rofi.enable = lib.mkEnableOption ""; options.custom.programs.rofi.enable = lib.mkEnableOption "";
config = lib.mkIf config.custom.deUtils.programs.rofi.enable { config = lib.mkIf config.custom.programs.rofi.enable {
home.packages = [ pkgs.rofi-wayland ]; home.packages = [ pkgs.rofi-wayland ];
xdg.configFile."rofi/config.rasi".source = xdg.configFile."rofi/config.rasi".source =

View file

@ -1,8 +1,8 @@
{ config, lib, ... }: { config, lib, ... }:
{ {
options.custom.deUtils.services.waybar.enable = lib.mkEnableOption ""; options.custom.services.waybar.enable = lib.mkEnableOption "";
config = lib.mkIf config.custom.deUtils.services.waybar.enable { config = lib.mkIf config.custom.services.waybar.enable {
programs.waybar = { programs.waybar = {
enable = true; enable = true;
systemd.enable = true; systemd.enable = true;

View file

@ -5,7 +5,7 @@ _: {
custom = { custom = {
theme = "light"; theme = "light";
deUtils.programs.brightnessctl.enable = true; programs.brightnessctl.enable = true;
}; };
wayland.windowManager.hyprland.settings.monitor = [ wayland.windowManager.hyprland.settings.monitor = [