some refactoring
This commit is contained in:
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption;
|
||||
cfg = config.modules.utils.android;
|
||||
cfg = config.systemModules.utils.android;
|
||||
in {
|
||||
options = {
|
||||
modules.utils.android.enable = mkEnableOption "Enables android tools";
|
||||
systemModules.utils.android.enable = mkEnableOption "Enables android tools";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
programs.adb.enable = true;
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption;
|
||||
cfg = config.modules.utils.anyrun;
|
||||
cfg = config.systemModules.utils.anyrun;
|
||||
in {
|
||||
options = {
|
||||
modules.utils.anyrun.enable = mkEnableOption "Enables anyrun";
|
||||
systemModules.utils.anyrun.enable = mkEnableOption "Enables anyrun";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption;
|
||||
cfg = config.modules.utils.brightnessctl;
|
||||
cfg = config.systemModules.utils.brightnessctl;
|
||||
in {
|
||||
options = {
|
||||
modules.utils.brightnessctl.enable = mkEnableOption "Enables brigthnessctl";
|
||||
systemModules.utils.brightnessctl.enable = mkEnableOption "Enables brigthnessctl";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption mkOption mkMerge;
|
||||
cfg = config.modules.utils.chaotic;
|
||||
cfg = config.systemModules.utils.chaotic;
|
||||
in {
|
||||
options = {
|
||||
modules.utils.chaotic = {
|
||||
systemModules.utils.chaotic = {
|
||||
enable = mkEnableOption "Enables Chaotic AUR packages";
|
||||
amd.enable = mkOption {
|
||||
type = lib.types.bool;
|
||||
@@ -20,7 +20,6 @@ in {
|
||||
|
||||
config = mkIf cfg.enable (mkMerge [
|
||||
{
|
||||
# Base configuration when Chaotic is enabled
|
||||
chaotic.scx.enable = true;
|
||||
}
|
||||
(mkIf cfg.amd.enable {
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption;
|
||||
cfg = config.modules.utils.corectrl;
|
||||
cfg = config.systemModules.utils.corectrl;
|
||||
in {
|
||||
options = {
|
||||
modules.utils.corectrl.enable = mkEnableOption "Enables CoreCtrl";
|
||||
systemModules.utils.corectrl.enable = mkEnableOption "Enables CoreCtrl";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
programs.corectrl = {
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption;
|
||||
cfg = config.modules.utils.microfetch;
|
||||
cfg = config.systemModules.utils.microfetch;
|
||||
in {
|
||||
options = {
|
||||
modules.utils.microfetch.enable = mkEnableOption "Enables microfetch";
|
||||
systemModules.utils.microfetch.enable = mkEnableOption "Enables microfetch";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [inputs.microfetch.packages.x86_64-linux.default];
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption mkOption mkMerge;
|
||||
cfg = config.modules.utils.misc;
|
||||
cfg = config.systemModules.utils.misc;
|
||||
in {
|
||||
options = {
|
||||
modules.utils.misc = {
|
||||
systemModules.utils.misc = {
|
||||
enable = mkEnableOption "Enables miscellaneous packages";
|
||||
desktop.enable = mkOption {
|
||||
type = lib.types.bool;
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption;
|
||||
cfg = config.modules.utils.npm;
|
||||
cfg = config.systemModules.utils.npm;
|
||||
in {
|
||||
options = {
|
||||
modules.utils.npm.enable = mkEnableOption "Enables npm";
|
||||
systemModules.utils.npm.enable = mkEnableOption "Enables npm";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
programs.npm = {
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption;
|
||||
cfg = config.modules.utils.obsidian;
|
||||
cfg = config.systemModules.utils.obsidian;
|
||||
in {
|
||||
options = {
|
||||
modules.utils.obsidian.enable = mkEnableOption "Enables obsidian";
|
||||
systemModules.utils.obsidian.enable = mkEnableOption "Enables obsidian";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption;
|
||||
cfg = config.modules.utils.yubikey;
|
||||
cfg = config.systemModules.utils.yubikey;
|
||||
in {
|
||||
options = {
|
||||
modules.utils.yubikey.enable = mkEnableOption "Enables yubikey utilities";
|
||||
systemModules.utils.yubikey.enable = mkEnableOption "Enables yubikey utilities";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption;
|
||||
cfg = config.modules.utils.zsh;
|
||||
cfg = config.systemModules.utils.zsh;
|
||||
in {
|
||||
options = {
|
||||
modules.utils.zsh.enable = mkEnableOption "Enables android tools";
|
||||
systemModules.utils.zsh.enable = mkEnableOption "Enables android tools";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
programs.zsh.enable = cfg.enable;
|
||||
|
||||
Reference in New Issue
Block a user