From 3818dd2564e1da4da8a7d47703bf045196e9cb27 Mon Sep 17 00:00:00 2001 From: Jo Date: Wed, 25 Feb 2026 02:17:41 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20lib.(mkOpt,mkBool)=20->=20?= =?UTF-8?q?lib.options.(mkOpt,mkBool)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- homes/x86_64-linux/cyn/default.nix | 8 ++------ lib/options/default.nix | 7 +++++-- modules/home/apps/firefox/default.nix | 2 +- modules/home/cli/git/default.nix | 2 +- modules/home/desktop/gnome/default.nix | 2 +- modules/home/profile/default.nix | 2 +- modules/home/security/ssh/default.nix | 4 +++- modules/home/themes/catppuccin/default.nix | 2 +- modules/nixos/services/atticd/default.nix | 2 +- modules/nixos/services/default.nix | 2 +- modules/nixos/services/duckdns/default.nix | 2 +- modules/nixos/services/homepage/default.nix | 2 +- modules/nixos/services/traefik/default.nix | 2 +- modules/nixos/services/vaultwarden/default.nix | 2 +- modules/nixos/system/kernel/default.nix | 2 +- modules/nixos/system/nix/default.nix | 2 +- modules/nixos/system/shell/default.nix | 2 +- modules/nixos/users/default.nix | 16 ++++++++-------- 18 files changed, 32 insertions(+), 31 deletions(-) diff --git a/homes/x86_64-linux/cyn/default.nix b/homes/x86_64-linux/cyn/default.nix index b1acf37..abd4425 100644 --- a/homes/x86_64-linux/cyn/default.nix +++ b/homes/x86_64-linux/cyn/default.nix @@ -1,5 +1,4 @@ { - pkgs, config, ... }: @@ -10,10 +9,7 @@ email = "system@thevoid.cafe"; sshKeyFile = "${config.home.homeDirectory}/.ssh/id_ed25519"; }; - }; - home.packages = with pkgs; [ - ### Tools - git - ]; + cli.git.enable = true; + }; } diff --git a/lib/options/default.nix b/lib/options/default.nix index b03c1c6..9de9d8f 100644 --- a/lib/options/default.nix +++ b/lib/options/default.nix @@ -2,17 +2,20 @@ lib, ... }: -{ +let # Create a NixOS module option on a single line. mkOpt = type: default: description: lib.mkOption { inherit type default description; }; - # Create a simple bool options + # Create a simple boolean option. mkBool = default: description: lib.mkOption { inherit default description; type = lib.types.bool; }; +in +{ + options = { inherit mkOpt mkBool; }; } diff --git a/modules/home/apps/firefox/default.nix b/modules/home/apps/firefox/default.nix index b5605a8..253b33c 100644 --- a/modules/home/apps/firefox/default.nix +++ b/modules/home/apps/firefox/default.nix @@ -6,7 +6,7 @@ ... }: let - inherit (self.lib) mkOpt; + inherit (self.lib.options) mkOpt; inherit (lib) mkEnableOption types mkIf; cfg = config.${namespace}.apps.firefox; diff --git a/modules/home/cli/git/default.nix b/modules/home/cli/git/default.nix index a90fdec..70add7f 100644 --- a/modules/home/cli/git/default.nix +++ b/modules/home/cli/git/default.nix @@ -8,7 +8,7 @@ }: let inherit (lib) mkEnableOption mkIf; - inherit (self.lib) mkBool; + inherit (self.lib.options) mkBool; cfg = config.${namespace}.cli.git; profile = config.${namespace}.profile; diff --git a/modules/home/desktop/gnome/default.nix b/modules/home/desktop/gnome/default.nix index 3c2ed11..03ef446 100644 --- a/modules/home/desktop/gnome/default.nix +++ b/modules/home/desktop/gnome/default.nix @@ -9,7 +9,7 @@ }: let inherit (lib) mkIf; - inherit (self.lib) mkOpt; + inherit (self.lib.options) mkOpt; cfg = config.${namespace}.desktop.gnome; in diff --git a/modules/home/profile/default.nix b/modules/home/profile/default.nix index fb20939..74245cf 100644 --- a/modules/home/profile/default.nix +++ b/modules/home/profile/default.nix @@ -6,7 +6,7 @@ ... }: let - inherit (self.lib) mkOpt; + inherit (self.lib.options) mkOpt; inherit (lib) types; cfg = config.${namespace}.profile; diff --git a/modules/home/security/ssh/default.nix b/modules/home/security/ssh/default.nix index 60fc315..2057361 100644 --- a/modules/home/security/ssh/default.nix +++ b/modules/home/security/ssh/default.nix @@ -7,7 +7,7 @@ }: let inherit (lib) mkEnableOption mkIf types; - inherit (self.lib) mkOpt; + inherit (self.lib.options) mkOpt; cfg = config.${namespace}.security.ssh; profile = config.${namespace}.profile; @@ -23,9 +23,11 @@ in services.ssh-agent.enable = true; programs.ssh = { enable = true; + enableDefaultConfig = false; matchBlocks = { "*" = { + userKnownHostsFile = "~/.ssh/known_hosts"; identityFile = profile.sshKeyFile; addKeysToAgent = "yes"; }; diff --git a/modules/home/themes/catppuccin/default.nix b/modules/home/themes/catppuccin/default.nix index 2c452c6..440288f 100644 --- a/modules/home/themes/catppuccin/default.nix +++ b/modules/home/themes/catppuccin/default.nix @@ -9,7 +9,7 @@ }: let inherit (lib) mkEnableOption types mkIf; - inherit (self.lib) mkOpt; + inherit (self.lib.options) mkOpt; palette = (pkgs.lib.importJSON (config.catppuccin.sources.palette + "/palette.json")) diff --git a/modules/nixos/services/atticd/default.nix b/modules/nixos/services/atticd/default.nix index 3368d2b..c9b4d8a 100644 --- a/modules/nixos/services/atticd/default.nix +++ b/modules/nixos/services/atticd/default.nix @@ -7,7 +7,7 @@ }: let inherit (lib) mkEnableOption mkIf types; - inherit (self.lib) mkOpt; + inherit (self.lib.options) mkOpt; cfg = config.${namespace}.services.atticd; in diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index 4baf70a..4e44935 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -6,7 +6,7 @@ }: let inherit (lib) types; - inherit (self.lib) mkOpt; + inherit (self.lib.options) mkOpt; in { options.${namespace}.services = { diff --git a/modules/nixos/services/duckdns/default.nix b/modules/nixos/services/duckdns/default.nix index fee2e29..a498cc8 100644 --- a/modules/nixos/services/duckdns/default.nix +++ b/modules/nixos/services/duckdns/default.nix @@ -7,7 +7,7 @@ }: let inherit (lib) mkEnableOption mkIf types; - inherit (self.lib) mkOpt; + inherit (self.lib.options) mkOpt; cfg = config.${namespace}.services.duckdns; in diff --git a/modules/nixos/services/homepage/default.nix b/modules/nixos/services/homepage/default.nix index 515483b..8424cb2 100644 --- a/modules/nixos/services/homepage/default.nix +++ b/modules/nixos/services/homepage/default.nix @@ -7,7 +7,7 @@ }: let inherit (lib) mkEnableOption mkIf types; - inherit (self.lib) mkOpt; + inherit (self.lib.options) mkOpt; cfg = config.${namespace}.services.homepage; in diff --git a/modules/nixos/services/traefik/default.nix b/modules/nixos/services/traefik/default.nix index 2119ce9..3dce18b 100644 --- a/modules/nixos/services/traefik/default.nix +++ b/modules/nixos/services/traefik/default.nix @@ -7,7 +7,7 @@ }: let inherit (lib) mkEnableOption mkIf types; - inherit (self.lib) mkOpt; + inherit (self.lib.options) mkOpt; cfg = config.${namespace}.services.traefik; in diff --git a/modules/nixos/services/vaultwarden/default.nix b/modules/nixos/services/vaultwarden/default.nix index 3e5d02b..644d298 100644 --- a/modules/nixos/services/vaultwarden/default.nix +++ b/modules/nixos/services/vaultwarden/default.nix @@ -7,7 +7,7 @@ }: let inherit (lib) mkEnableOption mkIf types; - inherit (self.lib) mkOpt; + inherit (self.lib.options) mkOpt; cfg = config.${namespace}.services.vaultwarden; in diff --git a/modules/nixos/system/kernel/default.nix b/modules/nixos/system/kernel/default.nix index 0664f61..06c6390 100644 --- a/modules/nixos/system/kernel/default.nix +++ b/modules/nixos/system/kernel/default.nix @@ -8,7 +8,7 @@ }: let inherit (lib) mkEnableOption mkIf; - inherit (self.lib) mkOpt; + inherit (self.lib.options) mkOpt; cfg = config.${namespace}.system.kernel; in diff --git a/modules/nixos/system/nix/default.nix b/modules/nixos/system/nix/default.nix index 3b029d4..10dc423 100644 --- a/modules/nixos/system/nix/default.nix +++ b/modules/nixos/system/nix/default.nix @@ -8,7 +8,7 @@ }: let inherit (lib) mkEnableOption mkIf types; - inherit (self.lib) mkOpt; + inherit (self.lib.options) mkOpt; cfg = config.${namespace}.system.nix; in diff --git a/modules/nixos/system/shell/default.nix b/modules/nixos/system/shell/default.nix index 7e59a60..5e82c59 100644 --- a/modules/nixos/system/shell/default.nix +++ b/modules/nixos/system/shell/default.nix @@ -8,7 +8,7 @@ }: let inherit (lib) mkEnableOption mkIf types; - inherit (self.lib) mkOpt; + inherit (self.lib.options) mkOpt; cfg = config.${namespace}.system.shell; in diff --git a/modules/nixos/users/default.nix b/modules/nixos/users/default.nix index ae162b3..6c5f31a 100644 --- a/modules/nixos/users/default.nix +++ b/modules/nixos/users/default.nix @@ -14,7 +14,7 @@ let mkOption mkIf ; - inherit (self.lib) filesystem; + inherit (self.lib) filesystem options; # The identifier of the current system type, e.g. "x86_64-linux" or "aarch64-darwin" system = pkgs.stdenv.hostPlatform.system; @@ -23,22 +23,22 @@ let userSubmodule = types.submodule { options = { enable = mkEnableOption "this user."; - isNormalUser = self.lib.mkBool true "Whether this user is considered a normal user."; - isSystemUser = self.lib.mkBool false "Whether this user is considered a system user."; + isNormalUser = options.mkBool true "Whether this user is considered a normal user."; + isSystemUser = options.mkBool false "Whether this user is considered a system user."; initialPassword = - self.lib.mkOpt (types.nullOr types.str) null + options.mkOpt (types.nullOr types.str) null "Plaintext insecure initial user password, generally not recommended."; password = - self.lib.mkOpt (types.nullOr types.str) null + options.mkOpt (types.nullOr types.str) null "Plaintext insecure user password, generally not recommended."; hashedPasswordFile = - self.lib.mkOpt (types.nullOr types.str) null + options.mkOpt (types.nullOr types.str) null "Secure, hashed user password stored in a separate file, recommended for production."; hashedPassword = - self.lib.mkOpt (types.nullOr types.str) null + options.mkOpt (types.nullOr types.str) null "Hashed password, stored in plaintext, generally not recommended."; extraGroups = - self.lib.mkOpt (types.listOf types.str) [ ] + options.mkOpt (types.listOf types.str) [ ] "List of additional groups this user belongs to."; }; }; -- 2.51.2