Move DE utility modules to deUtils namespace

This commit is contained in:
SebastianStork 2025-03-08 20:52:53 +01:00
parent 7e0677ce7d
commit 84be6ec469
19 changed files with 29 additions and 29 deletions

View file

@ -19,7 +19,7 @@
pkgs.grimblast
];
myConfig.de = {
myConfig.deUtils = {
rofi.enable = true;
hyprpaper.enable = true;
hyprlock.enable = true;

View file

@ -36,13 +36,13 @@
dark = "rgb(ffffff)";
light = "rgb(000000)";
}
.${config.myConfig.de.theme};
.${config.myConfig.theme};
"col.inactive_border" =
{
dark = "rgba(ffffff00)";
light = "rgba(ffffff00)";
}
.${config.myConfig.de.theme};
.${config.myConfig.theme};
layout = "master";
};

View file

@ -5,9 +5,9 @@
...
}:
{
options.myConfig.de.cliphist.enable = lib.mkEnableOption "";
options.myConfig.deUtils.cliphist.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.de.cliphist.enable {
config = lib.mkIf config.myConfig.deUtils.cliphist.enable {
services.cliphist = {
enable = true;
allowImages = false;

View file

@ -1,8 +1,8 @@
{ config, lib, ... }:
{
options.myConfig.de.gammastep.enable = lib.mkEnableOption "";
options.myConfig.deUtils.gammastep.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.de.gammastep.enable {
config = lib.mkIf config.myConfig.deUtils.gammastep.enable {
services.gammastep = {
enable = true;
provider = "geoclue2";

View file

@ -5,9 +5,9 @@
...
}:
{
options.myConfig.de.hypridle.enable = lib.mkEnableOption "";
options.myConfig.deUtils.hypridle.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.de.hypridle.enable {
config = lib.mkIf config.myConfig.deUtils.hypridle.enable {
home.packages = [ pkgs.brightnessctl ];
services.hypridle = {

View file

@ -5,10 +5,10 @@
...
}@moduleArgs:
let
cfg = config.myConfig.de.hyprlock;
cfg = config.myConfig.deUtils.hyprlock;
in
{
options.myConfig.de.hyprlock = {
options.myConfig.deUtils.hyprlock = {
enable = lib.mkEnableOption "";
fprintAuth = lib.mkEnableOption "" // {
default = moduleArgs.osConfig.services.fprintd.enable or false;

View file

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

View file

@ -5,9 +5,9 @@
...
}:
{
options.myConfig.de.rofi.enable = lib.mkEnableOption "";
options.myConfig.deUtils.rofi.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.de.rofi.enable {
config = lib.mkIf config.myConfig.deUtils.rofi.enable {
home.packages = [ pkgs.rofi-wayland ];
xdg.configFile."rofi/config.rasi".source =
@ -17,7 +17,7 @@
dark = ./dark-theme.rasi;
light = ./light-theme.rasi;
}
.${config.myConfig.de.theme};
.${config.myConfig.theme};
in
pkgs.concatText "rofi-config" [
./config.rasi

View file

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

View file

@ -5,9 +5,9 @@
...
}:
{
options.myConfig.de.wluma.enable = lib.mkEnableOption "";
options.myConfig.deUtils.wluma.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.de.wluma.enable {
config = lib.mkIf config.myConfig.deUtils.wluma.enable {
home.packages = [ pkgs.wluma ];
xdg.configFile."wluma/config.toml".source = (pkgs.formats.toml { }).generate "wluma-config" {

View file

@ -18,7 +18,7 @@
dark = "default";
light = "GitHub_Light";
}
.${config.myConfig.de.theme};
.${config.myConfig.theme};
in
{
include = "${pkgs.kitty-themes}/share/kitty-themes/themes/${theme-name}.conf";

View file

@ -28,7 +28,7 @@
dark = "";
light = "GitHub";
}
.${config.myConfig.de.theme};
.${config.myConfig.theme};
in
{
cat = "bat --plain --theme=${theme}";

View file

@ -5,10 +5,10 @@
...
}:
let
cfg = config.myConfig.de;
cfgTheme = config.myConfig.theme;
in
{
options.myConfig.de.theme = lib.mkOption {
options.myConfig.theme = lib.mkOption {
type = lib.types.enum [
"dark"
"light"
@ -37,7 +37,7 @@ in
};
}
(lib.mkIf (cfg.theme == "dark") {
(lib.mkIf (cfgTheme == "dark") {
dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
gtk.theme.name = "Adwaita-dark";
gtk.iconTheme.name = "Papirus-Dark";
@ -45,7 +45,7 @@ in
home.pointerCursor.name = "Bibata-Original-Classic";
})
(lib.mkIf (cfg.theme == "light") {
(lib.mkIf (cfgTheme == "light") {
dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-light";
gtk.theme.name = "Adwaita";
gtk.iconTheme.name = "Papirus";

View file

@ -37,7 +37,7 @@
dark = "GitHub Dark";
light = "GitHub Light";
}
.${config.myConfig.de.theme};
.${config.myConfig.theme};
"workbench.iconTheme" = "material-icon-theme";
"editor.fontFamily" = "JetBrainsMono Nerd Font";
"explorer.confirmDelete" = false;