arno/YubiKey-Guide
1
0
Fork 0
mirror of https://github.com/drduh/YubiKey-Guide.git synced 2024-11-25 16:58:38 +00:00
Code Issues Releases Wiki Activity

NixOS: bump to 24.05

Browse Source 
- remove hopenpgp-tools (as per README)
- add dirmgr
- add rng-tools
This commit is contained in:
Motiejus Jakštys 2024-07-07 11:18:41 +03:00
parent d30f93ac32
commit d7b2a034aa
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock
View File

@ -18,16 +18,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1706826059, "lastModified": 1720110830,
"narHash": "sha256-N69Oab+cbt3flLvYv8fYnEHlBsWwdKciNZHUbynVEOA=", "narHash": "sha256-E5dN9GDV4LwMEduhBLSkyEz51zM17XkWZ3/9luvNOPs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "25e3d4c0d3591c99929b1ec07883177f6ea70c9d", "rev": "c0d0be00d4ecc4b51d2d6948e37466194c1e6c51",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

15
flake.nix
View File

@ -2,7 +2,7 @@
description = "A Nix Flake for an xfce-based system with YubiKey setup"; description = "A Nix Flake for an xfce-based system with YubiKey setup";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
drduhConfig.url = "github:drduh/config"; drduhConfig.url = "github:drduh/config";
drduhConfig.flake = false; drduhConfig.flake = false;
}; };
@ -129,7 +129,7 @@
enable = true; enable = true;
virtualHosts."diceware.local" = { virtualHosts."diceware.local" = {
listen = [ listen = [
{ {
addr = dicewareAddress; addr = dicewareAddress;
port = dicewarePort; port = dicewarePort;
} }
@ -153,9 +153,12 @@
preferencesStatus = "user"; preferencesStatus = "user";
}; };
ssh.startAgent = false; ssh.startAgent = false;
gnupg.agent = { gnupg = {
enable = true; dirmngr.enable = true;
enableSSHSupport = true; agent = {
enable = true;
enableSSHSupport = true;
};
}; };
}; };
@ -196,12 +199,12 @@
# Testing # Testing
ent ent
haskellPackages.hopenpgp-tools
# Password generation tools # Password generation tools
diceware diceware
dicewareWebApp dicewareWebApp
pwgen pwgen
rng-tools
# Might be useful beyond the scope of the guide # Might be useful beyond the scope of the guide
cfssl cfssl