mirror of
https://github.com/buckley310/nixos-config.git
synced 2024-12-21 19:24:15 +00:00
move mfa to pofiles
This commit is contained in:
parent
fe9cd1b680
commit
73e40f81c6
3 changed files with 20 additions and 25 deletions
|
@ -5,7 +5,6 @@
|
||||||
./modules/baseline.nix
|
./modules/baseline.nix
|
||||||
./modules/cli.nix
|
./modules/cli.nix
|
||||||
./modules/gnome.nix
|
./modules/gnome.nix
|
||||||
./modules/mfa.nix
|
|
||||||
./modules/phpipam.nix
|
./modules/phpipam.nix
|
||||||
./modules/profiles.nix
|
./modules/profiles.nix
|
||||||
./modules/scansnap_s1300.nix
|
./modules/scansnap_s1300.nix
|
||||||
|
|
|
@ -1,24 +0,0 @@
|
||||||
{ pkgs, ... }:
|
|
||||||
let
|
|
||||||
pkcslib = "${pkgs.opensc}/lib/opensc-pkcs11.so";
|
|
||||||
in
|
|
||||||
{
|
|
||||||
services.pcscd.enable = true;
|
|
||||||
programs.ssh.startAgent = true;
|
|
||||||
programs.ssh.agentPKCS11Whitelist = pkcslib;
|
|
||||||
environment.systemPackages = [
|
|
||||||
pkgs.opensc
|
|
||||||
(pkgs.writeShellScriptBin "mfa" "exec ssh-add -s${pkcslib}")
|
|
||||||
];
|
|
||||||
|
|
||||||
nixpkgs.overlays = [
|
|
||||||
(self: super: {
|
|
||||||
gnome = super.gnome // {
|
|
||||||
gnome-keyring = super.gnome.gnome-keyring.overrideAttrs (old: {
|
|
||||||
configureFlags = old.configureFlags ++ [ "--disable-ssh-agent" ];
|
|
||||||
});
|
|
||||||
};
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
}
|
|
|
@ -2,6 +2,9 @@
|
||||||
with lib;
|
with lib;
|
||||||
let
|
let
|
||||||
cfg = config.sconfig.profile;
|
cfg = config.sconfig.profile;
|
||||||
|
|
||||||
|
pkcslib = "${pkgs.opensc}/lib/opensc-pkcs11.so";
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.sconfig.profile = mkOption {
|
options.sconfig.profile = mkOption {
|
||||||
|
@ -22,6 +25,20 @@ in
|
||||||
|
|
||||||
|
|
||||||
(mkIf (cfg == "desktop") {
|
(mkIf (cfg == "desktop") {
|
||||||
|
services.pcscd.enable = true;
|
||||||
|
programs.ssh.startAgent = true;
|
||||||
|
programs.ssh.agentPKCS11Whitelist = pkcslib;
|
||||||
|
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
(self: super: {
|
||||||
|
gnome = super.gnome // {
|
||||||
|
gnome-keyring = super.gnome.gnome-keyring.overrideAttrs (old: {
|
||||||
|
configureFlags = old.configureFlags ++ [ "--disable-ssh-agent" ];
|
||||||
|
});
|
||||||
|
};
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
brave
|
brave
|
||||||
gimp
|
gimp
|
||||||
|
@ -34,6 +51,9 @@ in
|
||||||
glxinfo
|
glxinfo
|
||||||
steam-run
|
steam-run
|
||||||
|
|
||||||
|
pkgs.opensc
|
||||||
|
(pkgs.writeShellScriptBin "mfa" "exec ssh-add -s${pkcslib}")
|
||||||
|
|
||||||
(vscode-with-extensions.override {
|
(vscode-with-extensions.override {
|
||||||
vscode = vscodium;
|
vscode = vscodium;
|
||||||
vscodeExtensions = with pkgs.vscode-extensions; [
|
vscodeExtensions = with pkgs.vscode-extensions; [
|
||||||
|
|
Loading…
Reference in a new issue