diff options
| author | drduh <github@duh.to> | 2024-07-08 02:12:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-08 02:12:58 +0000 |
| commit | a46409e2e8e5e360290a2d720bfc3bc71b76be30 (patch) | |
| tree | 19ca3639a432ed2e9d3393d3e42eb1e00a8a2b43 | |
| parent | Merge pull request #449 from denis-roy/master (diff) | |
| parent | flake.lock: Update (diff) | |
| download | YubiKey-Guide-a46409e2e8e5e360290a2d720bfc3bc71b76be30.tar.gz | |
Merge pull request #450 from motiejus/nixos-24.05
NixOS: bump to 24.05
| -rw-r--r-- | flake.lock | 14 | ||||
| -rw-r--r-- | flake.nix | 15 |
2 files changed, 16 insertions, 13 deletions
@@ -3,11 +3,11 @@ "drduhConfig": { "flake": false, "locked": { - "lastModified": 1697417581, - "narHash": "sha256-R45L/Xv3z0lJhGt781wDbjaq1qc+sGTmsUt+XHwgf4A=", + "lastModified": 1719781410, + "narHash": "sha256-cmtAG7UQX7mVNoHHpVIqasfkjnO7VtBMcz8MJ7frO0k=", "owner": "drduh", "repo": "config", - "rev": "8c21617100795fea2313656abdf25f93b98fdc30", + "rev": "4eca229664d056737f1a097cdbdb10e5f247b0bc", "type": "github" }, "original": { @@ -18,16 +18,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706826059, - "narHash": "sha256-N69Oab+cbt3flLvYv8fYnEHlBsWwdKciNZHUbynVEOA=", + "lastModified": 1720110830, + "narHash": "sha256-E5dN9GDV4LwMEduhBLSkyEz51zM17XkWZ3/9luvNOPs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25e3d4c0d3591c99929b1ec07883177f6ea70c9d", + "rev": "c0d0be00d4ecc4b51d2d6948e37466194c1e6c51", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -2,7 +2,7 @@ description = "A Nix Flake for an xfce-based system with YubiKey setup"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; drduhConfig.url = "github:drduh/config"; drduhConfig.flake = false; }; @@ -129,7 +129,7 @@ enable = true; virtualHosts."diceware.local" = { listen = [ - { + { addr = dicewareAddress; port = dicewarePort; } @@ -153,9 +153,12 @@ preferencesStatus = "user"; }; ssh.startAgent = false; - gnupg.agent = { - enable = true; - enableSSHSupport = true; + gnupg = { + dirmngr.enable = true; + agent = { + enable = true; + enableSSHSupport = true; + }; }; }; @@ -196,12 +199,12 @@ # Testing ent - haskellPackages.hopenpgp-tools # Password generation tools diceware dicewareWebApp pwgen + rng-tools # Might be useful beyond the scope of the guide cfssl |