mirrors
/
YubiKey-Guide
mirror of https://github.com/drduh/YubiKey-Guide
0
0
Fork 0
Code Releases Activity

Merge pull request #450 from motiejus/nixos-24.05 

NixOS: bump to 24.05
pull/452/head
drduh 2024-07-08 02:12:58 +00:00 committed by GitHub
parent a7155c7995 d5ef6565ed
commit a46409e2e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
flake.lock
View File

@ -3,11 +3,11 @@
"drduhConfig": { "drduhConfig": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1697417581, "lastModified": 1719781410,
"narHash": "sha256-R45L/Xv3z0lJhGt781wDbjaq1qc+sGTmsUt+XHwgf4A=", "narHash": "sha256-cmtAG7UQX7mVNoHHpVIqasfkjnO7VtBMcz8MJ7frO0k=",
"owner": "drduh", "owner": "drduh",
"repo": "config", "repo": "config",
"rev": "8c21617100795fea2313656abdf25f93b98fdc30", "rev": "4eca229664d056737f1a097cdbdb10e5f247b0bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -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