diff options
| author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2026-11-04 17:56:37 +0100 |
|---|---|---|
| committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2026-11-05 22:47:43 +0100 |
| commit | 36e836abf8ead21c88154a7e962a8d397d74b78f (patch) | |
| tree | f8336765778eb22e847e11bfb9d7c92e334810cd /pkgs/by-name/ro/rollup/patches2/0003-modules-Always-use-extra_lib-also-for-options.mkEnab.patch | |
| parent | flake.nix: Don't perform source mapping via sources and raw_sources (diff) | |
| download | nixos-config-36e836abf8ead21c88154a7e962a8d397d74b78f.zip | |
pkgs/rollup: Init
Diffstat (limited to 'pkgs/by-name/ro/rollup/patches2/0003-modules-Always-use-extra_lib-also-for-options.mkEnab.patch')
| -rw-r--r-- | pkgs/by-name/ro/rollup/patches2/0003-modules-Always-use-extra_lib-also-for-options.mkEnab.patch | 564 |
1 files changed, 564 insertions, 0 deletions
diff --git a/pkgs/by-name/ro/rollup/patches2/0003-modules-Always-use-extra_lib-also-for-options.mkEnab.patch b/pkgs/by-name/ro/rollup/patches2/0003-modules-Always-use-extra_lib-also-for-options.mkEnab.patch new file mode 100644 index 00000000..c44f0ba8 --- /dev/null +++ b/pkgs/by-name/ro/rollup/patches2/0003-modules-Always-use-extra_lib-also-for-options.mkEnab.patch @@ -0,0 +1,564 @@ +From 82481ecb3850d7ec0bcd1dfee721600a2302a7ce Mon Sep 17 00:00:00 2001 +From: Benedikt Peetz <benedikt.peetz@b-peetz.de> +Date: Mon, 2 Nov 2026 15:10:37 +0100 +Subject: [PATCH 3/7] modules/*: Always use `extra_lib`, also for + `options.mkEnable` + +--- + modules/by-name/al/alacritty/module.nix | 4 ++-- + modules/by-name/au/ausweisapp/module.nix | 4 ++-- + modules/by-name/ca/calibre/module.nix | 4 ++-- + modules/by-name/ca/cargo/module.nix | 4 ++-- + modules/by-name/fo/foot/module.nix | 4 ++-- + modules/by-name/gt/gtk/module.nix | 4 ++-- + modules/by-name/hl/lhedger/module.nix | 4 ++-- + modules/by-name/ia/iamb/module.nix | 4 ++-- + modules/by-name/lf/lf/module.nix | 4 ++-- + modules/by-name/lu/lutris/module.nix | 4 ++-- + modules/by-name/ma/mandb/module.nix | 4 ++-- + modules/by-name/me/mergiraf/module.nix | 4 ++-- + modules/by-name/mp/mpdpopm/module.nix | 4 ++-- + modules/by-name/ni/nix/module.nix | 4 ++-- + modules/by-name/ni/nixos-option/module.nix | 4 ++-- + modules/by-name/nv/nvim/module.nix | 4 ++-- + modules/by-name/op/openssh/module.nix | 4 ++-- + modules/by-name/pi/pipewire/module.nix | 4 ++-- + modules/by-name/pl/plymouth/module.nix | 4 ++-- + modules/by-name/ri/river/keymap.nix | 2 +- + modules/by-name/ro/rofi/module.nix | 4 ++-- + modules/by-name/si/signal/module.nix | 4 ++-- + modules/by-name/so/sound/module.nix | 4 ++-- + modules/by-name/st/starship/module.nix | 4 ++-- + modules/by-name/sw/swaybg/module.nix | 4 ++-- + modules/by-name/sw/swayidle/module.nix | 4 ++-- + 26 files changed, 51 insertions(+), 51 deletions(-) + +diff --git a/modules/by-name/al/alacritty/module.nix b/modules/by-name/al/alacritty/module.nix +index 73860a57..74b938ec 100644 +--- a/modules/by-name/al/alacritty/module.nix ++++ b/modules/by-name/al/alacritty/module.nix +@@ -11,13 +11,13 @@ + config, + lib, + pkgs, +- libraries, ++ extra_lib, + ... + }: let + cfg = config.soispha.programs.alacritty; + in { + options.soispha.programs.alacritty = { +- enable = libraries.base.options.mkEnable "alacritty"; ++ enable = extra_lib.options.mkDefaultEnabled "alacritty"; + + package = lib.mkPackageOption pkgs "alacritty" {}; + }; +diff --git a/modules/by-name/au/ausweisapp/module.nix b/modules/by-name/au/ausweisapp/module.nix +index e74f3d91..93716ed9 100644 +--- a/modules/by-name/au/ausweisapp/module.nix ++++ b/modules/by-name/au/ausweisapp/module.nix +@@ -1,13 +1,13 @@ + { + config, + lib, +- libraries, ++ extra_lib, + ... + }: let + cfg = config.soispha.programs.ausweisapp; + in { + options.soispha.programs.ausweisapp = { +- enable = libraries.base.options.mkEnable "AusweisApp"; ++ enable = extra_lib.options.mkDefaultEnabled "AusweisApp"; + }; + + config = lib.mkIf cfg.enable { +diff --git a/modules/by-name/ca/calibre/module.nix b/modules/by-name/ca/calibre/module.nix +index 4188e360..76b245e0 100644 +--- a/modules/by-name/ca/calibre/module.nix ++++ b/modules/by-name/ca/calibre/module.nix +@@ -10,13 +10,13 @@ + { + config, + lib, +- libraries, ++ extra_lib, + ... + }: let + cfg = config.soispha.programs.calibre; + in { + options.soispha.programs.calibre = { +- enable = libraries.base.options.mkEnable "calibre"; ++ enable = extra_lib.options.mkDefaultEnabled "calibre"; + }; + + config = lib.mkIf cfg.enable { +diff --git a/modules/by-name/ca/cargo/module.nix b/modules/by-name/ca/cargo/module.nix +index 6b675a03..a4216020 100644 +--- a/modules/by-name/ca/cargo/module.nix ++++ b/modules/by-name/ca/cargo/module.nix +@@ -10,13 +10,13 @@ + { + config, + lib, +- libraries, ++ extra_lib, + ... + }: let + cfg = config.soispha.programs.cargo; + in { + options.soispha.programs.cargo = { +- enable = libraries.base.options.mkEnable "cargo"; ++ enable = extra_lib.options.mkDefaultEnabled "cargo"; + }; + + config = lib.mkIf cfg.enable { +diff --git a/modules/by-name/fo/foot/module.nix b/modules/by-name/fo/foot/module.nix +index 8d5cfe2b..d0189e21 100644 +--- a/modules/by-name/fo/foot/module.nix ++++ b/modules/by-name/fo/foot/module.nix +@@ -10,14 +10,14 @@ + { + config, + lib, +- libraries, ++ extra_lib, + pkgs, + ... + }: let + cfg = config.soispha.foot; + in { + options.soispha.foot = { +- enable = libraries.base.options.mkEnable "foot terminal"; ++ enable = extra_lib.options.mkDefaultEnabled "foot terminal"; + }; + + config = lib.mkIf cfg.enable { +diff --git a/modules/by-name/gt/gtk/module.nix b/modules/by-name/gt/gtk/module.nix +index 44442077..cfb000a0 100644 +--- a/modules/by-name/gt/gtk/module.nix ++++ b/modules/by-name/gt/gtk/module.nix +@@ -12,7 +12,7 @@ + pkgs, + lib, + packageSets, +- libraries, ++ extra_lib, + ... + }: let + cfg = config.soispha.gtk; +@@ -20,7 +20,7 @@ + homeConfig = config.home-manager.users.soispha; + in { + options.soispha.gtk = { +- enable = libraries.base.options.mkEnable "gtk themes"; ++ enable = extra_lib.options.mkDefaultEnabled "gtk themes"; + }; + + config.home-manager.users.soispha = lib.mkIf cfg.enable { +diff --git a/modules/by-name/hl/lhedger/module.nix b/modules/by-name/hl/lhedger/module.nix +index 68de85d0..2a9a9e3a 100644 +--- a/modules/by-name/hl/lhedger/module.nix ++++ b/modules/by-name/hl/lhedger/module.nix +@@ -11,14 +11,14 @@ + config, + lib, + pkgs, +- libraries, ++ extra_lib, + ... + }: let + cfg = config.soispha.hledger; + ledgerFile = "${config.home-manager.users.soispha.xdg.dataHome}/hledger/2025.journal"; + in { + options.soispha.hledger = { +- enable = libraries.base.options.mkEnable "hledger"; ++ enable = extra_lib.options.mkDefaultEnabled "hledger"; + }; + + config = lib.mkIf cfg.enable { +diff --git a/modules/by-name/ia/iamb/module.nix b/modules/by-name/ia/iamb/module.nix +index ef46f5e0..8b8697ac 100644 +--- a/modules/by-name/ia/iamb/module.nix ++++ b/modules/by-name/ia/iamb/module.nix +@@ -10,13 +10,13 @@ + { + config, + lib, +- libraries, ++ extra_lib, + ... + }: let + cfg = config.soispha.programs.iamb; + in { + options.soispha.programs.iamb = { +- enable = libraries.base.options.mkEnable "iamb"; ++ enable = extra_lib.options.mkDefaultEnabled "iamb"; + }; + + config = lib.mkIf cfg.enable { +diff --git a/modules/by-name/lf/lf/module.nix b/modules/by-name/lf/lf/module.nix +index 2d80f68e..9d9447d6 100644 +--- a/modules/by-name/lf/lf/module.nix ++++ b/modules/by-name/lf/lf/module.nix +@@ -14,7 +14,7 @@ + shell_library, + system, + lib, +- libraries, ++ extra_lib, + ... + }: let + real_commands = import ./commands {inherit pkgs sysLib shell_library system;}; +@@ -23,7 +23,7 @@ + # HACK: There is no (easy) way for me to make sure, that the `clearmaps` command is + # generated in the lf config before the keymapping commands. + # This command injection works around that. <2026-07-21> +- commands = libraries.extra.warnMerge real_commands { ++ commands = extra_lib.warnMerge real_commands { + __clearmaps_injection = '' + :{{ + clearmaps +diff --git a/modules/by-name/lu/lutris/module.nix b/modules/by-name/lu/lutris/module.nix +index 6864bacb..7772b269 100644 +--- a/modules/by-name/lu/lutris/module.nix ++++ b/modules/by-name/lu/lutris/module.nix +@@ -10,7 +10,7 @@ + { + lib, + config, +- libraries, ++ extra_lib, + pkgs, + ... + }: let +@@ -19,7 +19,7 @@ + inherit (config.home-manager.users.soispha.home) homeDirectory; + in { + options.soispha.programs.lutris = { +- enable = libraries.base.options.mkEnable "Lutris"; ++ enable = extra_lib.options.mkDefaultEnabled "Lutris"; + }; + + config = lib.mkIf cfg.enable { +diff --git a/modules/by-name/ma/mandb/module.nix b/modules/by-name/ma/mandb/module.nix +index 64d586db..83992729 100644 +--- a/modules/by-name/ma/mandb/module.nix ++++ b/modules/by-name/ma/mandb/module.nix +@@ -10,13 +10,13 @@ + { + config, + lib, +- libraries, ++ extra_lib, + ... + }: let + cfg = config.soispha.services.mandb; + in { + options.soispha.services.mandb = { +- enable = libraries.base.options.mkEnable "mandb"; ++ enable = extra_lib.options.mkDefaultEnabled "mandb"; + }; + + config = lib.mkIf cfg.enable { +diff --git a/modules/by-name/me/mergiraf/module.nix b/modules/by-name/me/mergiraf/module.nix +index 693969e6..e1048ca1 100644 +--- a/modules/by-name/me/mergiraf/module.nix ++++ b/modules/by-name/me/mergiraf/module.nix +@@ -10,13 +10,13 @@ + { + config, + lib, +- libraries, ++ extra_lib, + ... + }: let + cfg = config.soispha.programs.mergiraf; + in { + options.soispha.programs.mergiraf = { +- enable = libraries.base.options.mkEnable "mergiraf"; ++ enable = extra_lib.options.mkDefaultEnabled "mergiraf"; + }; + + config = lib.mkIf cfg.enable { +diff --git a/modules/by-name/mp/mpdpopm/module.nix b/modules/by-name/mp/mpdpopm/module.nix +index 82943fe8..03529095 100644 +--- a/modules/by-name/mp/mpdpopm/module.nix ++++ b/modules/by-name/mp/mpdpopm/module.nix +@@ -10,7 +10,7 @@ + { + config, + pkgs, +- libraries, ++ extra_lib, + lib, + ... + }: let +@@ -19,7 +19,7 @@ + settingsFormat = pkgs.formats.json {}; + in { + options.soispha.services.mpdpopm = { +- enable = libraries.base.options.mkEnable "mpdpopm"; ++ enable = extra_lib.options.mkDefaultEnabled "mpdpopm"; + + settings = lib.mkOption { + # Setting this type allows for correct merging behavior +diff --git a/modules/by-name/ni/nix/module.nix b/modules/by-name/ni/nix/module.nix +index e46d6e85..11b2d7e4 100644 +--- a/modules/by-name/ni/nix/module.nix ++++ b/modules/by-name/ni/nix/module.nix +@@ -9,7 +9,7 @@ + # If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. + { + pkgs, +- libraries, ++ extra_lib, + config, + lib, + # flakes +@@ -56,7 +56,7 @@ + cfg = config.soispha.nix; + in { + options.soispha.nix = { +- enable = libraries.base.options.mkEnable "nix"; ++ enable = extra_lib.options.mkDefaultEnabled "nix"; + }; + + config = lib.mkIf cfg.enable { +diff --git a/modules/by-name/ni/nixos-option/module.nix b/modules/by-name/ni/nixos-option/module.nix +index 0053d357..3e41bd34 100644 +--- a/modules/by-name/ni/nixos-option/module.nix ++++ b/modules/by-name/ni/nixos-option/module.nix +@@ -1,13 +1,13 @@ + { + config, + lib, +- libraries, ++ extra_lib, + ... + }: let + cfg = config.soispha.programs.nixos-option; + in { + options.soispha.programs.nixos-option = { +- enable = libraries.base.options.mkEnable "nixos-option"; ++ enable = extra_lib.options.mkDefaultEnabled "nixos-option"; + }; + + config = lib.mkIf cfg.enable { +diff --git a/modules/by-name/nv/nvim/module.nix b/modules/by-name/nv/nvim/module.nix +index f6e2162e..e63c9565 100644 +--- a/modules/by-name/nv/nvim/module.nix ++++ b/modules/by-name/nv/nvim/module.nix +@@ -12,12 +12,12 @@ + lib, + config, + extra_modules, +- libraries, ++ extra_lib, + ... + }: let + cfg = config.soispha.programs.nvim; + +- plgs = builtins.attrValues (libraries.extra.mkByName { ++ plgs = builtins.attrValues (extra_lib.mkByName { + useShards = false; + baseDirectory = ./plgs; + fileName = "default.nix"; +diff --git a/modules/by-name/op/openssh/module.nix b/modules/by-name/op/openssh/module.nix +index 3182f7ba..e1464338 100644 +--- a/modules/by-name/op/openssh/module.nix ++++ b/modules/by-name/op/openssh/module.nix +@@ -1,13 +1,13 @@ + { + config, + lib, +- libraries, ++ extra_lib, + ... + }: let + cfg = config.vhack.openssh; + in { + options.vhack.openssh = { +- enable = libraries.base.options.mkEnable "openssh"; ++ enable = extra_lib.options.mkDefaultEnabled "openssh"; + }; + + config = lib.mkIf cfg.enable { +diff --git a/modules/by-name/pi/pipewire/module.nix b/modules/by-name/pi/pipewire/module.nix +index 57610806..df8eca0a 100644 +--- a/modules/by-name/pi/pipewire/module.nix ++++ b/modules/by-name/pi/pipewire/module.nix +@@ -10,13 +10,13 @@ + { + config, + lib, +- libraries, ++ extra_lib, + ... + }: let + cfg = config.soispha.pipewire; + in { + options.soispha.pipewire = { +- enable = libraries.base.options.mkEnable "pipewire and wireplumber"; ++ enable = extra_lib.options.mkDefaultEnabled "pipewire and wireplumber"; + }; + + config = lib.mkIf cfg.enable { +diff --git a/modules/by-name/pl/plymouth/module.nix b/modules/by-name/pl/plymouth/module.nix +index 5e4735b9..f64c9464 100644 +--- a/modules/by-name/pl/plymouth/module.nix ++++ b/modules/by-name/pl/plymouth/module.nix +@@ -11,13 +11,13 @@ + config, + pkgs, + lib, +- libraries, ++ extra_lib, + ... + }: let + cfg = config.soispha.services.plymouth; + in { + options.soispha.services.plymouth = { +- enable = libraries.base.options.mkEnable "plymouth"; ++ enable = extra_lib.options.mkDefaultEnabled "plymouth"; + }; + + config = lib.mkIf cfg.enable { +diff --git a/modules/by-name/ri/river/keymap.nix b/modules/by-name/ri/river/keymap.nix +index 897d11df..feabf379 100644 +--- a/modules/by-name/ri/river/keymap.nix ++++ b/modules/by-name/ri/river/keymap.nix +@@ -1,7 +1,7 @@ + { + lib, + pkgs, +- libraries, ++ extra_lib, + config, + ... + }: let +diff --git a/modules/by-name/ro/rofi/module.nix b/modules/by-name/ro/rofi/module.nix +index f2b404d6..ac23b499 100644 +--- a/modules/by-name/ro/rofi/module.nix ++++ b/modules/by-name/ro/rofi/module.nix +@@ -10,13 +10,13 @@ + { + config, + lib, +- libraries, ++ extra_lib, + ... + }: let + cfg = config.soispha.programs.rofi; + in { + options.soispha.programs.rofi = { +- enable = libraries.base.options.mkEnable "rofi"; ++ enable = extra_lib.options.mkDefaultEnabled "rofi"; + }; + + config = lib.mkIf cfg.enable { +diff --git a/modules/by-name/si/signal/module.nix b/modules/by-name/si/signal/module.nix +index 0e9c4437..e7cef901 100644 +--- a/modules/by-name/si/signal/module.nix ++++ b/modules/by-name/si/signal/module.nix +@@ -1,13 +1,13 @@ + { + config, + lib, +- libraries, ++ extra_lib, + ... + }: let + cfg = config.soispha.signal; + in { + options.soispha.signal = { +- enable = libraries.base.options.mkEnable "signal"; ++ enable = extra_lib.options.mkDefaultEnabled "signal"; + }; + config = lib.mkIf cfg.enable { + soispha.impermanence.userDirectories = [ +diff --git a/modules/by-name/so/sound/module.nix b/modules/by-name/so/sound/module.nix +index 06df63e5..67187ff3 100644 +--- a/modules/by-name/so/sound/module.nix ++++ b/modules/by-name/so/sound/module.nix +@@ -9,14 +9,14 @@ + # If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>. + { + config, +- libraries, ++ extra_lib, + lib, + ... + }: let + cfg = config.soispha.sound; + in { + options.soispha.sound = { +- enable = libraries.base.options.mkEnable "sound based on pipewire"; ++ enable = extra_lib.options.mkDefaultEnabled "sound based on pipewire"; + }; + + config = lib.mkIf cfg.enable { +diff --git a/modules/by-name/st/starship/module.nix b/modules/by-name/st/starship/module.nix +index a271d645..903f97b6 100644 +--- a/modules/by-name/st/starship/module.nix ++++ b/modules/by-name/st/starship/module.nix +@@ -11,13 +11,13 @@ + lib, + pkgs, + config, +- libraries, ++ extra_lib, + ... + }: let + cfg = config.soispha.programs.starship; + in { + options.soispha.programs.starship = { +- enable = libraries.base.options.mkEnable "starship"; ++ enable = extra_lib.options.mkDefaultEnabled "starship"; + + showBattery = lib.mkOption { + type = lib.types.bool; +diff --git a/modules/by-name/sw/swaybg/module.nix b/modules/by-name/sw/swaybg/module.nix +index fa6a079a..216a0c59 100644 +--- a/modules/by-name/sw/swaybg/module.nix ++++ b/modules/by-name/sw/swaybg/module.nix +@@ -11,13 +11,13 @@ + config, + lib, + pkgs, +- libraries, ++ extra_lib, + ... + }: let + cfg = config.soispha.programs.swaybg; + in { + options.soispha.programs.swaybg = { +- enable = libraries.base.options.mkEnable "swaybg"; ++ enable = extra_lib.options.mkDefaultEnabled "swaybg"; + }; + + config = lib.mkIf cfg.enable { +diff --git a/modules/by-name/sw/swayidle/module.nix b/modules/by-name/sw/swayidle/module.nix +index 9bda534f..953ec83f 100644 +--- a/modules/by-name/sw/swayidle/module.nix ++++ b/modules/by-name/sw/swayidle/module.nix +@@ -11,14 +11,14 @@ + config, + pkgs, + lib, +- libraries, ++ extra_lib, + ... + }: let + cfg = config.soispha.programs.swayidle; + swaylock = lib.getExe pkgs.swaylock; + in { + options.soispha.programs.swayidle = { +- enable = libraries.base.options.mkEnable "swayidle"; ++ enable = extra_lib.options.mkDefaultEnabled "swayidle"; + }; + + config = lib.mkIf cfg.enable { +-- +2.55.0 + |
