Skip to content

Nix flake update #524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 1, 2025
Merged

Nix flake update #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bec44a6
Update Nix flake to latest 25.05 (current stable)
zeorin Oct 27, 2025
ba013d7
Update `nix build` commands
zeorin Oct 27, 2025
3cbd8ca
Update all `mkdir` commands to create parent directories if necessary
zeorin Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}')

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:
Expand All @@ -229,7 +229,7 @@ nix flake update --commit-lock-file
Build the image:

```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:
Expand Down Expand Up @@ -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:

```console
sudo mkdir /mnt/encrypted-storage
sudo mkdir -p /mnt/encrypted-storage

sudo mount /dev/mapper/gnupg-secrets /mnt/encrypted-storage

Expand Down Expand Up @@ -717,7 +717,7 @@ $ doas newfs sd3i
Mount the filesystem and copy the temporary directory with the keyring:

```console
doas mkdir /mnt/encrypted-storage
doas mkdir -p /mnt/encrypted-storage

doas mount /dev/sd3i /mnt/encrypted-storage

Expand Down Expand Up @@ -760,7 +760,7 @@ Create a filesystem and export the public key:
```console
sudo mkfs.ext2 /dev/sdc2

sudo mkdir /mnt/public
sudo mkdir -p /mnt/public

sudo mount /dev/sdc2 /mnt/public

Expand Down Expand Up @@ -794,7 +794,7 @@ Create a filesystem and export the public key to it:
```console
doas newfs sd2b

doas mkdir /mnt/public
doas mkdir -p /mnt/public

doas mount /dev/sd2b /mnt/public

Expand Down Expand Up @@ -1052,15 +1052,15 @@ Mount the non-encrypted volume with the public key:
**Debian/Ubuntu**

```console
sudo mkdir /mnt/public
sudo mkdir -p /mnt/public

sudo mount /dev/sdc2 /mnt/public
```

**OpenBSD**

```console
doas mkdir /mnt/public
doas mkdir -p /mnt/public

doas mount /dev/sd3i /mnt/public
```
Expand Down Expand Up @@ -1938,15 +1938,15 @@ Decrypt and mount the encrypted volume:
```console
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
```

Mount the non-encrypted public partition:

```console
sudo mkdir /mnt/public
sudo mkdir -p /mnt/public

sudo mount /dev/sdc2 /mnt/public
```
Expand Down Expand Up @@ -2045,7 +2045,7 @@ sudo cryptsetup luksClose gnupg-secrets
Export the updated public key:

```console
sudo mkdir /mnt/public
sudo mkdir -p /mnt/public

sudo mount /dev/sdc2 /mnt/public

Expand Down
25 changes: 4 additions & 21 deletions nix/flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions nix/flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
description = "A Nix Flake for an xfce-based system with YubiKey setup";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
};

outputs = {
Expand Down Expand Up @@ -37,7 +37,7 @@
'';
shortcut = pkgs.makeDesktopItem {
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";
genericName = "Guide to using YubiKey for GnuPG and SSH";
comment = "Open YubiKey Guide in a reader program";
Expand Down Expand Up @@ -190,7 +190,6 @@

# Yubico's official tools
yubikey-manager
yubikey-manager-qt
yubikey-personalization
yubikey-personalization-gui
yubico-piv-tool
Expand All @@ -216,7 +215,7 @@
yubikeyGuide

# PDF and Markdown viewer
okular
kdePackages.okular
];

# Disable networking so the system is air-gapped
Expand Down Expand Up @@ -265,7 +264,7 @@
ln -sf ${dicewareWebApp}/share/applications/${dicewareWebApp.name} ${desktopDir}
ln -sfT ${self} ${documentsDir}/YubiKey-Guide
'';
system.stateVersion = "24.05";
system.stateVersion = "25.05";
}
)
];
Expand Down