some refactoring

This commit is contained in:
cnst
2024-10-13 18:09:15 +02:00
parent 25a3fed51c
commit 084bc3b34f
125 changed files with 437 additions and 370 deletions

View File

@@ -4,10 +4,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.sysd.network.blueman;
cfg = config.systemModules.sysd.network.blueman;
in {
options = {
modules.sysd.network.blueman.enable = mkEnableOption "Enables blueman";
systemModules.sysd.network.blueman.enable = mkEnableOption "Enables blueman";
};
config = mkIf cfg.enable {
services = {

View File

@@ -5,10 +5,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.sysd.network.mullvad;
cfg = config.systemModules.sysd.network.mullvad;
in {
options = {
modules.sysd.network.mullvad.enable = mkEnableOption "Enables mullvad";
systemModules.sysd.network.mullvad.enable = mkEnableOption "Enables mullvad";
};
config = mkIf cfg.enable {
services.mullvad-vpn = {

View File

@@ -4,10 +4,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.sysd.network.openssh;
cfg = config.systemModules.sysd.network.openssh;
in {
options = {
modules.sysd.network.openssh.enable = mkEnableOption "Enables openssh";
systemModules.sysd.network.openssh.enable = mkEnableOption "Enables openssh";
};
config = mkIf cfg.enable {
services.openssh = {

View File

@@ -5,10 +5,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.sysd.network.samba;
cfg = config.systemModules.sysd.network.samba;
in {
options = {
modules.sysd.network.samba.enable = mkEnableOption "Enables samba";
systemModules.sysd.network.samba.enable = mkEnableOption "Enables samba";
};
config = mkIf cfg.enable {
services = {

View File

@@ -7,10 +7,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption mkOption mkMerge;
cfg = config.modules.sysd.security.agenix;
cfg = config.systemModules.sysd.security.agenix;
in {
options = {
modules.sysd.security.agenix = {
systemModules.sysd.security.agenix = {
enable = mkEnableOption "Enables agenix system environment";
cnix.enable = mkOption {
type = lib.types.bool;

View File

@@ -4,10 +4,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.sysd.security.gnome-keyring;
cfg = config.systemModules.sysd.security.gnome-keyring;
in {
options = {
modules.sysd.security.gnome-keyring.enable = mkEnableOption "Enables gnome-keyring";
systemModules.sysd.security.gnome-keyring.enable = mkEnableOption "Enables gnome-keyring";
};
config = mkIf cfg.enable {
services.gnome.gnome-keyring.enable = true;

View File

@@ -5,10 +5,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.sysd.session.dbus;
cfg = config.systemModules.sysd.session.dbus;
in {
options = {
modules.sysd.session.dbus.enable = mkEnableOption "Enables dbus";
systemModules.sysd.session.dbus.enable = mkEnableOption "Enables dbus";
};
config = mkIf cfg.enable {
services.dbus = {

View File

@@ -4,10 +4,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.sysd.session.dconf;
cfg = config.systemModules.sysd.session.dconf;
in {
options = {
modules.sysd.session.dconf.enable = mkEnableOption "Enables dconf";
systemModules.sysd.session.dconf.enable = mkEnableOption "Enables dconf";
};
config = mkIf cfg.enable {
programs.dconf.enable = true;

View File

@@ -4,10 +4,10 @@
...
}: let
inherit (lib) mkOption types;
cfg = config.modules.sysd.session.xserver;
cfg = config.systemModules.sysd.session.xserver;
in {
options = {
modules.sysd.session.xserver = {
systemModules.sysd.session.xserver = {
videoDrivers = mkOption {
type = types.listOf (types.enum ["amdgpu" "nvidia"]);
default = ["amdgpu"];

View File

@@ -4,10 +4,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.sysd.system.fwupd;
cfg = config.systemModules.sysd.system.fwupd;
in {
options = {
modules.sysd.system.fwupd.enable = mkEnableOption "Enables fwupd";
systemModules.sysd.system.fwupd.enable = mkEnableOption "Enables fwupd";
};
config = mkIf cfg.enable {
services.fwupd.enable = true;

View File

@@ -5,10 +5,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption mkMerge mkOption types;
cfg = config.modules.sysd.system.greetd;
cfg = config.systemModules.sysd.system.greetd;
in {
options = {
modules.sysd.system.greetd = {
systemModules.sysd.system.greetd = {
enable = mkEnableOption {
type = types.bool;
default = false;

View File

@@ -4,10 +4,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.sysd.system.gvfs;
cfg = config.systemModules.sysd.system.gvfs;
in {
options = {
modules.sysd.system.gvfs.enable = mkEnableOption "Enables gvfs";
systemModules.sysd.system.gvfs.enable = mkEnableOption "Enables gvfs";
};
config = mkIf cfg.enable {
services.gvfs.enable = true;

View File

@@ -5,10 +5,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.sysd.system.kanata;
cfg = config.systemModules.sysd.system.kanata;
in {
options = {
modules.sysd.system.kanata.enable = mkEnableOption "Enables kanata keyboard remapping";
systemModules.sysd.system.kanata.enable = mkEnableOption "Enables kanata keyboard remapping";
};
config = mkIf cfg.enable {
services.kanata = {

View File

@@ -5,10 +5,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.sysd.system.locate;
cfg = config.systemModules.sysd.system.locate;
in {
options = {
modules.sysd.system.locate.enable = mkEnableOption "Enables plocate";
systemModules.sysd.system.locate.enable = mkEnableOption "Enables plocate";
};
config = mkIf cfg.enable {
services.locate = {

View File

@@ -5,10 +5,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.sysd.system.nix-ld;
cfg = config.systemModules.sysd.system.nix-ld;
in {
options = {
modules.sysd.system.nix-ld.enable = mkEnableOption "Enables nix-ld";
systemModules.sysd.system.nix-ld.enable = mkEnableOption "Enables nix-ld";
};
config = mkIf cfg.enable {
programs.nix-ld = {

View File

@@ -4,10 +4,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.sysd.system.pcscd;
cfg = config.systemModules.sysd.system.pcscd;
in {
options = {
modules.sysd.system.pcscd.enable = mkEnableOption "Enables pcscd";
systemModules.sysd.system.pcscd.enable = mkEnableOption "Enables pcscd";
};
config = mkIf cfg.enable {
services.pcscd.enable = true;

View File

@@ -4,10 +4,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.sysd.system.pipewire;
cfg = config.systemModules.sysd.system.pipewire;
in {
options = {
modules.sysd.system.pipewire.enable = mkEnableOption "Enables pipewire";
systemModules.sysd.system.pipewire.enable = mkEnableOption "Enables pipewire";
};
config = mkIf cfg.enable {
hardware.pulseaudio.enable = false;

View File

@@ -4,10 +4,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.sysd.system.powerd;
cfg = config.systemModules.sysd.system.powerd;
in {
options = {
modules.sysd.system.powerd.enable = mkEnableOption "Enables power-profiles-daemon";
systemModules.sysd.system.powerd.enable = mkEnableOption "Enables power-profiles-daemon";
};
config = mkIf cfg.enable {
services = {

View File

@@ -4,10 +4,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.sysd.system.udisks;
cfg = config.systemModules.sysd.system.udisks;
in {
options = {
modules.sysd.system.udisks.enable = mkEnableOption "Enables udisks";
systemModules.sysd.system.udisks.enable = mkEnableOption "Enables udisks";
};
config = mkIf cfg.enable {
services.udisks2.enable = true;

View File

@@ -4,10 +4,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.sysd.system.zram;
cfg = config.systemModules.sysd.system.zram;
in {
options = {
modules.sysd.system.zram.enable = mkEnableOption "Enables zram";
systemModules.sysd.system.zram.enable = mkEnableOption "Enables zram";
};
config = mkIf cfg.enable {
zramSwap.enable = true;