From 0474fd9802890e10cc73e743cf7987004e2279a6 Mon Sep 17 00:00:00 2001 From: Martin Berg Alstad Date: Tue, 15 Apr 2025 12:58:35 +0200 Subject: [PATCH] :sparkles: Moved yubikey config to security dir and rename --- flake.lock | 21 ------------------- shared/modules/default.nix | 2 +- shared/modules/security/default.nix | 5 +++++ .../{security.nix => security/yubikey.nix} | 3 ++- 4 files changed, 8 insertions(+), 23 deletions(-) create mode 100644 shared/modules/security/default.nix rename shared/modules/{security.nix => security/yubikey.nix} (88%) diff --git a/flake.lock b/flake.lock index 7ab72e3..d3eca85 100644 --- a/flake.lock +++ b/flake.lock @@ -509,31 +509,10 @@ "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", - "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix", "zen-browser": "zen-browser" } }, - "sops-nix": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744103455, - "narHash": "sha256-SR6+qjkPjGQG+8eM4dCcVtss8r9bre/LAxFMPJpaZeU=", - "owner": "mic92", - "repo": "sops-nix", - "rev": "69d5a5a4635c27dae5a742f36108beccc506c1ba", - "type": "github" - }, - "original": { - "owner": "mic92", - "repo": "sops-nix", - "type": "github" - } - }, "spicetify-nix": { "inputs": { "nixpkgs": [ diff --git a/shared/modules/default.nix b/shared/modules/default.nix index c9e72c8..c9f43ed 100644 --- a/shared/modules/default.nix +++ b/shared/modules/default.nix @@ -17,7 +17,7 @@ ./office.nix ./hyprland ./sddm.nix - ./security.nix + ./security ./shell.nix ./social.nix ./users.nix diff --git a/shared/modules/security/default.nix b/shared/modules/security/default.nix new file mode 100644 index 0000000..4fdd9fd --- /dev/null +++ b/shared/modules/security/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./yubikey.nix + ]; +} diff --git a/shared/modules/security.nix b/shared/modules/security/yubikey.nix similarity index 88% rename from shared/modules/security.nix rename to shared/modules/security/yubikey.nix index f050539..900d5b4 100644 --- a/shared/modules/security.nix +++ b/shared/modules/security/yubikey.nix @@ -1,9 +1,10 @@ +# Yubikey config: https://nixos.wiki/wiki/Yubikey#pam_u2f { pkgs, ... }: { environment.systemPackages = with pkgs; [ gnupg - yubioath-flutter + yubioath-flutter # GUI ]; programs.gnupg.agent.enable = true;