From 2de023a52f1d5151c669df4883705226634455ed Mon Sep 17 00:00:00 2001 From: Veneficium <85629831+veneficium42@users.noreply.github.com> Date: Wed, 14 Aug 2024 21:47:01 +0200 Subject: [PATCH] fix: fix new modules formatting --- nixosModules/programs/gnupg.nix | 8 +++++--- nixosModules/services/pam.nix | 14 ++++++++------ nixosModules/users/fedfer.nix | 12 +++++++----- nixosModules/users/veneficium.nix | 10 ++++++---- 4 files changed, 26 insertions(+), 18 deletions(-) diff --git a/nixosModules/programs/gnupg.nix b/nixosModules/programs/gnupg.nix index 27b851c..6a00eee 100644 --- a/nixosModules/programs/gnupg.nix +++ b/nixosModules/programs/gnupg.nix @@ -4,8 +4,10 @@ programs.gnupg.ssh = lib.mkEnableOption "enable gnuPG ssh integration"; }; - programs.gnupg.agent = lib.mkIf config.settings.programs.gnupg.enable { - enable = true; - enableSSHSupport = config.settings.programs.gnupg.ssh; + config = lib.mkIf config.settings.programs.gnupg.enable { + programs.gnupg.agent = { + enable = true; + enableSSHSupport = config.settings.programs.gnupg.ssh; + }; }; } \ No newline at end of file diff --git a/nixosModules/services/pam.nix b/nixosModules/services/pam.nix index c95c403..85e4d4e 100644 --- a/nixosModules/services/pam.nix +++ b/nixosModules/services/pam.nix @@ -5,12 +5,14 @@ services.pam.sshd.gnupg = lib.mkEnableOption "enable gnuPG integration"; }; - security.pam = lib.mkIf config.settings.services.pam.enable { - services.sshd = { - name = "sshd"; - unixAuth = true; - googleAuthenticator.enable = config.settings.services.pam.sshd.useGoogleAuth; - gnupg.enable = config.settings.services.pam.sshd.gnupg; + config = lib.mkIf config.settings.services.pam.enable { + security.pam = { + services.sshd = { + name = "sshd"; + unixAuth = true; + googleAuthenticator.enable = config.settings.services.pam.sshd.useGoogleAuth; + gnupg.enable = config.settings.services.pam.sshd.gnupg; + }; }; }; } \ No newline at end of file diff --git a/nixosModules/users/fedfer.nix b/nixosModules/users/fedfer.nix index 0794312..376947a 100644 --- a/nixosModules/users/fedfer.nix +++ b/nixosModules/users/fedfer.nix @@ -4,10 +4,12 @@ users.fedfer.enable = lib.mkEnableOption "enables user FedFer"; }; - users.users.fedfer = lib.mkIf config.settings.users.fedfer.enable { - isNormalUser = true; - description = "FedFer"; - extraGroups = [ "networkmanager" "wheel" ]; - shell = pkgs.zsh; + config = lib.mkIf config.settings.users.fedfer.enable { + users.users.fedfer = { + isNormalUser = true; + description = "FedFer"; + extraGroups = [ "networkmanager" "wheel" ]; + shell = pkgs.zsh; + }; }; } diff --git a/nixosModules/users/veneficium.nix b/nixosModules/users/veneficium.nix index 9096813..7b2437b 100644 --- a/nixosModules/users/veneficium.nix +++ b/nixosModules/users/veneficium.nix @@ -3,9 +3,11 @@ users.veneficium.enable = lib.mkEnableOption "enables user Veneficium"; }; - users.users.veneficium = lib.mkIf config.settings.users.veneficium.enable { - isNormalUser = true; - description = "Veneficium"; - extraGroups = [ "networkmanager" "wheel" ]; + config = lib.mkIf config.settings.users.veneficium.enable { + users.users.veneficium = { + isNormalUser = true; + description = "Veneficium"; + extraGroups = [ "networkmanager" "wheel" ]; + }; }; } \ No newline at end of file