cnst/cnix
1
0
Fork 0
Code Issues Pull Requests Activity

some refactoring

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
system/modules/boot/kernel/default.nix
View File

@@ -5,10 +5,10 @@
...
}: let
inherit (lib) mkOption;
cfg = config.modules.boot.kernel;
cfg = config.systemModules.boot.kernel;
in {
options = {
modules.boot.kernel = {
systemModules.boot.kernel = {
variant = mkOption {
type = lib.types.enum ["stable" "latest" "cachyos"];
default = "latest";
@@ -30,7 +30,7 @@ in {
extraBlacklistedModules = mkOption {
type = lib.types.listOf lib.types.str;
default = [];
description = "Additional kernel modules to blacklist.";
description = "Additional kernel systemModules to blacklist.";
};
};
};

6
system/modules/boot/loader/default.nix
View File

@@ -6,10 +6,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption mkMerge mkForce;
cfg = config.modules.boot.loader;
cfg = config.systemModules.boot.loader;
in {
options = {
modules.boot.loader = {
systemModules.boot.loader = {
default = {
enable = mkEnableOption "Enable default boot loader configuration.";
};
@@ -28,7 +28,7 @@ in {
assertions = [
{
assertion = !(cfg.default.enable && cfg.lanzaboote.enable);
message = "Only one of modules.boot.loader.default.enable and modules.boot.loader.lanzaboote.enable can be set to true.";
message = "Only one of systemModules.boot.loader.default.enable and systemModules.boot.loader.lanzaboote.enable can be set to true.";
}
];
}

102
system/modules/default.nix
View File

@@ -1,54 +1,54 @@
{systemModules, ...}: {
{smodPath, ...}: {
imports = [
"${systemModules}/boot/loader"
"${systemModules}/boot/kernel"
"${systemModules}/gaming/gamemode"
"${systemModules}/gaming/gamescope"
"${systemModules}/gaming/lutris"
"${systemModules}/gaming/steam"
"${systemModules}/gui/gnome"
"${systemModules}/gui/hyprland"
"${systemModules}/hardware/bluetooth"
"${systemModules}/hardware/graphics/amd"
"${systemModules}/hardware/graphics/nvidia"
"${systemModules}/hardware/logitech"
"${systemModules}/hardware/network"
"${systemModules}/nix/nh"
"${systemModules}/studio/blender"
"${systemModules}/studio/gimp"
"${systemModules}/studio/inkscape"
"${systemModules}/studio/beekeeper"
"${systemModules}/studio/mysql-workbench"
"${systemModules}/sysd/network/blueman"
"${systemModules}/sysd/network/mullvad"
"${systemModules}/sysd/network/samba"
"${systemModules}/sysd/network/openssh"
"${systemModules}/sysd/security/agenix"
"${systemModules}/sysd/security/gnome-keyring"
"${systemModules}/sysd/session/dbus"
"${systemModules}/sysd/session/dconf"
"${systemModules}/sysd/session/xserver"
"${systemModules}/sysd/system/fwupd"
"${systemModules}/sysd/system/greetd"
"${systemModules}/sysd/system/gvfs"
"${systemModules}/sysd/system/locate"
"${systemModules}/sysd/system/nix-ld"
"${systemModules}/sysd/system/pcscd"
"${systemModules}/sysd/system/pipewire"
"${systemModules}/sysd/system/powerd"
"${systemModules}/sysd/system/udisks"
"${systemModules}/sysd/system/zram"
"${systemModules}/sysd/system/kanata"
"${systemModules}/utils/android"
"${systemModules}/utils/anyrun"
"${systemModules}/utils/brightnessctl"
"${systemModules}/utils/chaotic"
"${systemModules}/utils/corectrl"
"${systemModules}/utils/microfetch"
"${systemModules}/utils/misc"
"${systemModules}/utils/npm"
"${systemModules}/utils/obsidian"
"${systemModules}/utils/yubikey"
"${systemModules}/utils/zsh"
"${smodPath}/boot/loader"
"${smodPath}/boot/kernel"
"${smodPath}/gaming/gamemode"
"${smodPath}/gaming/gamescope"
"${smodPath}/gaming/lutris"
"${smodPath}/gaming/steam"
"${smodPath}/gui/gnome"
"${smodPath}/gui/hyprland"
"${smodPath}/hardware/bluetooth"
"${smodPath}/hardware/graphics/amd"
"${smodPath}/hardware/graphics/nvidia"
"${smodPath}/hardware/logitech"
"${smodPath}/hardware/network"
"${smodPath}/nix/nh"
"${smodPath}/studio/blender"
"${smodPath}/studio/gimp"
"${smodPath}/studio/inkscape"
"${smodPath}/studio/beekeeper"
"${smodPath}/studio/mysql-workbench"
"${smodPath}/sysd/network/blueman"
"${smodPath}/sysd/network/mullvad"
"${smodPath}/sysd/network/samba"
"${smodPath}/sysd/network/openssh"
"${smodPath}/sysd/security/agenix"
"${smodPath}/sysd/security/gnome-keyring"
"${smodPath}/sysd/session/dbus"
"${smodPath}/sysd/session/dconf"
"${smodPath}/sysd/session/xserver"
"${smodPath}/sysd/system/fwupd"
"${smodPath}/sysd/system/greetd"
"${smodPath}/sysd/system/gvfs"
"${smodPath}/sysd/system/locate"
"${smodPath}/sysd/system/nix-ld"
"${smodPath}/sysd/system/pcscd"
"${smodPath}/sysd/system/pipewire"
"${smodPath}/sysd/system/powerd"
"${smodPath}/sysd/system/udisks"
"${smodPath}/sysd/system/zram"
"${smodPath}/sysd/system/kanata"
"${smodPath}/utils/android"
"${smodPath}/utils/anyrun"
"${smodPath}/utils/brightnessctl"
"${smodPath}/utils/chaotic"
"${smodPath}/utils/corectrl"
"${smodPath}/utils/microfetch"
"${smodPath}/utils/misc"
"${smodPath}/utils/npm"
"${smodPath}/utils/obsidian"
"${smodPath}/utils/yubikey"
"${smodPath}/utils/zsh"
];
}

6
system/modules/gaming/gamemode/default.nix
View File

@@ -6,14 +6,14 @@
...
}: let
inherit (lib) mkIf mkEnableOption mkOption;
cfg = config.modules.gaming.gamemode;
cfg = config.systemModules.gaming.gamemode;
pipewireLowLatencyModule = inputs.nix-gaming.nixosModules.pipewireLowLatency;
in {
imports = [
pipewireLowLatencyModule
];
options = {
modules.gaming.gamemode = {
systemModules.gaming.gamemode = {
enable = mkEnableOption "Enables gamemode";
optimizeGpu.enable = mkOption {
type = lib.types.bool;
@@ -29,7 +29,7 @@ in {
general = {
inhibit_screensaver = 1;
softrealtime = "auto";
renice = 15;
# renice = 15;
};
gpu = mkIf cfg.optimizeGpu.enable {
apply_gpu_optimisations = "accept-responsibility";

4
system/modules/gaming/gamescope/default.nix
View File

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

4
system/modules/gaming/lutris/default.nix
View File

@@ -5,10 +5,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.gaming.lutris;
cfg = config.systemModules.gaming.lutris;
in {
options = {
modules.gaming.lutris.enable = mkEnableOption "Enables lutris";
systemModules.gaming.lutris.enable = mkEnableOption "Enables lutris";
};
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [

4
system/modules/gaming/steam/default.nix
View File

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

4
system/modules/gui/gnome/default.nix
View File

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

4
system/modules/gui/hyprland/default.nix
View File

@@ -6,10 +6,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.gui.hyprland;
cfg = config.systemModules.gui.hyprland;
in {
options = {
modules.gui.hyprland.enable = mkEnableOption "Enables hyprland";
systemModules.gui.hyprland.enable = mkEnableOption "Enables hyprland";
};
config = mkIf cfg.enable {
programs.hyprland = {

4
system/modules/hardware/bluetooth/default.nix
View File

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

4
system/modules/hardware/graphics/amd/default.nix
View File

@@ -5,10 +5,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.hardware.graphics.amd;
cfg = config.systemModules.hardware.graphics.amd;
in {
options = {
modules.hardware.graphics.amd.enable = mkEnableOption "Enables AMD graphics";
systemModules.hardware.graphics.amd.enable = mkEnableOption "Enables AMD graphics";
};
config = mkIf cfg.enable {
hardware = {

4
system/modules/hardware/graphics/nvidia/default.nix
View File

@@ -15,10 +15,10 @@
exec "$@"
'';
inherit (lib) types mkIf mkEnableOption mkOption;
cfg = config.modules.hardware.graphics.nvidia;
cfg = config.systemModules.hardware.graphics.nvidia;
in {
options = {
modules.hardware.graphics.nvidia = {
systemModules.hardware.graphics.nvidia = {
enable = mkEnableOption "Enables NVidia graphics";
package = mkOption {
type = types.enum ["stable" "beta" "production" "latest"];

4
system/modules/hardware/logitech/default.nix
View File

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

4
system/modules/hardware/network/default.nix
View File

@@ -4,10 +4,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption mkOption types;
cfg = config.modules.hardware.network;
cfg = config.systemModules.hardware.network;
in {
options = {
modules = {
systemModules = {
hardware = {
network = {
enable = mkEnableOption "Enable the custom networking module";

4
system/modules/nix/nh/default.nix
View File

@@ -4,10 +4,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption mkOption;
cfg = config.modules.nix.nh;
cfg = config.systemModules.nix.nh;
in {
options = {
modules.nix.nh = {
systemModules.nix.nh = {
enable = mkEnableOption "Enables nix helper";
clean = {
enable = mkEnableOption "Enables nix helper cleaning";

4
system/modules/studio/beekeeper/default.nix
View File

@@ -5,10 +5,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.studio.beekeeper;
cfg = config.systemModules.studio.beekeeper;
in {
options = {
modules.studio.beekeeper.enable = mkEnableOption "Enables Beekeeper Studio";
systemModules.studio.beekeeper.enable = mkEnableOption "Enables Beekeeper Studio";
};
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [

4
system/modules/studio/blender/default.nix
View File

@@ -5,10 +5,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption mkOption;
cfg = config.modules.studio.blender;
cfg = config.systemModules.studio.blender;
in {
options = {
modules.studio.blender = {
systemModules.studio.blender = {
enable = mkEnableOption "Enables Blender";
hip.enable = mkOption {
type = lib.types.bool;

4
system/modules/studio/gimp/default.nix
View File

@@ -5,10 +5,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.studio.gimp;
cfg = config.systemModules.studio.gimp;
in {
options = {
modules.studio.gimp.enable = mkEnableOption "Enables gimp";
systemModules.studio.gimp.enable = mkEnableOption "Enables gimp";
};
config = mkIf cfg.enable {
environment.systemPackages = [

4
system/modules/studio/inkscape/default.nix
View File

@@ -5,10 +5,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.studio.inkscape;
cfg = config.systemModules.studio.inkscape;
in {
options = {
modules.studio.inkscape.enable = mkEnableOption "Enables inkscape";
systemModules.studio.inkscape.enable = mkEnableOption "Enables inkscape";
};
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [

4
system/modules/studio/mysql-workbench/default.nix
View File

@@ -5,10 +5,10 @@
...
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.modules.studio.mysql-workbench;
cfg = config.systemModules.studio.mysql-workbench;
in {
options = {
modules.studio.mysql-workbench.enable = mkEnableOption "Enables MySQL Workbench";
systemModules.studio.mysql-workbench.enable = mkEnableOption "Enables MySQL Workbench";
};
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [

4
system/modules/sysd/network/blueman/default.nix
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 = {

4
system/modules/sysd/network/mullvad/default.nix
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 = {

4
system/modules/sysd/network/openssh/default.nix
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 = {

4
system/modules/sysd/network/samba/default.nix
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 = {

4
system/modules/sysd/security/agenix/default.nix
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;

4
system/modules/sysd/security/gnome-keyring/default.nix
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;

4
system/modules/sysd/session/dbus/default.nix
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 = {

4
system/modules/sysd/session/dconf/default.nix
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;

4
system/modules/sysd/session/xserver/default.nix
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"];

4
system/modules/sysd/system/fwupd/default.nix
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;

4
system/modules/sysd/system/greetd/default.nix
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;

4
system/modules/sysd/system/gvfs/default.nix
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;

4
system/modules/sysd/system/kanata/default.nix
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 = {

4
system/modules/sysd/system/locate/default.nix
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 = {

4
system/modules/sysd/system/nix-ld/default.nix
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 = {

4
system/modules/sysd/system/pcscd/default.nix
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;

4
system/modules/sysd/system/pipewire/default.nix
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;

4
system/modules/sysd/system/powerd/default.nix
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 = {

4
system/modules/sysd/system/udisks/default.nix
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;

4
system/modules/sysd/system/zram/default.nix
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;

4
system/modules/utils/android/default.nix
View File

@@ -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;

4
system/modules/utils/anyrun/default.nix
View File

@@ -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 = [

4
system/modules/utils/brightnessctl/default.nix
View File

@@ -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
system/modules/utils/chaotic/default.nix
View File

@@ -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
system/modules/utils/corectrl/default.nix
View File

@@ -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 = {

4
system/modules/utils/microfetch/default.nix
View File

@@ -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];

4
system/modules/utils/misc/default.nix
View File

@@ -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
system/modules/utils/npm/default.nix
View File

@@ -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 = {

4
system/modules/utils/obsidian/default.nix
View File

@@ -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 = [

4
system/modules/utils/yubikey/default.nix
View File

@@ -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
system/modules/utils/zsh/default.nix
View File

@@ -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;