poz/niksos
poz/niksos
1
3
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix lib.options inherits xd

Browse source
This commit is contained in:
jacekpoz 2024-07-25 11:45:44 +02:00
parent 2691ecfef0
commit 2934d74517
Signed by: poz
SSH key fingerprint: SHA256:JyLeVWE4bF3tDnFeUpUaJsPsNlJyBldDGV/dIKSLyN8
37 changed files with 73 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/cli/agenix.nix
View file

@ -9,7 +9,8 @@
inherit (config.myOptions.other.system) username;
inherit (lib.modules) mkEnableOption mkIf;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption;
in {
options.myOptions.programs.agenix = {
enable = mkEnableOption "agenix";

3
modules/cli/git.nix
View file

@ -8,7 +8,8 @@
inherit (config.myOptions.other.system) username;
inherit (lib.meta) getExe;
inherit (lib.modules) mkEnableOption mkIf mkOption;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.types) nullOr str;
delta = getExe pkgs.delta;

3
modules/cli/nh.nix
View file

@ -7,7 +7,8 @@
}: let
cfg = config.myOptions.programs.nh;
inherit (lib.modules) mkEnableOption mkIf mkOption;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.types) str;
in {
options.myOptions.programs.nh = {

3
modules/cli/starship.nix
View file

@ -6,7 +6,8 @@
cfg = config.myOptions.programs.starship;
inherit (config.myOptions.other.system) username;
inherit (lib.modules) mkEnableOption mkIf;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption;
in {
options.myOptions.programs.starship.enable = mkEnableOption "starship";

3
modules/cli/zoxide.nix
View file

@ -6,7 +6,8 @@
cfg = config.myOptions.programs.starship;
inherit (config.myOptions.other.system) username;
inherit (lib.modules) mkEnableOption mkIf;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption;
in {
options.myOptions.programs.zoxide.enable = mkEnableOption "zoxide";

3
modules/cli/zsh.nix
View file

@ -7,7 +7,8 @@
cfg = config.myOptions.programs.zsh;
inherit (config.myOptions.other.system) username;
inherit (lib.modules) mkEnableOption mkIf mkOption;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.types) attrs bool;
in {
options.myOptions.programs.zsh = {

3
modules/gui/anyrun.nix
View file

@ -8,7 +8,8 @@
cfg = config.myOptions.programs.anyrun;
inherit (config.myOptions.other.system) username;
inherit (lib.modules) mkEnableOption mkIf;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption;
in {
options.myOptions.programs.anyrun.enable = mkEnableOption "anyrun";

3
modules/gui/cursor.nix
View file

@ -6,7 +6,8 @@
cfg = config.myOptions.themes.cursor;
inherit (config.myOptions.other.system) username;
inherit (lib.modules) mkEnableOption mkIf mkOption;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.types) int package str;
in {
options.myOptions.themes.cursor = {

3
modules/gui/firefox.nix
View file

@ -9,7 +9,8 @@
inherit (config.myOptions.other.system) username;
inherit (lib.meta) getExe;
inherit (lib.modules) mkEnableOption mkIf mkOption;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.types) attrsOf listOf str submodule;
inherit (lib.attrsets) mapAttrs mapAttrsToList;

3
modules/gui/foot.nix
View file

@ -9,7 +9,8 @@
inherit (config.myOptions.other.system) username;
inherit (lib.meta) getExe getExe';
inherit (lib.modules) mkEnableOption mkIf;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption;
notify-send = getExe pkgs.libnotify;
xdg-open = getExe' pkgs.xdg-utils "xdg-open";

3
modules/gui/gtk.nix
View file

@ -7,7 +7,8 @@
inherit (config.myOptions.other.system) username;
hmCfg = config.home-manager.users.${username};
inherit (lib.modules) mkEnableOption mkIf mkOption;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.types) package str submodule;
in {
options.myOptions.themes.gtk = {

3
modules/gui/gtklock.nix
View file

@ -7,7 +7,8 @@
cfg = config.myOptions.programs.gtklock;
inherit (config.myOptions.other.system) username;
inherit (lib.modules) mkEnableOption mkIf;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption;
in {
options.myOptions.programs.gtklock.enable = mkEnableOption "gtklock";

3
modules/gui/hypr/idle.nix
View file

@ -10,7 +10,8 @@
inherit (config.myOptions.other.system) username;
inherit (lib.meta) getExe getExe';
inherit (lib.modules) mkEnableOption mkIf;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption;
loginctl = getExe' pkgs.systemd "loginctl";
in {

3
modules/gui/hypr/land.nix
View file

@ -12,7 +12,8 @@
inherit (lib.attrsets) mapAttrsToList;
inherit (lib.lists) elem optionals;
inherit (lib.meta) getExe getExe';
inherit (lib.modules) mkEnableOption mkIf mkOption;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.strings) removeSuffix;
inherit (lib.types) bool listOf nullOr package path str submodule;

3
modules/gui/hypr/lock.nix
View file

@ -8,7 +8,8 @@
cfg = config.myOptions.programs.hypr.lock;
inherit (config.myOptions.other.system) username;
inherit (lib.modules) mkEnableOption mkIf mkOption;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.types) attrs;
text_color = "rgba(eae0e4FF)";

3
modules/gui/mpv.nix
View file

@ -7,7 +7,8 @@
cfg = config.myOptions.programs.mpv;
inherit (config.myOptions.other.system) username;
inherit (lib.modules) mkEnableOption mkIf mkOption;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.types) nullOr str;
in {
options.myOptions.programs.mpv = {

3
modules/gui/qt.nix
View file

@ -7,7 +7,8 @@
cfg = config.myOptions.themes.qt;
inherit (config.myOptions.other.system) username;
inherit (lib.modules) mkEnableOption mkIf mkOption;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.types) package str;
in {
options.myOptions.themes.qt = {

3
modules/gui/quickshell/default.nix
View file

@ -10,7 +10,8 @@
inherit (lib.attrsets) filterAttrs mapAttrsToList;
inherit (lib.lists) elem;
inherit (lib.modules) mkEnableOption mkIf mkOption;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.strings) concatStrings;
inherit (lib.types) attrsOf listOf path str;

3
modules/gui/schizofox.nix
View file

@ -7,7 +7,8 @@
cfg = config.myOptions.programs.schizofox;
inherit (config.myOptions.other.system) username;
inherit (lib.modules) mkEnableOption mkIf;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption;
in {
options.myOptions.programs.schizofox = {
enable = mkEnableOption "schizofox";

3
modules/gui/swaylock.nix
View file

@ -8,7 +8,8 @@
cfg = config.myOptions.programs.swaylock;
inherit (config.myOptions.other.system) username;
inherit (lib.modules) mkEnableOption mkIf;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption;
in {
options.myOptions.programs.swaylock.enable = mkEnableOption "swaylock";

3
modules/gui/vesktop/default.nix
View file

@ -7,7 +7,8 @@
cfg = config.myOptions.programs.vesktop;
inherit (config.myOptions.other.system) username;
inherit (lib.modules) mkEnableOption mkIf;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption;
inherit (lib.strings) concatStrings;
in {
options.myOptions.programs.vesktop = {

3
modules/gui/zathura.nix
View file

@ -7,7 +7,8 @@
cfg = config.myOptions.programs.zathura;
inherit (config.myOptions.other.system) username;
inherit (lib.modules) mkEnableOption mkIf;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption;
in {
options.myOptions.programs.zathura.enable = mkEnableOption "zathura";

3
modules/other/hardware.nix
View file

@ -6,7 +6,8 @@
cfg = config.myOptions.other.hardware;
inherit (lib.attrsets) mapAttrsToList;
inherit (lib.modules) mkIf mkOption;
inherit (lib.modules) mkIf;
inherit (lib.options) mkOption;
inherit (lib.types) attrsOf float int submodule;
inherit (lib.types.ints) positive;
in {

3
modules/other/home-manager.nix
View file

@ -8,7 +8,8 @@
cfg = config.myOptions.other.home-manager;
inherit (config.myOptions.other.system) username;
inherit (lib.modules) mkEnableOption mkIf;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption;
in {
options.myOptions.other.home-manager = {
enable = mkEnableOption "home-manager";

2
modules/other/system.nix
View file

@ -5,7 +5,7 @@
}: let
cfg = config.myOptions.other.system;
inherit (lib.modules) mkOption;
inherit (lib.options) mkOption;
inherit (lib.types) str;
in {
options.myOptions.other.system = {

3
modules/services/anki-sync-server.nix
View file

@ -7,7 +7,8 @@
cfg = config.services.anki-sync-server;
inherit (lib.meta) getExe';
inherit (lib.modules) mkEnableOption mkIf mkOption;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.types) bool package port str;
in {
options.services.anki-sync-server = {

3
modules/services/dunst.nix
View file

@ -9,7 +9,8 @@
inherit (config.myOptions.other.system) username;
inherit (lib.meta) getExe getExe';
inherit (lib.modules) mkEnableOption mkIf;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption;
xdg-open = getExe' pkgs.xdg-utils "xdg-open";
in {

3
modules/services/fcitx/default.nix
View file

@ -7,7 +7,8 @@
cfg = config.myOptions.services.fcitx5;
inherit (config.myOptions.other.system) username;
inherit (lib.modules) mkEnableOption mkIf;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption;
in {
# stolen from https://git.outfoxxed.me/outfoxxed/nixnew/src/branch/master/modules/user/modules/fcitx5
options.myOptions.services.fcitx5.enable = mkEnableOption "fcitx5";

3
modules/services/greetd.nix
View file

@ -9,7 +9,8 @@
inherit (config.myOptions.other.system) username;
inherit (lib.meta) getExe getExe';
inherit (lib.modules) mkEnableOption mkIf mkOption;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.strings) concatStringsSep;
inherit (lib.types) listOf str;

3
modules/services/mpd.nix
View file

@ -6,7 +6,8 @@
cfg = config.myOptions.services.mpd;
inherit (config.myOptions.other.system) username;
inherit (lib.modules) mkEnableOption mkIf mkOption;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.types) str;
in {
options.myOptions.services.mpd = {

3
modules/services/pipewire.nix
View file

@ -5,7 +5,8 @@
}: let
cfg = config.myOptions.services.pipewire;
inherit (lib.modules) mkEnableOption mkIf;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption;
in {
options.myOptions.services.pipewire.enable = mkEnableOption "pipewire";

3
modules/services/ssh.nix
View file

@ -7,7 +7,8 @@
cfg = config.myOptions.services.ssh;
inherit (lib.meta) getExe';
inherit (lib.modules) mkEnableOption mkIf mkMerge mkOption;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.types) attrsOf bool nullOr number str submodule;
inherit (lib.strings) concatStrings;
inherit (lib.attrsets) mapAttrsToList;

3
modules/services/syncthing.nix
View file

@ -8,7 +8,8 @@
hmCfg = config.home-manager.users.${username};
configDir = config.home-manager.users.${username}.xdg.configHome;
inherit (lib.modules) mkEnableOption mkIf mkOption;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.types) attrs;
in {
options.myOptions.services.syncthing = {

3
modules/tui/btop.nix
View file

@ -6,7 +6,8 @@
cfg = config.myOptions.programs.btop;
inherit (config.myOptions.other.system) username;
inherit (lib.modules) mkEnableOption mkIf;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption;
in {
options.myOptions.programs.btop.enable = mkEnableOption "btop";

3
modules/tui/helix.nix
View file

@ -9,7 +9,8 @@
inherit (config.myOptions.other.system) username;
inherit (lib.meta) getExe getExe';
inherit (lib.modules) mkEnableOption mkIf;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption;
inherit (lib.strings) makeBinPath;
clangd = getExe' pkgs.clang-tools "clangd";

3
modules/tui/neovim.nix
View file

@ -8,7 +8,8 @@
cfg = config.myOptions.programs.neovim;
inherit (config.myOptions.other.system) username;
inherit (lib.modules) mkEnableOption mkIf;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption;
in {
options.myOptions.programs.neovim.enable = mkEnableOption "neovim";

3
modules/tui/newsboat.nix
View file

@ -6,7 +6,8 @@
cfg = config.myOptions.programs.newsboat;
inherit (config.myOptions.other.system) username;
inherit (lib.modules) mkEnableOption mkIf;
inherit (lib.modules) mkIf;
inherit (lib.options) mkEnableOption;
in {
options.myOptions.programs.newsboat.enable = mkEnableOption "newsboat";