mirror/YubiKey-Guide
1
0
Fork 0
mirror of https://github.com/drduh/YubiKey-Guide.git synced 2026-07-17 14:35:18 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #524 from zeorin/feat/nix-update

Browse source 
Nix flake update
This commit is contained in:
drduh 2025-11-01 08:22:38 -07:00 • committed by GitHub
commit 98fdcad708
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 19 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

22
README.md
View file

@ -215,7 +215,7 @@ Build an air-gapped NixOS LiveCD image:
ref=$(git ls-remote https://github.com/drduh/Yubikey-Guide refs/heads/master | awk '{print $1}') ref=$(git ls-remote https://github.com/drduh/Yubikey-Guide refs/heads/master | awk '{print $1}')
nix build --experimental-features "nix-command flakes" \ nix build --experimental-features "nix-command flakes" \
github:drduh/YubiKey-Guide/$ref#nixosConfigurations.yubikeyLive.x86_64-linux.config.system.build.isoImage github:drduh/YubiKey-Guide/$ref?dir=nix#nixosConfigurations.yubikeyLive.x86_64-linux.config.system.build.isoImage
``` ```
If you have this repository checked out: If you have this repository checked out:
@ -229,7 +229,7 @@ nix flake update --commit-lock-file
Build the image: Build the image:
```console ```console
nix build --experimental-features "nix-command flakes" .#nixosConfigurations.yubikeyLive.x86_64-linux.config.system.build.isoImage nix build --experimental-features "nix-command flakes" nix#nixosConfigurations.yubikeyLive.x86_64-linux.config.system.build.isoImage
``` ```
Copy to USB drive: Copy to USB drive:
@ -635,7 +635,7 @@ sudo mkfs.ext2 /dev/mapper/gnupg-secrets -L gnupg-$(date +%F)
Mount the filesystem and copy the temporary GnuPG working directory with key materials: Mount the filesystem and copy the temporary GnuPG working directory with key materials:
```console ```console
sudo mkdir /mnt/encrypted-storage sudo mkdir -p /mnt/encrypted-storage
sudo mount /dev/mapper/gnupg-secrets /mnt/encrypted-storage sudo mount /dev/mapper/gnupg-secrets /mnt/encrypted-storage
@ -717,7 +717,7 @@ $ doas newfs sd3i
Mount the filesystem and copy the temporary directory with the keyring: Mount the filesystem and copy the temporary directory with the keyring:
```console ```console
doas mkdir /mnt/encrypted-storage doas mkdir -p /mnt/encrypted-storage
doas mount /dev/sd3i /mnt/encrypted-storage doas mount /dev/sd3i /mnt/encrypted-storage
@ -760,7 +760,7 @@ Create a filesystem and export the public key:
```console ```console
sudo mkfs.ext2 /dev/sdc2 sudo mkfs.ext2 /dev/sdc2
sudo mkdir /mnt/public sudo mkdir -p /mnt/public
sudo mount /dev/sdc2 /mnt/public sudo mount /dev/sdc2 /mnt/public
@ -794,7 +794,7 @@ Create a filesystem and export the public key to it:
```console ```console
doas newfs sd2b doas newfs sd2b
doas mkdir /mnt/public doas mkdir -p /mnt/public
doas mount /dev/sd2b /mnt/public doas mount /dev/sd2b /mnt/public
@ -1052,7 +1052,7 @@ Mount the non-encrypted volume with the public key:
**Debian/Ubuntu** **Debian/Ubuntu**
```console ```console
sudo mkdir /mnt/public sudo mkdir -p /mnt/public
sudo mount /dev/sdc2 /mnt/public sudo mount /dev/sdc2 /mnt/public
``` ```
@ -1060,7 +1060,7 @@ sudo mount /dev/sdc2 /mnt/public
**OpenBSD** **OpenBSD**
```console ```console
doas mkdir /mnt/public doas mkdir -p /mnt/public
doas mount /dev/sd3i /mnt/public doas mount /dev/sd3i /mnt/public
``` ```
@ -1938,7 +1938,7 @@ Decrypt and mount the encrypted volume:
```console ```console
sudo cryptsetup luksOpen /dev/sdc1 gnupg-secrets sudo cryptsetup luksOpen /dev/sdc1 gnupg-secrets
sudo mkdir /mnt/encrypted-storage sudo mkdir -p /mnt/encrypted-storage
sudo mount /dev/mapper/gnupg-secrets /mnt/encrypted-storage sudo mount /dev/mapper/gnupg-secrets /mnt/encrypted-storage
``` ```
@ -1946,7 +1946,7 @@ sudo mount /dev/mapper/gnupg-secrets /mnt/encrypted-storage
Mount the non-encrypted public partition: Mount the non-encrypted public partition:
```console ```console
sudo mkdir /mnt/public sudo mkdir -p /mnt/public
sudo mount /dev/sdc2 /mnt/public sudo mount /dev/sdc2 /mnt/public
``` ```
@ -2045,7 +2045,7 @@ sudo cryptsetup luksClose gnupg-secrets
Export the updated public key: Export the updated public key:
```console ```console
sudo mkdir /mnt/public sudo mkdir -p /mnt/public
sudo mount /dev/sdc2 /mnt/public sudo mount /dev/sdc2 /mnt/public

25
nix/flake.lock generated
View file

@ -1,40 +1,23 @@
{ {
"nodes": { "nodes": {
"drduhConfig": {
"flake": false,
"locked": {
"lastModified": 1719781410,
"narHash": "sha256-cmtAG7UQX7mVNoHHpVIqasfkjnO7VtBMcz8MJ7frO0k=",
"owner": "drduh",
"repo": "config",
"rev": "4eca229664d056737f1a097cdbdb10e5f247b0bc",
"type": "github"
},
"original": {
"owner": "drduh",
"repo": "config",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1721226092, "lastModified": 1761468971,
"narHash": "sha256-UBvzVpo5sXSi2S/Av+t+Q+C2mhMIw/LBEZR+d6NMjws=", "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c716603a63aca44f39bef1986c13402167450e0a", "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.05", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"root": { "root": {
"inputs": { "inputs": {
"drduhConfig": "drduhConfig",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
} }

9
nix/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-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
}; };
outputs = { outputs = {
@ -37,7 +37,7 @@
''; '';
shortcut = pkgs.makeDesktopItem { shortcut = pkgs.makeDesktopItem {
name = "yubikey-guide"; name = "yubikey-guide";
icon = "${pkgs.yubikey-manager-qt}/share/icons/hicolor/128x128/apps/ykman.png"; icon = "${pkgs.yubioath-flutter}/share/icons/com.yubico.yubioath.png";
desktopName = "YubiKey Guide"; desktopName = "YubiKey Guide";
genericName = "Guide to using YubiKey for GnuPG and SSH"; genericName = "Guide to using YubiKey for GnuPG and SSH";
comment = "Open YubiKey Guide in a reader program"; comment = "Open YubiKey Guide in a reader program";
@ -190,7 +190,6 @@
# Yubico's official tools # Yubico's official tools
yubikey-manager yubikey-manager
yubikey-manager-qt
yubikey-personalization yubikey-personalization
yubikey-personalization-gui yubikey-personalization-gui
yubico-piv-tool yubico-piv-tool
@ -216,7 +215,7 @@
yubikeyGuide yubikeyGuide
# PDF and Markdown viewer # PDF and Markdown viewer
okular kdePackages.okular
]; ];
# Disable networking so the system is air-gapped # Disable networking so the system is air-gapped
@ -265,7 +264,7 @@
ln -sf ${dicewareWebApp}/share/applications/${dicewareWebApp.name} ${desktopDir} ln -sf ${dicewareWebApp}/share/applications/${dicewareWebApp.name} ${desktopDir}
ln -sfT ${self} ${documentsDir}/YubiKey-Guide ln -sfT ${self} ${documentsDir}/YubiKey-Guide
''; '';
system.stateVersion = "24.05"; system.stateVersion = "25.05";
} }
) )
]; ];