mirror of
https://github.com/Jokiller230/puzzlevision.git
synced 2024-12-04 20:05:00 +01:00
fix: disable git warn-dirty messages
feat: finish yubikey login and sudo requests setup
This commit is contained in:
parent
6443c085d4
commit
9a1f243b49
4 changed files with 50 additions and 14 deletions
|
@ -8,14 +8,14 @@
|
||||||
let
|
let
|
||||||
cfg = config.${namespace}.common.fonts;
|
cfg = config.${namespace}.common.fonts;
|
||||||
in {
|
in {
|
||||||
options.${namespace}.common.fonts = {
|
options.${namespace}.common.fonts = with types; {
|
||||||
enable = mkEnableOption "Enable system font management";
|
enable = mkEnableOption "Enable system font management";
|
||||||
#fonts = mkOption {
|
fonts = mkOption {
|
||||||
# type = types.package;
|
type = listOf package;
|
||||||
# default = noto-fonts;
|
default = with pkgs; [ noto-fonts noto-fonts-cjk-sans noto-fonts-cjk-serif noto-fonts-emoji nerdfonts ];
|
||||||
# example = [ noto-fonts noto-fonts-emoji ];
|
example = [ noto-fonts noto-fonts-emoji ];
|
||||||
# description = "Install additional font packages";
|
description = "Install additional font packages";
|
||||||
#};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
|
@ -25,12 +25,6 @@ in {
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [ font-manager ];
|
environment.systemPackages = with pkgs; [ font-manager ];
|
||||||
|
|
||||||
fonts.packages = with pkgs; [
|
fonts.packages = cfg.fonts;
|
||||||
noto-fonts
|
|
||||||
noto-fonts-cjk-sans
|
|
||||||
noto-fonts-cjk-serif
|
|
||||||
noto-fonts-emoji
|
|
||||||
nerdfonts
|
|
||||||
]; # ++ cfg.fonts;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,6 +22,7 @@ in {
|
||||||
keep-derivations = true;
|
keep-derivations = true;
|
||||||
keep-outputs = true;
|
keep-outputs = true;
|
||||||
max-jobs = "auto";
|
max-jobs = "auto";
|
||||||
|
warn-dirty = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Garbage collection configuration.
|
# Garbage collection configuration.
|
||||||
|
|
40
modules/nixos/security/yubikey/default.nix
Normal file
40
modules/nixos/security/yubikey/default.nix
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
namespace,
|
||||||
|
...
|
||||||
|
}: with lib; with lib.${namespace};
|
||||||
|
let
|
||||||
|
cfg = config.${namespace}.security.yubikey;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options.${namespace}.security.yubikey = with types; {
|
||||||
|
enable = mkEnableOption "Enable the Yubikey as a security device.";
|
||||||
|
key-id = mkOption {
|
||||||
|
type = listOf str;
|
||||||
|
default = [ "30650551" ];
|
||||||
|
example = [ "123456" "1234567" ];
|
||||||
|
description = "Register additional Yubikey IDs.";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
environment.systemPackages = with pkgs; [ yubikey-manager yubioath-flutter ];
|
||||||
|
|
||||||
|
services.udev.packages = [ pkgs.yubikey-personalization ];
|
||||||
|
services.pcscd.enable = true;
|
||||||
|
|
||||||
|
programs.gnupg.agent = {
|
||||||
|
enable = true;
|
||||||
|
enableSSHSupport = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
security.pam.yubico = {
|
||||||
|
enable = true;
|
||||||
|
debug = false;
|
||||||
|
mode = "challenge-response";
|
||||||
|
id = cfg.key-id;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -51,6 +51,7 @@
|
||||||
# Set system configuration
|
# Set system configuration
|
||||||
puzzlevision = {
|
puzzlevision = {
|
||||||
archetypes.workstation.enable = true;
|
archetypes.workstation.enable = true;
|
||||||
|
security.yubikey.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Enable flatpak support.
|
# Enable flatpak support.
|
||||||
|
|
Loading…
Reference in a new issue