fixup! all of my custom options are now held in an attribute set called movOpts
This commit is contained in:
@@ -28,76 +28,76 @@
|
||||
name:
|
||||
lib.mkEnableOption
|
||||
"${doc}" // {
|
||||
default = config.movScripts.enable && config.movScripts.${group}.enable;
|
||||
default = config.movOpts.movScripts.enable && config.movOpts.movScripts.${group}.enable;
|
||||
};
|
||||
in {
|
||||
options = {
|
||||
movScripts.enable = lib.mkEnableOption "Enables all pagedmov's scripts";
|
||||
movOpts.movScripts.enable = lib.mkEnableOption "Enables all pagedmov's scripts";
|
||||
|
||||
# Enable or disable by group
|
||||
movScripts.commandScripts.enable =
|
||||
movOpts.movScripts.commandScripts.enable =
|
||||
lib.mkEnableOption "Enables all command scripts";
|
||||
movScripts.hyprlandControls.enable =
|
||||
movOpts.movScripts.hyprlandControls.enable =
|
||||
lib.mkEnableOption "Enables all Hyprland control scripts";
|
||||
movScripts.nixShortcuts.enable =
|
||||
movOpts.movScripts.nixShortcuts.enable =
|
||||
lib.mkEnableOption "Enables all Nix shortcut scripts";
|
||||
|
||||
# Individual options using scriptOverride or mkEnableOption directly
|
||||
movScripts.commandScripts.icanhazip.enable =
|
||||
movOpts.movScripts.commandScripts.icanhazip.enable =
|
||||
scriptOverride "Enables the icanhazip command" "commandScripts" "icanhazip";
|
||||
movScripts.commandScripts.invoke.enable =
|
||||
movOpts.movScripts.commandScripts.invoke.enable =
|
||||
scriptOverride "Enables the invoke command" "commandScripts" "invoke";
|
||||
movScripts.commandScripts.runbg.enable =
|
||||
movOpts.movScripts.commandScripts.runbg.enable =
|
||||
scriptOverride "Enables the runbg command - written by FrostPhoenix" "commandScripts" "runbg";
|
||||
movScripts.commandScripts.splash.enable =
|
||||
movOpts.movScripts.commandScripts.splash.enable =
|
||||
scriptOverride "Enables the splash screen when opening a terminal" "commandScripts" "splash";
|
||||
movScripts.commandScripts.toolbelt.enable =
|
||||
movOpts.movScripts.commandScripts.toolbelt.enable =
|
||||
scriptOverride "Enables the toolbelt command" "commandScripts" "toolbelt";
|
||||
movScripts.commandScripts.viconf.enable =
|
||||
movOpts.movScripts.commandScripts.viconf.enable =
|
||||
scriptOverride "Enables the viconf command" "commandScripts" "viconf";
|
||||
|
||||
movScripts.hyprlandControls.chpaper.enable =
|
||||
movOpts.movScripts.hyprlandControls.chpaper.enable =
|
||||
scriptOverride "Enables the chpaper command" "hyprlandControls" "chpaper";
|
||||
movScripts.hyprlandControls.scheck.enable =
|
||||
movOpts.movScripts.hyprlandControls.scheck.enable =
|
||||
scriptOverride "Enables the scheck command" "hyprlandControls" "scheck";
|
||||
movScripts.hyprlandControls.chscheme.enable =
|
||||
movOpts.movScripts.hyprlandControls.chscheme.enable =
|
||||
scriptOverride "Enables the chscheme command" "hyprlandControls" "chscheme";
|
||||
movScripts.hyprlandControls.keyring.enable =
|
||||
movOpts.movScripts.hyprlandControls.keyring.enable =
|
||||
scriptOverride "Enables the keyring command" "hyprlandControls" "keyring";
|
||||
movScripts.hyprlandControls.moveonscreen.enable =
|
||||
movOpts.movScripts.hyprlandControls.moveonscreen.enable =
|
||||
scriptOverride "Ensures floating windows remain on screen" "hyprlandControls" "moveonscreen";
|
||||
movScripts.hyprlandControls.switchmon.enable =
|
||||
movOpts.movScripts.hyprlandControls.switchmon.enable =
|
||||
scriptOverride "Moves cursor to the center of the second monitor" "hyprlandControls" "switchmon";
|
||||
movScripts.hyprlandControls.mkscreenshots.enable =
|
||||
movOpts.movScripts.hyprlandControls.mkscreenshots.enable =
|
||||
scriptOverride "Generates screenshots, and updates the README.md with the current rev hash" "hyprlandControls" "switchmon";
|
||||
|
||||
|
||||
movScripts.nixShortcuts.garbage-collect.enable =
|
||||
movOpts.movScripts.nixShortcuts.garbage-collect.enable =
|
||||
scriptOverride "Enables the garbage-collect script" "nixShortcuts" "garbage-collect";
|
||||
movScripts.nixShortcuts.nsp.enable =
|
||||
movOpts.movScripts.nixShortcuts.nsp.enable =
|
||||
scriptOverride "Enables nsp as an alias for 'nix-shell -p'" "nixShortcuts" "nsp";
|
||||
movScripts.nixShortcuts.rebuild.enable =
|
||||
movOpts.movScripts.nixShortcuts.rebuild.enable =
|
||||
scriptOverride "Enables rebuild as an alias for 'sudo nixos-rebuild switch'" "nixShortcuts" "rebuild";
|
||||
};
|
||||
|
||||
config = lib.mkIf config.movScripts.enable {
|
||||
home.packages = lib.optionals config.movScripts.commandScripts.invoke.enable [ invoke ]
|
||||
++ lib.optionals config.movScripts.commandScripts.runbg.enable [ runbg ]
|
||||
++ lib.optionals config.movScripts.commandScripts.icanhazip.enable [ icanhazip ]
|
||||
++ lib.optionals config.movScripts.commandScripts.splash.enable [ splash ]
|
||||
++ lib.optionals config.movScripts.commandScripts.toolbelt.enable [ toolbelt ]
|
||||
++ lib.optionals config.movScripts.commandScripts.viconf.enable [ viconf ]
|
||||
config = lib.mkIf config.movOpts.movScripts.enable {
|
||||
home.packages = lib.optionals config.movOpts.movScripts.commandScripts.invoke.enable [ invoke ]
|
||||
++ lib.optionals config.movOpts.movScripts.commandScripts.runbg.enable [ runbg ]
|
||||
++ lib.optionals config.movOpts.movScripts.commandScripts.icanhazip.enable [ icanhazip ]
|
||||
++ lib.optionals config.movOpts.movScripts.commandScripts.splash.enable [ splash ]
|
||||
++ lib.optionals config.movOpts.movScripts.commandScripts.toolbelt.enable [ toolbelt ]
|
||||
++ lib.optionals config.movOpts.movScripts.commandScripts.viconf.enable [ viconf ]
|
||||
|
||||
++ lib.optionals config.movScripts.hyprlandControls.chpaper.enable [ chpaper ]
|
||||
++ lib.optionals config.movScripts.hyprlandControls.scheck.enable [ scheck ]
|
||||
++ lib.optionals config.movScripts.hyprlandControls.chscheme.enable [ chscheme ]
|
||||
++ lib.optionals config.movScripts.hyprlandControls.keyring.enable [ keyring ]
|
||||
++ lib.optionals config.movScripts.hyprlandControls.moveonscreen.enable [ moveonscreen ]
|
||||
++ lib.optionals config.movScripts.hyprlandControls.switchmon.enable [ switchmon ]
|
||||
++ lib.optionals config.movScripts.hyprlandControls.mkscreenshots.enable [ mkscreenshots ]
|
||||
++ lib.optionals config.movOpts.movScripts.hyprlandControls.chpaper.enable [ chpaper ]
|
||||
++ lib.optionals config.movOpts.movScripts.hyprlandControls.scheck.enable [ scheck ]
|
||||
++ lib.optionals config.movOpts.movScripts.hyprlandControls.chscheme.enable [ chscheme ]
|
||||
++ lib.optionals config.movOpts.movScripts.hyprlandControls.keyring.enable [ keyring ]
|
||||
++ lib.optionals config.movOpts.movScripts.hyprlandControls.moveonscreen.enable [ moveonscreen ]
|
||||
++ lib.optionals config.movOpts.movScripts.hyprlandControls.switchmon.enable [ switchmon ]
|
||||
++ lib.optionals config.movOpts.movScripts.hyprlandControls.mkscreenshots.enable [ mkscreenshots ]
|
||||
|
||||
++ lib.optionals config.movScripts.nixShortcuts.garbage-collect.enable [ garbage-collect ]
|
||||
++ lib.optionals config.movScripts.nixShortcuts.nsp.enable [ nsp ]
|
||||
++ lib.optionals config.movScripts.nixShortcuts.rebuild.enable [ rebuild ];
|
||||
++ lib.optionals config.movOpts.movScripts.nixShortcuts.garbage-collect.enable [ garbage-collect ]
|
||||
++ lib.optionals config.movOpts.movScripts.nixShortcuts.nsp.enable [ nsp ]
|
||||
++ lib.optionals config.movOpts.movScripts.nixShortcuts.rebuild.enable [ rebuild ];
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user