flake: inherit explicitly from parts of lib

Instea of doing `inherit (lib) <something>``, all inherits now use
`inherit (lib.<subsystem>) <something>`, which is much nicer.

hosts/default.nix

@@ -1,11 +1,12 @@
 inputs: let
   inherit (inputs) self;
-  inherit (inputs.nixpkgs) lib;
-  inherit (lib.lists) concatLists flatten singleton;
-  inherit (lib) nixosSystem recursiveUpdate;
   inherit (builtins) filter map toString;
+  inherit (inputs.nixpkgs) lib;
+  inherit (lib.attrsets) recursiveUpdate;
   inherit (lib.filesystem) listFilesRecursive;
+  inherit (lib.lists) concatLists flatten singleton;
   inherit (lib.strings) hasSuffix;
+  inherit (lib) nixosSystem;
   # NOTE: This was inspired by raf, and I find this
   # to be quite a sane way of managing all modules in my flake.
 

modules/options/system/monitors.nix

@@ -1,5 +1,5 @@
 {lib, ...}: let
-  inherit (lib) mkOption;
+  inherit (lib.options) mkOption;
   inherit (lib.types) submodule int ints number attrsOf ;
 in {
   options.modules.system.hardware.monitors = mkOption {

modules/options/system/networking/default.nix

@@ -1,5 +1,5 @@
 {lib, ...}: let
-  inherit (lib) mkEnableOption mkOption types;
+  inherit (lib.options) mkEnableOption;
 in {
   options.modules.system.networking = {
     nftbles.enable = mkEnableOption "Nftables firewall";

modules/options/system/programs/default.nix

@@ -1,5 +1,6 @@
 {lib, ...}: let
-  inherit (lib) mkEnableOption mkOption types;
+  inherit (lib.types) str enum;
+  inherit (lib.options) mkEnableOption mkOption;
 in {
   options.modules.system.programs = {
     editors = {
@@ -19,30 +20,30 @@ in {
 
     git = {
       signingKey = mkOption {
-        type = types.str;
+        type = str;
         default = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILPiRe9OH/VtWFWyy5QbAVcN7CLxr4zUtRCwmxD6aeN6";
         description = "The default gpg key used for signing commits";
       };
     };
     default = {
       terminal = mkOption {
-        type = types.enum ["foot" "kitty"];
+        type = enum ["foot" "kitty"];
         default = "foot";
       };
       fileManager = mkOption {
-        type = types.enum ["thunar" "dolphin" "nemo"];
+        type = enum ["thunar" "dolphin" "nemo"];
         default = "thunar";
       };
       browser = mkOption {
-        type = types.enum ["firefox" "librewolf" "chromium"];
+        type = enum ["firefox" "librewolf" "chromium"];
         default = "firefox";
       };
       editor = mkOption {
-        type = types.enum ["neovim" "helix" "emacs"];
+        type = enum ["neovim" "helix" "emacs"];
         default = "emacs";
       };
       launcher = mkOption {
-        type = types.enum ["anyrun" "rofi" "wofi"];
+        type = enum ["anyrun" "rofi" "wofi"];
         default = "anyrun";
       };
     };

modules/other/system.nix

@@ -1,10 +1,11 @@
 {lib, ...}: let
-  inherit (lib) mkOption types;
+  inherit (lib.options) mkOption;
+  inherit (lib.types) str;
 in {
   options.modules.other.system = {
     username = mkOption {
       description = "username for this system";
-      type = types.str;
+      type = str;
     };
   };
 }

modules/programs/cli/nh.nix

@@ -5,7 +5,8 @@
 }: let
   cfg = config.modules.programs.nh;
   inherit (config.modules.other.system) username;
-  inherit (lib) mkEnableOption mkIf;
+  inherit (lib.modules) mkIf;
+  inherit (lib.options) mkEnableOption;
 in {
   options.modules.programs.nh.enable = mkEnableOption "nh";
 

modules/programs/gui/foot.nix

@@ -4,11 +4,11 @@
   pkgs,
   ...
 }: let
+  inherit (lib.modules) mkIf;
+
+  inherit (config.meta.mainUser) username;
   cfg = config.modules.system.programs.terminals.foot;
   colours = config.modules.style.colorScheme.colors;
-  inherit (config.meta.mainUser) username;
-
-  inherit (lib) mkIf;
 
   foot-config = pkgs.writeText "foot.ini" (lib.generators.toINI {} {
     main = {

modules/programs/gui/minecraft.nix

@@ -4,9 +4,10 @@
   pkgs,
   ...
 }: let
-  cfg = config.modules.programs.minecraft;
   inherit (lib.options) mkEnableOption;
   inherit (lib.modules) mkIf;
+
+  cfg = config.modules.programs.minecraft;
 in {
   options.modules.programs.minecraft = {
     enable = mkEnableOption "minecraft";

modules/programs/tui/btop.nix

@@ -4,7 +4,9 @@
   pkgs,
   ...
 }: let
-  inherit (lib) mkEnableOption mkIf;
+  inherit (lib.options) mkEnableOption;
+  inherit (lib.modules) mkIf;
+
   cfg = config.modules.programs.btop;
 
   btop-settings = pkgs.writeTextDir "btop/btop.conf" ''

modules/services/kanata/module.nix

@@ -3,9 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.modules.services.kanata;
   inherit (lib.modules) mkIf;
   inherit (lib.options) mkEnableOption;
+
+  cfg = config.modules.services.kanata;
 in {
   options.modules.services.kanata.enable = mkEnableOption "kanata";
   config = mkIf cfg.enable {

modules/services/nextcloud/module.nix

@@ -6,6 +6,7 @@
 }: let
   inherit (lib.meta) getExe';
   inherit (lib.modules) mkIf;
+
   cfg = config.modules.system.services.nextcloud;
 in {
   options.modules.system.services.nextcloud.enable = lib.mkEnableOption "nextcloud";

modules/services/postgresql/module.nix

@@ -6,6 +6,7 @@
 }: let
   inherit (lib.modules) mkIf;
   inherit (lib.options) mkEnableOption;
+
   cfg = config.modules.system.services.database.postgresql;
 in {
   options.modules.system.services.database.postgresql.enable = mkEnableOption "postgresql";

modules/services/ssh.nix

@@ -1,5 +1,5 @@
 {lib, ...}: let
-  inherit (lib) mkEnableOption;
+  inherit (lib.options) mkEnableOption;
 in {
   options.modules.programs.ssh.enable = mkEnableOption "ssh";
   config = {

modules/style/colors.nix

@@ -11,9 +11,8 @@
   ...
 }: let
   inherit (lib.options) mkOption literalExpression;
-  inherit (lib.types) str nullOr enum mkOptionType attrsOf coercedTo;
   inherit (lib.strings) toLower replaceStrings removePrefix hasPrefix isString;
-  # inherit (lib) serializeTheme;
+  inherit (lib.types) str nullOr enum mkOptionType attrsOf coercedTo;
 
   cfg = config.modules.style;
 

modules/style/gtk.nix

@@ -4,9 +4,10 @@
   pkgs,
   ...
 }: let
+  inherit (lib.modules) mkIf;
   inherit (lib.options) mkOption mkEnableOption;
   inherit (lib.types) str package;
-  inherit (lib.modules) mkIf;
+
   cfg = config.modules.theming.gtk;
 in {
   options.modules.theming.gtk = {

modules/style/qt.nix

@@ -5,8 +5,9 @@
   ...
 }: let
   inherit (lib.modules) mkIf;
-  inherit (lib) mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.types) str package;
+
   cfg = config.modules.theming.qt;
 in {
   options.modules.theming.qt = {

modules/style/theming.nix

@@ -4,13 +4,16 @@
   pkgs,
   ...
 }: let
+  inherit (builtins) toString isBool;
+  inherit (lib.generators) toINI;
   inherit (lib.modules) mkMerge mkIf;
   inherit (lib.options) mkEnableOption;
-  cfg = config.modules.theming;
-  inherit (builtins) toString isBool;
-  inherit (lib) boolToString escape generators;
+  inherit (lib.strings) escape;
+  inherit (lib.trivial) boolToString;
 
-  toGtk3Ini = generators.toINI {
+  cfg = config.modules.theming;
+
+  toGtk3Ini = toINI {
     mkKeyValue = key: value: let
       value' =
         if isBool value

modules/system/boot/module.nix

@@ -5,8 +5,8 @@
   ...
 }: let
   inherit (lib.modules) mkForce;
-  inherit (lib.modules) mkIf;
   inherit (lib.options) mkEnableOption;
+
   cfg = config.modules.system.boot;
 in {
   options.modules.system.boot = {
@@ -31,6 +31,8 @@ in {
       };
       loader = {
         efi.canTouchEfiVariables = true;
+        # I love spamming space
+        timeout = 0;
         systemd-boot = {
           enable = cfg.systemd-boot.enable;
           editor = mkForce false;

modules/system/hardware/bluetooth.nix

@@ -4,8 +4,9 @@
   pkgs,
   ...
 }: let
+  inherit (lib.modules) mkIf;
+
   cfg = config.modules.system.hardware.bluetooth;
-  inherit (lib) mkIf;
 in {
   config = mkIf cfg.enable {
     hardware.bluetooth = {

modules/system/hardware/cpu/intel.nix

@@ -4,8 +4,7 @@
   pkgs,
   ...
 }: let
-  inherit (lib) mkDefault mkIf;
-  inherit (config.modules.system.video) nvidia amd;
+  inherit (lib.modules) mkDefault;
 in {
   hardware = {
     cpu.intel.updateMicrocode = mkDefault config.hardware.enableRedistributableFirmware;

modules/system/hardware/sound/pipewire/module.nix

@@ -3,8 +3,9 @@
   lib,
   ...
 }: let
+  inherit (lib.modules) mkIf;
+
   cfg = config.modules.system.sound;
-  inherit (lib) mkIf;
 in {
   config = mkIf cfg.enable {
     services.pipewire = {

modules/system/nix/module.nix

@@ -6,7 +6,8 @@
   pkgs,
   ...
 }: let
-  inherit (lib) mapAttrsToList mkForce;
+  inherit (lib.attrsets) mapAttrsToList;
+  inherit (lib.modules) mkForce;
 in {
   imports = [
     ./documentation.nix # nixos documentation

modules/system/os/impermanence/module.nix

@@ -4,7 +4,7 @@
   lib,
   ...
 }: let
-  inherit (lib) mkIf mkForce;
+  inherit (lib.modules) mkIf mkForce;
   inherit (builtins) map;
 
   cfg = config.modules.system.impermanence;

modules/system/os/networking/networkmanager.nix

@@ -1,5 +1,5 @@
 {lib, ...}: let
-  inherit (lib) mkForce;
+  inherit (lib.modules) mkForce;
 in {
   networking.networkmanager = {
     enable = true;

modules/system/os/security/sudo.nix

@@ -3,7 +3,7 @@
   pkgs,
   ...
 }: let
-  inherit (lib) mkForce mkDefault;
+  inherit (lib.modules) mkForce mkDefault;
 in {
   security = {
     sudo-rs.enable = mkForce false;

modules/wms/wayland/hyprland/binds.nix

@@ -1,10 +1,8 @@
 {
-  config,
   lib,
   pkgs,
   ...
 }: let
-  cfg = config.modules.desktops.hyprland;
   inherit (builtins) map genList toString;
   inherit (lib.meta) getExe getExe';
 in {
@@ -49,10 +47,10 @@ in {
         "$mainMod, V, togglespecialworkspace, audio"
 
         # Reload hyprland
-        "$mainMod, R, exec, ${cfg.package}/bin/hyprctl reload"
+        "$mainMod, R, exec, ${getExe' pkgs.hyprland "hyprctl"} reload"
 
         # Restart waybar
-        "$mainMod CONTROL, B, exec, ${pkgs.procps}/bin/pkill waybar || ${pkgs.waybar}/bin/waybar"
+        "$mainMod CONTROL, B, exec, ${pkgs.procps}/bin/pkill waybar || ${getExe pkgs.waybar}"
       ];
 
     binde = [

modules/wms/wayland/hyprland/module.nix

@@ -5,11 +5,11 @@
   pkgs,
   ...
 }: let
-  cfg = config.modules.desktops.hyprland;
-  # inherit (inputs.hyprsplit.packages.${pkgs.system}) hyprsplit;
-  inherit (lib.modules) mkIf mkDefault;
+  inherit (lib.modules) mkIf;
   inherit (lib.options) mkOption;
-  inherit (lib.types) bool enum package;
+  inherit (lib.types) bool;
+
+  cfg = config.modules.desktops.hyprland;
 in {
   imports = [
     ./binds.nix
@@ -19,8 +19,6 @@ in {
     ./workspaces.nix
     inputs.hyprland.nixosModules.default
   ];
-  # we disable the default hyprland module
-  # disabledModules = ["programs/hyprland.nix"];
 
   options.modules.desktops.hyprland = {
     enable = mkOption {
@@ -30,19 +28,6 @@ in {
         Whether to enable Hyprland wayland compositor.
       '';
     };
-
-    package = mkOption {
-      type = package;
-      default = pkgs.hyprland;
-      description = ''
-        The Hyprland package to be used.
-      '';
-    };
-    portalPackage = mkOption {
-      type = package;
-      default = pkgs.xdg-desktop-portal-hyprland;
-      description = "The hyprland portal package";
-    };
   };
 
   config = mkIf cfg.enable {
@@ -59,15 +44,14 @@ in {
     # xdg Portal
     xdg.portal = {
       enable = true;
-      configPackages = mkDefault [
-        pkgs.xdg-desktop-portal-hyprland
-      ];
+      xdgOpenUsePortal = true;
       extraPortals = [
         pkgs.xdg-desktop-portal-gtk
         pkgs.xdg-desktop-portal-hyprland
       ];
       config = {
-        common.default = ["gtk" "hyprland"];
+        common.default = ["*"];
+        hyprland.default = ["gtk" "hyprland"];
       };
     };
   };

modules/wms/wayland/hyprland/settings.nix

@@ -3,10 +3,11 @@
   lib,
   ...
 }: let
-  inherit (config.modules.system.hardware) monitors;
-  inherit (lib) mapAttrsToList;
   inherit (builtins) toString;
+  inherit (lib.attrsets) mapAttrsToList;
+
   inherit (config.modules.style.colorScheme) colors;
+  inherit (config.modules.system.hardware) monitors;
 in {
   config = {
     programs.hyprland = {

modules/wms/wayland/hyprland/workspaces.nix

@@ -3,9 +3,11 @@
   lib,
   ...
 }: let
-  inherit (config.modules.system.hardware) monitors;
-  inherit (lib) imap0 flatten optionalString;
   inherit (builtins) map genList attrNames toString;
+  inherit (lib.lists) imap0 flatten;
+  inherit (lib.strings) optionalString;
+
+  inherit (config.modules.system.hardware) monitors;
 in {
   programs.hyprland.settings = {
     # INFO: This is a custom function to map all of my monitors to workspaces.

modules/wms/wayland/variables.nix

@@ -3,8 +3,10 @@
   lib,
   ...
 }: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.options) mkEnableOption;
+
   cfg = config.modules.wms.wayland;
-  inherit (lib) mkIf mkEnableOption;
 in {
   options.modules.wms.wayland.enable = mkEnableOption "wayland";
   config = mkIf cfg.enable {

packages/helix.nix

@@ -32,7 +32,8 @@
   basedpyright,
   ...
 }: let
-  inherit (lib) getExe;
+  inherit (lib.meta) getExe;
+
   toml = formats.toml {};
   helix-config = {
     theme = "gruvbox";